8329331: Intrinsify Unsafe::setMemory

src/hotspot/cpu/x86/stubGenerator_x86_64.hpp

@@ -274,7 +274,7 @@ class StubGenerator: public StubCodeGenerator {
   //
   // Examines the alignment of the operands and dispatches
   // to an int, short, or byte copy loop.
-  address generate_unsafe_setmemory(const char *name, address byte_fill_entry);
+  address generate_unsafe_setmemory(const char *name);
 
   // Perform range checks on the proposed arraycopy.
   // Kills temp, but nothing else.

src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp

@@ -152,8 +152,7 @@ void StubGenerator::generate_arraycopy_stubs() {
   StubRoutines::_arrayof_jshort_fill = generate_fill(T_SHORT, true, "arrayof_jshort_fill");
   StubRoutines::_arrayof_jint_fill = generate_fill(T_INT, true, "arrayof_jint_fill");
 
-  StubRoutines::_unsafe_setmemory =
-      generate_unsafe_setmemory("unsafe_setmemory", StubRoutines::_jbyte_fill);
+  StubRoutines::_unsafe_setmemory = generate_unsafe_setmemory("unsafe_setmemory");
 
   // We don't generate specialized code for HeapWord-aligned source
   // arrays, so just use the code we've already generated
@@ -730,7 +729,6 @@ address StubGenerator::generate_disjoint_copy_avx3_masked(address* entry, const
   __ ret(0);
 
   if (MaxVectorSize == 64) {
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, false, ucme_exit_pc);
     __ BIND(L_copy_large);
     arraycopy_avx3_large(to, from, temp1, temp2, temp3, temp4, count, xmm1, xmm2, xmm3, xmm4, shift);
     __ jmp(L_finish);
@@ -2492,8 +2490,7 @@ address StubGenerator::generate_unsafe_copy(const char *name,
 // Examines the alignment of the operands and dispatches
 // to an int, short, or byte fill loop.
 //
-address StubGenerator::generate_unsafe_setmemory(const char *name,
-                                                 address byte_fill_entry) {
+address StubGenerator::generate_unsafe_setmemory(const char *name) {
   __ align(CodeEntryAlignment);
   StubCodeMark mark(this, "StubRoutines", name);
   address start = __ pc();

src/hotspot/share/opto/library_call.cpp

@@ -4949,6 +4949,8 @@ bool LibraryCallKit::inline_unsafe_copyMemory() {
   return true;
 }
 
+// unsafe_setmemory(void *base, ulong offset, size_t length, char fill_value);
+// Fill 'length' bytes starting from 'base[offset]' with 'fill_value'
 bool LibraryCallKit::inline_unsafe_setMemory() {
   if (callee()->is_static())  return false;  // caller must have the capability!
   null_check_receiver();  // null-check receiver

src/hotspot/share/opto/runtime.cpp

@@ -771,6 +771,10 @@ const TypeFunc* OptoRuntime::void_void_Type() {
  }
 
 
+// Takes as parameters:
+// void *dest
+// long size
+// uchar byte
 const TypeFunc* OptoRuntime::make_setmemory_Type() {
   // create input type (domain)
   int num_args      = 4;
@@ -780,7 +784,7 @@ const TypeFunc* OptoRuntime::make_setmemory_Type() {
   fields[argp++] = TypePtr::NOTNULL;    // dest
   fields[argp++] = TypeLong::LONG;      // size
   fields[argp++] = Type::HALF;          // size
-  fields[argp++] = TypeInt::INT;        // bytevalue
+  fields[argp++] = TypeInt::UBYTE;      // bytevalue
   assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
   const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
 

src/hotspot/share/runtime/sharedRuntime.cpp

@@ -176,7 +176,6 @@ uint SharedRuntime::_generic_array_copy_ctr=0;
 uint SharedRuntime::_slow_array_copy_ctr=0;
 uint SharedRuntime::_find_handler_ctr=0;
 uint SharedRuntime::_rethrow_ctr=0;
-
 uint SharedRuntime::_unsafe_set_memory_ctr=0;
 
 int     SharedRuntime::_ICmiss_index                    = 0;
@@ -543,7 +542,6 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* curr
     tty->print_cr("b) other problem");
   }
 #endif // PRODUCT
-
   ShouldNotReachHere();
   return nullptr;
 }
@@ -1990,7 +1988,6 @@ void SharedRuntime::print_statistics() {
   if (_slow_array_copy_ctr) tty->print_cr("%5u slow array copies", _slow_array_copy_ctr);
   if (_find_handler_ctr) tty->print_cr("%5u find exception handler", _find_handler_ctr);
   if (_rethrow_ctr) tty->print_cr("%5u rethrow handler", _rethrow_ctr);
-
   if (_unsafe_set_memory_ctr) tty->print_cr("%5u unsafe set memorys", _unsafe_set_memory_ctr);
 
   AdapterHandlerLibrary::print_statistics();

test/jdk/sun/misc/CopyMemory.java

@@ -207,11 +207,6 @@ private static Unsafe getUnsafe() throws Exception {
     public static void main(String[] args) throws Exception {
         Unsafe unsafe = getUnsafe();
 
-        // long seed = 6742745864802755133L;
-        long seed = random.nextLong();
-        random.setSeed(seed);
-        System.out.println("Seed set to "+ seed);
-
         testSetByteArray(unsafe);
         testSetRawMemory(unsafe);
         testCopyByteArrayToByteArray(unsafe);