Prefer UseAVX over '-XX:-UseAESCTRIntrinsics' (#1424)

Prefer `-XX:UseAVX=2` over `-XX:-UseAESCTRIntrinsics`
palantir · Jan 30, 2023 · 821a4ed · 821a4ed
1 parent c2d4fac
commit 821a4ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/changelog/@unreleased/pr-1424.v2.yml b/changelog/@unreleased/pr-1424.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Prefer `-XX:UseAVX=2` over `-XX:-UseAESCTRIntrinsics`
+  links:
+  - https://github.com/palantir/sls-packaging/pull/1424
diff --git a/...-sls-packaging/src/main/java/com/palantir/gradle/dist/service/tasks/LaunchConfigTask.java b/...-sls-packaging/src/main/java/com/palantir/gradle/dist/service/tasks/LaunchConfigTask.java
@@ -78,8 +78,11 @@ public abstract class LaunchConfigTask extends DefaultTask {
             // AWS-managed systems that modify DNS records on failover.
             "-Dsun.net.inetaddr.ttl=20",
             "-XX:+UnlockDiagnosticVMOptions",
-            // Disable AES-CTR intrinsics due to corruption bug https://bugs.openjdk.org/browse/JDK-8292158
-            "-XX:-UseAESCTRIntrinsics",
+            // Disable AVX-512 intrinsics due to AES/CTR corruption bug in https://bugs.openjdk.org/browse/JDK-8292158
+            "-XX:+IgnoreUnrecognizedVMOptions",
+            // UseAVX is not recognized on some platforms (arm), so we must include 'IgnoreUnrecognizedVMOptions'.
+            // When a system supports UseAVX=N, setting UseAVX=N+1 will set the flag to the highest supported value.
+            "-XX:UseAVX=2",
             "-XX:NativeMemoryTracking=summary",
             // Increase default JFR stack depth beyond the default (conservative) 64 frames.
             // This can be overridden by user-provided options.

diff --git a/...rc/test/groovy/com/palantir/gradle/dist/service/JavaServiceDistributionPluginTests.groovy b/...rc/test/groovy/com/palantir/gradle/dist/service/JavaServiceDistributionPluginTests.groovy
@@ -407,7 +407,8 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec {
                 '-XX:HeapDumpPath=var/log',
                 '-Dsun.net.inetaddr.ttl=20',
                 '-XX:+UnlockDiagnosticVMOptions',
-                '-XX:-UseAESCTRIntrinsics',
+                '-XX:+IgnoreUnrecognizedVMOptions',
+                '-XX:UseAVX=2',
                 '-XX:NativeMemoryTracking=summary',
                 '-XX:FlightRecorderOptions=stackdepth=256',
                 '-XX:+UseParallelGC',
@@ -434,7 +435,8 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec {
                 '-XX:HeapDumpPath=var/log',
                 '-Dsun.net.inetaddr.ttl=20',
                 '-XX:+UnlockDiagnosticVMOptions',
-                '-XX:-UseAESCTRIntrinsics',
+                '-XX:+IgnoreUnrecognizedVMOptions',
+                '-XX:UseAVX=2',
                 '-XX:NativeMemoryTracking=summary',
                 '-XX:FlightRecorderOptions=stackdepth=256',
                 '-Xmx4M',
@@ -475,7 +477,8 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec {
                 '-XX:HeapDumpPath=var/log',
                 '-Dsun.net.inetaddr.ttl=20',
                 '-XX:+UnlockDiagnosticVMOptions',
-                '-XX:-UseAESCTRIntrinsics',
+                '-XX:+IgnoreUnrecognizedVMOptions',
+                '-XX:UseAVX=2',
                 '-XX:NativeMemoryTracking=summary',
                 '-XX:FlightRecorderOptions=stackdepth=256',
                 "-XX:+PrintGCDateStamps",