diff --git a/patches/api/0005-Add-Java19-Support-for-SIMD.patch b/patches/api/0005-Add-Java19-Support-for-SIMD.patch index 55d769e..dbbb528 100644 --- a/patches/api/0005-Add-Java19-Support-for-SIMD.patch +++ b/patches/api/0005-Add-Java19-Support-for-SIMD.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Java19 Support for SIMD diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java -index 93f5d7ca36e043e6c0f959450d38e6946b348eaf..7024a47b0de5083c3ba49c8e45b4c4b1369ab2c5 100644 +index 93f5d7ca36e043e6c0f959450d38e6946b348eaf..d1b6ad8768355889e243f2868335b7c7f0d07b27 100644 --- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java @@ -15,7 +15,7 @@ public class SIMDChecker { @@ -13,7 +13,7 @@ index 93f5d7ca36e043e6c0f959450d38e6946b348eaf..7024a47b0de5083c3ba49c8e45b4c4b1 public static boolean canEnable(Logger logger) { try { - if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18) { -+ if (SIMDDetection.getJavaVersion() < 17) { ++ if (SIMDDetection.getJavaVersion() < 17) { // KeYi - Add Java19 Support for SIMD return false; } else { SIMDDetection.testRun = true; diff --git a/patches/server/0028-Add-Java19-Support-for-SIMD.patch b/patches/server/0028-Add-Java19-Support-for-SIMD.patch index 54e854e..6341427 100644 --- a/patches/server/0028-Add-Java19-Support-for-SIMD.patch +++ b/patches/server/0028-Add-Java19-Support-for-SIMD.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Java19 Support for SIMD diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index c9ae76401278057f87ebef13619a114722e81a1d..a8158f86ac12e2378e17ee3cbcd1f04ceff39209 100644 +index c9ae76401278057f87ebef13619a114722e81a1d..6c6266d04b85aaeb26328b9956c0fa628f19c3d9 100644 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java @@ -87,13 +87,13 @@ public class PufferfishConfig { @@ -13,14 +13,14 @@ index c9ae76401278057f87ebef13619a114722e81a1d..a8158f86ac12e2378e17ee3cbcd1f04c try { SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER); - SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18; -+ SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() < 17; ++ SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() < 17; // KeYi - Add Java19 Support for SIMD } catch (NoClassDefFoundError | Exception ignored) {} if (SIMDDetection.isEnabled) { PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions."); } else if (SIMDDetection.versionLimited) { - PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 and Java 18."); -+ PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported in Java 17 and above."); ++ PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported in Java 17 and above."); // KeYi - Add Java19 Support for SIMD } else { PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!"); PufferfishLogger.LOGGER.warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");