Remove no longer needed UseAESCTRIntrinsics

trinodb · Oct 31, 2023 · efd3154 · efd3154
1 parent ccdff82
commit efd3154
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 19 deletions.
diff --git a/core/docker/default/etc/jvm.config b/core/docker/default/etc/jvm.config
@@ -12,8 +12,6 @@
 -XX:PerBytecodeRecompilationCutoff=10000
 -Djdk.attach.allowAttachSelf=true
 -Djdk.nio.maxCachedBufferSize=2000000
-# Improve AES performance for S3, etc. on ARM64 (JDK-8271567)
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics
 # Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647)
+-XX:+UnlockDiagnosticVMOptions
 -XX:GCLockerRetryAllocationCount=32
diff --git a/core/trino-server-rpm/src/main/resources/dist/config/jvm.config b/core/trino-server-rpm/src/main/resources/dist/config/jvm.config
@@ -11,8 +11,6 @@
 -XX:PerBytecodeRecompilationCutoff=10000
 -Djdk.attach.allowAttachSelf=true
 -Djdk.nio.maxCachedBufferSize=2000000
-# Improve AES performance for S3, etc. on ARM64 (JDK-8271567)
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics
 # Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647)
+-XX:+UnlockDiagnosticVMOptions
 -XX:GCLockerRetryAllocationCount=32
diff --git a/docs/src/main/sphinx/installation/deployment.md b/docs/src/main/sphinx/installation/deployment.md
@@ -138,10 +138,9 @@ The following provides a good starting point for creating `etc/jvm.config`:
 -XX:PerBytecodeRecompilationCutoff=10000
 -Djdk.attach.allowAttachSelf=true
 -Djdk.nio.maxCachedBufferSize=2000000
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics
 -Dfile.encoding=UTF-8
 # Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647)
+-XX:+UnlockDiagnosticVMOptions
 -XX:GCLockerRetryAllocationCount=32
 ```
 
@@ -173,7 +172,6 @@ prevents Trino from starting. You can workaround this by overriding the
 temporary directory by adding `-Djava.io.tmpdir=/path/to/other/tmpdir` to the
 list of JVM options.
 
-We enable `-XX:+UnlockDiagnosticVMOptions` and `-XX:+UseAESCTRIntrinsics` to improve AES performance for S3, etc. on ARM64 ([JDK-8271567](https://bugs.openjdk.java.net/browse/JDK-8271567))
 We set GCLocker retry allocation count (`-XX:GCLockerRetryAllocationCount=32`) to avoid OOM too early (see [JDK-8192647](https://bugs.openjdk.org/browse/JDK-8192647))
 
 (config-properties)=

diff --git a/.../src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config b/.../src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/jvm.config
@@ -15,5 +15,3 @@
 -DHADOOP_USER_NAME=hive
 -Duser.timezone=Asia/Kathmandu
 -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics
diff --git a/...c/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config b/...c/main/resources/docker/presto-product-tests/conf/environment/multinode-ignite/jvm.config
@@ -15,5 +15,3 @@
 -DHADOOP_USER_NAME=hive
 -Duser.timezone=Asia/Kathmandu
 -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics
diff --git a/...ources/docker/presto-product-tests/conf/environment/multinode/multinode-master-jvm.config b/...ources/docker/presto-product-tests/conf/environment/multinode/multinode-master-jvm.config
@@ -14,5 +14,3 @@
 -DHADOOP_USER_NAME=hive
 -Duser.timezone=Asia/Kathmandu
 -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics
diff --git a/...ources/docker/presto-product-tests/conf/environment/multinode/multinode-worker-jvm.config b/...ources/docker/presto-product-tests/conf/environment/multinode/multinode-worker-jvm.config
@@ -13,5 +13,3 @@
 -DHADOOP_USER_NAME=hive
 -Duser.timezone=Asia/Kathmandu
 -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics
diff --git a/...-tests-launcher/src/main/resources/docker/presto-product-tests/conf/presto/etc/jvm.config b/...-tests-launcher/src/main/resources/docker/presto-product-tests/conf/presto/etc/jvm.config
@@ -14,5 +14,3 @@
 -DHADOOP_USER_NAME=hive
 -Duser.timezone=Asia/Kathmandu
 -XX:ErrorFile=/docker/logs/product-tests-presto-jvm-error-file.log
--XX:+UnlockDiagnosticVMOptions
--XX:+UseAESCTRIntrinsics