From 22007a1e387a1b8e897c6fbb056377b7ddc6ec00 Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <volodymyr.paprotski@intel.com>
Date: Wed, 21 Dec 2022 18:43:40 +0000
Subject: [PATCH] 8298893: Rename option UsePolyIntrinsics to
 UsePoly1305Intrinsics

Reviewed-by: jnimeh, chagedorn, thartmann
---
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp | 2 +-
 src/hotspot/cpu/x86/vm_version_x86.cpp       | 8 ++++----
 src/hotspot/share/classfile/vmIntrinsics.cpp | 2 +-
 src/hotspot/share/opto/library_call.cpp      | 2 +-
 src/hotspot/share/runtime/globals.hpp        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 95dc03200eb..d7a613052a3 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -3709,7 +3709,7 @@ void StubGenerator::generate_initial() {
     StubRoutines::_updateBytesCRC32 = generate_updateBytesCRC32();
   }
 
-  if (UsePolyIntrinsics) {
+  if (UsePoly1305Intrinsics) {
     StubRoutines::_poly1305_processBlocks = generate_poly1305_processBlocks();
   }
 
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 83979a60245..ba2da1fcd1a 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1351,14 +1351,14 @@ void VM_Version::get_processor_features() {
 
 #ifdef _LP64
   if (supports_avx512ifma() && supports_avx512vlbw() && MaxVectorSize >= 64) {
-    if (FLAG_IS_DEFAULT(UsePolyIntrinsics)) {
-      FLAG_SET_DEFAULT(UsePolyIntrinsics, true);
+    if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics)) {
+      FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
     }
   } else
 #endif
-  if (UsePolyIntrinsics) {
+  if (UsePoly1305Intrinsics) {
     warning("Intrinsics for Poly1305 crypto hash functions not available on this CPU.");
-    FLAG_SET_DEFAULT(UsePolyIntrinsics, false);
+    FLAG_SET_DEFAULT(UsePoly1305Intrinsics, false);
   }
 
 #ifdef _LP64
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index 3dafc8f235f..81b442f713b 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -483,7 +483,7 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
     if (!UseBASE64Intrinsics) return true;
     break;
   case vmIntrinsics::_poly1305_processBlocks:
-    if (!UsePolyIntrinsics) return true;
+    if (!UsePoly1305Intrinsics) return true;
     break;
   case vmIntrinsics::_updateBytesCRC32C:
   case vmIntrinsics::_updateDirectByteBufferCRC32C:
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 0051bed3314..27d4f4b4a27 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -7003,7 +7003,7 @@ bool LibraryCallKit::inline_base64_decodeBlock() {
 bool LibraryCallKit::inline_poly1305_processBlocks() {
   address stubAddr;
   const char *stubName;
-  assert(UsePolyIntrinsics, "need Poly intrinsics support");
+  assert(UsePoly1305Intrinsics, "need Poly intrinsics support");
   assert(callee()->signature()->size() == 5, "poly1305_processBlocks has %d parameters", callee()->signature()->size());
   stubAddr = StubRoutines::poly1305_processBlocks();
   stubName = "poly1305_processBlocks";
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 4e90449d78c..18a73fd1d59 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -238,7 +238,7 @@ const int ObjectAlignmentInBytes = 8;
   product(bool, UseBASE64Intrinsics, false,                                 \
           "Use intrinsics for java.util.Base64")                            \
                                                                             \
-  product(bool, UsePolyIntrinsics, false, DIAGNOSTIC,                       \
+  product(bool, UsePoly1305Intrinsics, false, DIAGNOSTIC,                   \
           "Use intrinsics for sun.security.util.math.intpoly")              \
                                                                             \
   product(size_t, LargePageSizeInBytes, 0,                                  \