|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: MrHua269 <wangxyper@163.com> |
| 3 | +Date: Tue, 6 Aug 2024 14:32:22 +0800 |
| 4 | +Subject: [PATCH] Pufferfish SMID Utilities |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/build.gradle.kts b/build.gradle.kts |
| 8 | +index 540fe7e2c110e79c3742f229b3ed8c54b101d260..3f04b36591899040a8b602db6475de492755ffb5 100644 |
| 9 | +--- a/build.gradle.kts |
| 10 | ++++ b/build.gradle.kts |
| 11 | +@@ -130,6 +130,13 @@ val generateApiVersioningFile by tasks.registering { |
| 12 | + } |
| 13 | + } |
| 14 | + |
| 15 | ++// Pufferfish Start |
| 16 | ++tasks.withType<JavaCompile> { |
| 17 | ++ val compilerArgs = options.compilerArgs |
| 18 | ++ compilerArgs.add("--add-modules=jdk.incubator.vector") |
| 19 | ++} |
| 20 | ++// Pufferfish End |
| 21 | ++ |
| 22 | + tasks.jar { |
| 23 | + from(generateApiVersioningFile.map { it.outputs.files.singleFile }) { |
| 24 | + into("META-INF/maven/${project.group}/${project.name}") |
| 25 | +diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java |
| 26 | +new file mode 100644 |
| 27 | +index 0000000000000000000000000000000000000000..3441cdad70da1bd523c5933b1a914688718c2657 |
| 28 | +--- /dev/null |
| 29 | ++++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java |
| 30 | +@@ -0,0 +1,40 @@ |
| 31 | ++package gg.pufferfish.pufferfish.simd; |
| 32 | ++ |
| 33 | ++import java.util.logging.Level; |
| 34 | ++import java.util.logging.Logger; |
| 35 | ++import jdk.incubator.vector.FloatVector; |
| 36 | ++import jdk.incubator.vector.IntVector; |
| 37 | ++import jdk.incubator.vector.VectorSpecies; |
| 38 | ++ |
| 39 | ++/** |
| 40 | ++ * Basically, java is annoying and we have to push this out to its own class. |
| 41 | ++ */ |
| 42 | ++@Deprecated |
| 43 | ++public class SIMDChecker { |
| 44 | ++ |
| 45 | ++ @Deprecated |
| 46 | ++ public static boolean canEnable(Logger logger) { |
| 47 | ++ try { |
| 48 | ++ if (SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21) { |
| 49 | ++ return false; |
| 50 | ++ } else { |
| 51 | ++ SIMDDetection.testRun = true; |
| 52 | ++ |
| 53 | ++ VectorSpecies<Integer> ISPEC = IntVector.SPECIES_PREFERRED; |
| 54 | ++ VectorSpecies<Float> FSPEC = FloatVector.SPECIES_PREFERRED; |
| 55 | ++ |
| 56 | ++ logger.log(Level.INFO, "Max SIMD vector size on this system is " + ISPEC.vectorBitSize() + " bits (int)"); |
| 57 | ++ logger.log(Level.INFO, "Max SIMD vector size on this system is " + FSPEC.vectorBitSize() + " bits (float)"); |
| 58 | ++ |
| 59 | ++ if (ISPEC.elementSize() < 2 || FSPEC.elementSize() < 2) { |
| 60 | ++ logger.log(Level.WARNING, "SIMD is not properly supported on this system!"); |
| 61 | ++ return false; |
| 62 | ++ } |
| 63 | ++ |
| 64 | ++ return true; |
| 65 | ++ } |
| 66 | ++ } catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it. |
| 67 | ++ return false; |
| 68 | ++ } |
| 69 | ++ |
| 70 | ++} |
| 71 | +diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java |
| 72 | +new file mode 100644 |
| 73 | +index 0000000000000000000000000000000000000000..a84889d3e9cfc4d7ab5f867820a6484c6070711b |
| 74 | +--- /dev/null |
| 75 | ++++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java |
| 76 | +@@ -0,0 +1,35 @@ |
| 77 | ++package gg.pufferfish.pufferfish.simd; |
| 78 | ++ |
| 79 | ++import java.util.logging.Logger; |
| 80 | ++ |
| 81 | ++@Deprecated |
| 82 | ++public class SIMDDetection { |
| 83 | ++ |
| 84 | ++ public static boolean isEnabled = false; |
| 85 | ++ public static boolean versionLimited = false; |
| 86 | ++ public static boolean testRun = false; |
| 87 | ++ |
| 88 | ++ @Deprecated |
| 89 | ++ public static boolean canEnable(Logger logger) { |
| 90 | ++ try { |
| 91 | ++ return SIMDChecker.canEnable(logger); |
| 92 | ++ } catch (NoClassDefFoundError | Exception ignored) { |
| 93 | ++ return false; |
| 94 | ++ } |
| 95 | ++ } |
| 96 | ++ |
| 97 | ++ @Deprecated |
| 98 | ++ public static int getJavaVersion() { |
| 99 | ++ // https://stackoverflow.com/a/2591122 |
| 100 | ++ String version = System.getProperty("java.version"); |
| 101 | ++ if(version.startsWith("1.")) { |
| 102 | ++ version = version.substring(2, 3); |
| 103 | ++ } else { |
| 104 | ++ int dot = version.indexOf("."); |
| 105 | ++ if(dot != -1) { version = version.substring(0, dot); } |
| 106 | ++ } |
| 107 | ++ version = version.split("-")[0]; // Azul is stupid |
| 108 | ++ return Integer.parseInt(version); |
| 109 | ++ } |
| 110 | ++ |
| 111 | ++} |
0 commit comments