From 73f5415363232804bd1904c1a80b0a724eabe63f Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Sat, 2 Jan 2021 19:29:50 +0000
Subject: [PATCH 001/129] 8258955: (bf) slice(int, int) on view buffers fails
 to adjust index according to primitive size

Reviewed-by: alanb
---
 .../java/nio/Direct-X-Buffer.java.template    |  5 +--
 test/jdk/java/nio/Buffer/ByteBufferViews.java | 34 +++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
index 81a40c8bd404f..f3e1c8b224889 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -237,7 +237,8 @@ class Direct$Type$Buffer$RW$$BO$
                                               0,
                                               length,
                                               length,
-                                              index, segment);
+                                              index << $LG_BYTES_PER_VALUE$,
+                                              segment);
     }
 
     public $Type$Buffer duplicate() {
diff --git a/test/jdk/java/nio/Buffer/ByteBufferViews.java b/test/jdk/java/nio/Buffer/ByteBufferViews.java
index 18a3ac55c86f3..f0136939d53f5 100644
--- a/test/jdk/java/nio/Buffer/ByteBufferViews.java
+++ b/test/jdk/java/nio/Buffer/ByteBufferViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @summary Binary data and view tests for byte buffers
- * @bug 8159257
+ * @bug 8159257 8258955
  * @run testng ByteBufferViews
  */
 
@@ -174,6 +174,11 @@ public static Object[][] shortViewProvider() {
                           bb -> bb.asShortBuffer()),
                 Map.entry("bb.asShortBuffer().slice()",
                           bb -> bb.asShortBuffer().slice()),
+                Map.entry("bb.asShortBuffer().slice(index,length)",
+                          bb -> { var sb = bb.asShortBuffer();
+                                  sb =  sb.slice(1, sb.limit() - 1);
+                                  bb.position(bb.position() + 2);
+                                  return sb; }),
                 Map.entry("bb.asShortBuffer().slice().duplicate()",
                           bb -> bb.asShortBuffer().slice().duplicate())
         );
@@ -273,6 +278,11 @@ public static Object[][] charViewProvider() {
                           bb -> bb.asCharBuffer()),
                 Map.entry("bb.asCharBuffer().slice()",
                           bb -> bb.asCharBuffer().slice()),
+                Map.entry("bb.asCharBuffer().slice(index,length)",
+                          bb -> { var cb = bb.asCharBuffer();
+                                  cb =  cb.slice(1, cb.limit() - 1);
+                                  bb.position(bb.position() + 2);
+                                  return cb; }),
                 Map.entry("bb.asCharBuffer().slice().duplicate()",
                           bb -> bb.asCharBuffer().slice().duplicate())
         );
@@ -365,6 +375,11 @@ public static Object[][] intViewProvider() {
                           bb -> bb.asIntBuffer()),
                 Map.entry("bb.asIntBuffer().slice()",
                           bb -> bb.asIntBuffer().slice()),
+                Map.entry("bb.asIntBuffer().slice(index,length)",
+                          bb -> { var ib = bb.asIntBuffer();
+                                  ib =  ib.slice(1, ib.limit() - 1);
+                                  bb.position(bb.position() + 4);
+                                  return ib; }),
                 Map.entry("bb.asIntBuffer().slice().duplicate()",
                           bb -> bb.asIntBuffer().slice().duplicate())
         );
@@ -467,6 +482,11 @@ public static Object[][] longViewProvider() {
                           bb -> bb.asLongBuffer()),
                 Map.entry("bb.asLongBuffer().slice()",
                           bb -> bb.asLongBuffer().slice()),
+                Map.entry("bb.asLongBuffer().slice(index,length)",
+                          bb -> { var lb = bb.asLongBuffer();
+                                  lb =  lb.slice(1, lb.limit() - 1);
+                                  bb.position(bb.position() + 8);
+                                  return lb; }),
                 Map.entry("bb.asLongBuffer().slice().duplicate()",
                           bb -> bb.asLongBuffer().slice().duplicate())
         );
@@ -575,6 +595,11 @@ public static Object[][] floatViewProvider() {
                           bb -> bb.asFloatBuffer()),
                 Map.entry("bb.asFloatBuffer().slice()",
                           bb -> bb.asFloatBuffer().slice()),
+                Map.entry("bb.asFloatBuffer().slice(index,length)",
+                        bb -> { var fb = bb.asFloatBuffer();
+                            fb =  fb.slice(1, fb.limit() - 1);
+                            bb.position(bb.position() + 4);
+                            return fb; }),
                 Map.entry("bb.asFloatBuffer().slice().duplicate()",
                           bb -> bb.asFloatBuffer().slice().duplicate())
         );
@@ -668,6 +693,11 @@ public static Object[][] doubleViewProvider() {
                           bb -> bb.asDoubleBuffer()),
                 Map.entry("bb.asDoubleBuffer().slice()",
                           bb -> bb.asDoubleBuffer().slice()),
+                Map.entry("bb.asDoubleBuffer().slice(index,length)",
+                        bb -> { var db = bb.asDoubleBuffer();
+                            db =  db.slice(1, db.limit() - 1);
+                            bb.position(bb.position() + 8);
+                            return db; }),
                 Map.entry("bb.asDoubleBuffer().slice().duplicate()",
                           bb -> bb.asDoubleBuffer().slice().duplicate())
         );

From 7f04d23be4273f32f40672e9f9f9c1c5d4ac02cf Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 4 Jan 2021 16:44:39 +0000
Subject: [PATCH 002/129] 8258800: Deprecate -XX:+AlwaysLockClassLoader

Reviewed-by: hseigel
---
 src/hotspot/share/runtime/arguments.cpp | 3 ++-
 src/hotspot/share/runtime/globals.hpp   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 5b262f6cffff4..dbf730a493a84 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -521,6 +521,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "AllowRedefinitionToAddDeleteMethods", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
   { "FlightRecorder",               JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
   { "CriticalJNINatives",           JDK_Version::jdk(16), JDK_Version::jdk(17), JDK_Version::jdk(18) },
+  { "AlwaysLockClassLoader",        JDK_Version::jdk(17), JDK_Version::jdk(18), JDK_Version::jdk(19) },
   { "UseBiasedLocking",             JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) },
   { "BiasedLockingStartupDelay",    JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) },
   { "PrintBiasedLockingStatistics", JDK_Version::jdk(15), JDK_Version::jdk(18), JDK_Version::jdk(19) },
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index ab324da78dd62..2c3a4f25db5bd 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -707,8 +707,8 @@ const intx ObjectAlignmentInBytes = 8;
           "Dynamically resize system dictionaries as needed")               \
                                                                             \
   product(bool, AlwaysLockClassLoader, false,                               \
-          "Require the VM to acquire the class loader lock before calling " \
-          "loadClass() even for class loaders registering "                 \
+          "(Deprecated) Require the VM to acquire the class loader lock "   \
+          "before calling loadClass() even for class loaders registering "  \
           "as parallel capable")                                            \
                                                                             \
   product(bool, AllowParallelDefineClass, false,                            \

From f80c63b38035f6b6969cca08cfc534d0476105af Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 4 Jan 2021 18:10:36 +0000
Subject: [PATCH 003/129] 8258490: Shenandoah: Full GC does not need to remark
 threads and drain SATB buffers

Reviewed-by: shade
---
 .../shenandoah/shenandoahConcurrentMark.cpp   | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index 7000cdc8ef194..f19f9e7f0636c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -225,6 +225,18 @@ void ShenandoahProcessConcurrentRootsTask<T>::work(uint worker_id) {
   _rs.oops_do(&cl, worker_id);
 }
 
+class ShenandoahClaimThreadClosure : public ThreadClosure {
+private:
+  const uintx _claim_token;
+public:
+  ShenandoahClaimThreadClosure() :
+   _claim_token(Threads::thread_claim_token()) {}
+
+  virtual void do_thread(Thread* thread) {
+    thread->claim_threads_do(false /*is_par*/, _claim_token);
+  }
+};
+
 class ShenandoahFinalMarkingTask : public AbstractGangTask {
 private:
   ShenandoahConcurrentMark* _cm;
@@ -234,6 +246,13 @@ class ShenandoahFinalMarkingTask : public AbstractGangTask {
 public:
   ShenandoahFinalMarkingTask(ShenandoahConcurrentMark* cm, TaskTerminator* terminator, bool dedup_string) :
     AbstractGangTask("Shenandoah Final Mark"), _cm(cm), _terminator(terminator), _dedup_string(dedup_string) {
+
+    // Full GC does not need to remark threads and drain SATB buffers, but we need to claim the
+    // threads - it requires a StrongRootsScope around the task.
+    if (ShenandoahHeap::heap()->is_full_gc_in_progress()) {
+      ShenandoahClaimThreadClosure tc;
+      Threads::threads_do(&tc);
+    }
   }
 
   void work(uint worker_id) {
@@ -242,33 +261,20 @@ class ShenandoahFinalMarkingTask : public AbstractGangTask {
     ShenandoahParallelWorkerSession worker_session(worker_id);
     ShenandoahReferenceProcessor* rp = heap->ref_processor();
 
-    // First drain remaining SATB buffers.
-    // Notice that this is not strictly necessary for mark-compact. But since
-    // it requires a StrongRootsScope around the task, we need to claim the
-    // threads, and performance-wise it doesn't really matter. Adds about 1ms to
-    // full-gc.
-    {
+    if (!heap->is_full_gc_in_progress()) {
       ShenandoahObjToScanQueue* q = _cm->get_queue(worker_id);
-
       ShenandoahSATBBufferClosure cl(q);
       SATBMarkQueueSet& satb_mq_set = ShenandoahBarrierSet::satb_mark_queue_set();
-      while (satb_mq_set.apply_closure_to_completed_buffer(&cl));
+      while (satb_mq_set.apply_closure_to_completed_buffer(&cl)) {}
+
+      assert(!heap->has_forwarded_objects(), "Not expected");
       bool do_nmethods = heap->unload_classes() && !ShenandoahConcurrentRoots::can_do_concurrent_class_unloading();
-      if (heap->has_forwarded_objects()) {
-        ShenandoahMarkResolveRefsClosure resolve_mark_cl(q, rp);
-        MarkingCodeBlobClosure blobsCl(&resolve_mark_cl, !CodeBlobToOopClosure::FixRelocations);
-        ShenandoahSATBAndRemarkCodeRootsThreadsClosure tc(&cl,
-                                                          ShenandoahStoreValEnqueueBarrier ? &resolve_mark_cl : NULL,
-                                                          do_nmethods ? &blobsCl : NULL);
-        Threads::threads_do(&tc);
-      } else {
-        ShenandoahMarkRefsClosure mark_cl(q, rp);
-        MarkingCodeBlobClosure blobsCl(&mark_cl, !CodeBlobToOopClosure::FixRelocations);
-        ShenandoahSATBAndRemarkCodeRootsThreadsClosure tc(&cl,
-                                                          ShenandoahStoreValEnqueueBarrier ? &mark_cl : NULL,
-                                                          do_nmethods ? &blobsCl : NULL);
-        Threads::threads_do(&tc);
-      }
+      ShenandoahMarkRefsClosure mark_cl(q, rp);
+      MarkingCodeBlobClosure blobsCl(&mark_cl, !CodeBlobToOopClosure::FixRelocations);
+      ShenandoahSATBAndRemarkCodeRootsThreadsClosure tc(&cl,
+                                                        ShenandoahStoreValEnqueueBarrier ? &mark_cl : NULL,
+                                                        do_nmethods ? &blobsCl : NULL);
+      Threads::threads_do(&tc);
     }
 
     _cm->mark_loop(worker_id, _terminator, rp,

From 9d160aa1b7ca0260a6e42c554b3afb1e34513c96 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Mon, 4 Jan 2021 21:01:25 +0000
Subject: [PATCH 004/129] 8257815: Replace global log2 functions with efficient
 implementations

Reviewed-by: kbarrett, stefank
---
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |  2 +-
 .../cpu/aarch64/gc/z/zGlobals_aarch64.cpp     |  2 +-
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |  4 +-
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp   |  2 +-
 src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp   |  4 +-
 src/hotspot/cpu/ppc/assembler_ppc.cpp         |  6 +-
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp   |  2 +-
 src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp   |  4 +-
 .../cpu/ppc/macroAssembler_ppc.inline.hpp     |  2 +-
 src/hotspot/cpu/ppc/ppc.ad                    | 39 ++++++------
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp  |  6 +-
 src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp |  4 +-
 src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp |  4 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |  2 +-
 src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp   |  4 +-
 src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp     |  2 +-
 src/hotspot/cpu/x86/interp_masm_x86.cpp       |  2 +-
 src/hotspot/cpu/x86/vm_version_x86.cpp        |  2 +-
 src/hotspot/cpu/x86/x86_64.ad                 |  8 +--
 .../share/compiler/compilationPolicy.cpp      |  2 +-
 .../share/compiler/compilerDefinitions.cpp    |  9 +--
 .../share/compiler/tieredThresholdPolicy.cpp  |  4 +-
 src/hotspot/share/gc/g1/g1BiasedArray.hpp     |  2 +-
 src/hotspot/share/gc/g1/g1FreeIdSet.cpp       |  3 +-
 src/hotspot/share/gc/g1/g1RemSet.cpp          |  5 +-
 src/hotspot/share/gc/g1/heapRegion.cpp        |  4 +-
 src/hotspot/share/gc/g1/heapRegionRemSet.cpp  |  3 +-
 .../gc/shared/partialArrayTaskStepper.cpp     |  3 +-
 .../shenandoahConcurrentMark.inline.hpp       |  3 +-
 .../gc/shenandoah/shenandoahHeapRegion.cpp    |  3 +-
 .../gc/shenandoah/shenandoahNumberSeq.cpp     |  2 +-
 src/hotspot/share/gc/z/zHeuristics.cpp        |  2 +-
 src/hotspot/share/opto/divnode.cpp            | 16 ++---
 src/hotspot/share/opto/mulnode.cpp            | 32 +++++-----
 src/hotspot/share/opto/parse2.cpp             |  2 +-
 src/hotspot/share/opto/vectorIntrinsics.cpp   |  2 +-
 .../share/utilities/globalDefinitions.hpp     | 53 -----------------
 src/hotspot/share/utilities/hashtable.cpp     |  3 +-
 src/hotspot/share/utilities/powerOfTwo.hpp    | 59 +++++++++++++------
 .../utilities/test_globalDefinitions.cpp      | 35 -----------
 .../gtest/utilities/test_powerOfTwo.cpp       | 42 +++++++++++++
 41 files changed, 182 insertions(+), 208 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 550f7f18a06f5..19d20dde9a449 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -1772,7 +1772,7 @@ void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr
             // move lreg_lo to dreg if divisor is 1
             __ mov(dreg, lreg_lo);
           } else {
-            unsigned int shift = exact_log2_long(c);
+            unsigned int shift = log2i_exact(c);
             // use rscratch1 as intermediate result register
             __ asr(rscratch1, lreg_lo, 63);
             __ add(rscratch1, lreg_lo, rscratch1, Assembler::LSR, 64 - shift);
diff --git a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
index e579594ae33e1..d887717913836 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
@@ -200,7 +200,7 @@ size_t ZPlatformAddressOffsetBits() {
   const size_t max_address_offset_bits = valid_max_address_offset_bits - 3;
   const size_t min_address_offset_bits = max_address_offset_bits - 2;
   const size_t address_offset = round_up_power_of_2(MaxHeapSize * ZVirtualToPhysicalRatio);
-  const size_t address_offset_bits = log2_intptr(address_offset);
+  const size_t address_offset_bits = log2i_exact(address_offset);
   return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
 }
 
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 31435b1b50f1b..7de5f870f51ba 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -302,7 +302,7 @@ void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool acqui
     cmp(in_nmethod ? sp : rfp, rscratch1);
     br(Assembler::HI, slow_path);
   } else {
-    tbnz(rscratch1, exact_log2(SafepointMechanism::poll_bit()), slow_path);
+    tbnz(rscratch1, log2i_exact(SafepointMechanism::poll_bit()), slow_path);
   }
 }
 
@@ -3996,7 +3996,7 @@ MacroAssembler::KlassDecodeMode MacroAssembler::klass_decode_mode() {
   if (operand_valid_for_logical_immediate(
         /*is32*/false, (uint64_t)CompressedKlassPointers::base())) {
     const uint64_t range_mask =
-      (1ULL << log2_intptr(CompressedKlassPointers::range())) - 1;
+      (1ULL << log2i(CompressedKlassPointers::range())) - 1;
     if (((uint64_t)CompressedKlassPointers::base() & range_mask) == 0) {
       return (_klass_decode_mode = KlassDecodeXor);
     }
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index f2b64263aa107..9026cf4256dc3 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -848,7 +848,7 @@ void LIR_Assembler::emit_op3(LIR_Op3* op) {
       __ add_32(dest, left, AsmOperand(left, lsr, 31));
       __ asr_32(dest, dest, 1);
     } else if (c != (int) 0x80000000) {
-      int power = log2_intptr(c);
+      int power = log2i_exact(c);
       __ asr_32(Rtemp, left, 31);
       __ add_32(dest, left, AsmOperand(Rtemp, lsr, 32-power)); // dest = left + (left < 0 ? 2^power - 1 : 0);
       __ asr_32(dest, dest, power);                            // dest = dest >>> power;
diff --git a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
index 9932e3a44e54b..5cba07805b9bf 100644
--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
@@ -329,12 +329,12 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
 bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
   assert(left != result, "should be different registers");
   if (is_power_of_2(c + 1)) {
-    LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1);
+    LIR_Address::Scale scale = (LIR_Address::Scale) log2i_exact(c + 1);
     LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT);
     __ sub(LIR_OprFact::address(addr), left, result); // rsb with shifted register
     return true;
   } else if (is_power_of_2(c - 1)) {
-    LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c - 1);
+    LIR_Address::Scale scale = (LIR_Address::Scale) log2i_exact(c - 1);
     LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT);
     __ add(left, LIR_OprFact::address(addr), result); // add with shifted register
     return true;
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.cpp b/src/hotspot/cpu/ppc/assembler_ppc.cpp
index 105790c604722..6a6be870991b8 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.cpp
@@ -81,13 +81,13 @@ int Assembler::branch_destination(int inst, int pos) {
 void Assembler::andi(Register a, Register s, const long ui16) {
   if (is_power_of_2(((jlong) ui16)+1)) {
     // pow2minus1
-    clrldi(a, s, 64-log2_long((((jlong) ui16)+1)));
+    clrldi(a, s, 64 - log2i_exact((((jlong) ui16)+1)));
   } else if (is_power_of_2((jlong) ui16)) {
     // pow2
-    rlwinm(a, s, 0, 31-log2_long((jlong) ui16), 31-log2_long((jlong) ui16));
+    rlwinm(a, s, 0, 31 - log2i_exact((jlong) ui16), 31 - log2i_exact((jlong) ui16));
   } else if (is_power_of_2((jlong)-ui16)) {
     // negpow2
-    clrrdi(a, s, log2_long((jlong)-ui16));
+    clrrdi(a, s, log2i_exact((jlong)-ui16));
   } else {
     assert(is_uimm(ui16, 16), "must be 16-bit unsigned immediate");
     andi_(a, s, ui16);
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index 6b28ba99d65f1..af014b6a023ef 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -341,7 +341,7 @@ void LIR_Assembler::arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right,
 
     } else if (is_power_of_2(divisor)) {
       // Convert division by a power of two into some shifts and logical operations.
-      int log2 = log2_intptr(divisor);
+      int log2 = log2i_exact(divisor);
 
       // Round towards 0.
       if (divisor == 2) {
diff --git a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
index 8ed404b9e3ba8..9a4dc0a32c273 100644
--- a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
@@ -293,11 +293,11 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
 bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
   assert(left != result, "should be different registers");
   if (is_power_of_2(c + 1)) {
-    __ shift_left(left, log2_int(c + 1), result);
+    __ shift_left(left, log2i_exact(c + 1), result);
     __ sub(result, left, result);
     return true;
   } else if (is_power_of_2(c - 1)) {
-    __ shift_left(left, log2_int(c - 1), result);
+    __ shift_left(left, log2i_exact(c - 1), result);
     __ add(result, left, result);
     return true;
   }
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
index eaa7aa0fcb2bd..c16741e1bd562 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
@@ -59,7 +59,7 @@ inline int MacroAssembler::get_ld_largeoffset_offset(address a) {
 inline void MacroAssembler::round_to(Register r, int modulus) {
   assert(is_power_of_2((jlong)modulus), "must be power of 2");
   addi(r, r, modulus-1);
-  clrrdi(r, r, log2_long((jlong)modulus));
+  clrrdi(r, r, log2i_exact((jlong)modulus));
 }
 
 // Move register if destination register and target register are different.
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 8f6fc83b594f2..028e7c702c635 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -4042,7 +4042,7 @@ operand immIhi16() %{
 %}
 
 operand immInegpow2() %{
-  predicate(is_power_of_2((jlong) (julong) (juint) (-(n->get_int()))));
+  predicate(is_power_of_2(-(juint)(n->get_int())));
   match(ConI);
   op_cost(0);
   format %{ %}
@@ -4050,7 +4050,7 @@ operand immInegpow2() %{
 %}
 
 operand immIpow2minus1() %{
-  predicate(is_power_of_2((((jlong) (n->get_int()))+1)));
+  predicate(is_power_of_2((juint)(n->get_int()) + 1u));
   match(ConI);
   op_cost(0);
   format %{ %}
@@ -4058,7 +4058,7 @@ operand immIpow2minus1() %{
 %}
 
 operand immIpowerOf2() %{
-  predicate(is_power_of_2((((jlong) (julong) (juint) (n->get_int())))));
+  predicate(is_power_of_2((juint)(n->get_int())));
   match(ConI);
   op_cost(0);
   format %{ %}
@@ -4292,7 +4292,7 @@ operand immLhighest16() %{
 %}
 
 operand immLnegpow2() %{
-  predicate(is_power_of_2((jlong)-(n->get_long())));
+  predicate(is_power_of_2(-(julong)(n->get_long())));
   match(ConL);
   op_cost(0);
   format %{ %}
@@ -4300,8 +4300,7 @@ operand immLnegpow2() %{
 %}
 
 operand immLpow2minus1() %{
-  predicate(is_power_of_2((((jlong) (n->get_long()))+1)) &&
-            (n->get_long() != (jlong)0xffffffffffffffffL));
+  predicate(is_power_of_2((julong)(n->get_long()) + 1ull));
   match(ConL);
   op_cost(0);
   format %{ %}
@@ -9076,9 +9075,8 @@ instruct lShiftI_andI_immInegpow2_imm5(iRegIdst dst, iRegIsrc src1, immInegpow2
   format %{ "RLWINM  $dst, lShiftI(AndI($src1, $src2), $src3)" %}
   size(4);
   ins_encode %{
-    long src2      = $src2$$constant;
     long src3      = $src3$$constant;
-    long maskbits  = src3 + log2_long((jlong) (julong) (juint) -src2);
+    long maskbits  = src3 + log2i_exact(-(juint)$src2$$constant);
     if (maskbits >= 32) {
       __ li($dst$$Register, 0); // addi
     } else {
@@ -9096,9 +9094,8 @@ instruct lShiftI_andI_immInegpow2_rShiftI_imm5(iRegIdst dst, iRegIsrc src1, immI
   format %{ "RLWINM  $dst, lShiftI(AndI(RShiftI($src1, $src3), $src2), $src3)" %}
   size(4);
   ins_encode %{
-    long src2      = $src2$$constant;
     long src3      = $src3$$constant;
-    long maskbits  = src3 + log2_long((jlong) (julong) (juint) -src2);
+    long maskbits  = src3 + log2i_exact(-(juint)$src2$$constant);
     if (maskbits >= 32) {
       __ li($dst$$Register, 0); // addi
     } else {
@@ -9366,7 +9363,7 @@ instruct andI_urShiftI_regI_immI_immIpow2minus1(iRegIdst dst, iRegIsrc src1, imm
   size(4);
   ins_encode %{
     int rshift = ($src2$$constant) & 0x1f;
-    int length = log2_long(((jlong) $src3$$constant) + 1);
+    int length = log2i_exact((juint)$src3$$constant + 1u);
     if (rshift + length > 32) {
       // if necessary, adjust mask to omit rotated bits.
       length = 32 - rshift;
@@ -9384,7 +9381,7 @@ instruct andL_urShiftL_regL_immI_immLpow2minus1(iRegLdst dst, iRegLsrc src1, imm
   size(4);
   ins_encode %{
     int rshift  = ($src2$$constant) & 0x3f;
-    int length = log2_long(((jlong) $src3$$constant) + 1);
+    int length = log2i_exact((julong)$src3$$constant + 1ull);
     if (rshift + length > 64) {
       // if necessary, adjust mask to omit rotated bits.
       length = 64 - rshift;
@@ -9788,7 +9785,7 @@ instruct andI_reg_immInegpow2(iRegIdst dst, iRegIsrc src1, immInegpow2 src2) %{
   format %{ "ANDWI   $dst, $src1, $src2" %}
   size(4);
   ins_encode %{
-    __ clrrdi($dst$$Register, $src1$$Register, log2_long((jlong)(julong)(juint)-($src2$$constant)));
+    __ clrrdi($dst$$Register, $src1$$Register, log2i_exact(-(juint)$src2$$constant));
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -9798,7 +9795,7 @@ instruct andI_reg_immIpow2minus1(iRegIdst dst, iRegIsrc src1, immIpow2minus1 src
   format %{ "ANDWI   $dst, $src1, $src2" %}
   size(4);
   ins_encode %{
-    __ clrldi($dst$$Register, $src1$$Register, 64-log2_long((((jlong) $src2$$constant)+1)));
+    __ clrldi($dst$$Register, $src1$$Register, 64 - log2i_exact((juint)$src2$$constant + 1u));
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -9809,8 +9806,8 @@ instruct andI_reg_immIpowerOf2(iRegIdst dst, iRegIsrc src1, immIpowerOf2 src2) %
   format %{ "ANDWI   $dst, $src1, $src2" %}
   size(4);
   ins_encode %{
-    __ rlwinm($dst$$Register, $src1$$Register, 0,
-              (31-log2_long((jlong) $src2$$constant)) & 0x1f, (31-log2_long((jlong) $src2$$constant)) & 0x1f);
+    int bitpos = 31 - log2i_exact((juint)$src2$$constant);
+    __ rlwinm($dst$$Register, $src1$$Register, 0, bitpos, bitpos);
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -9848,7 +9845,7 @@ instruct andL_reg_immLnegpow2(iRegLdst dst, iRegLsrc src1, immLnegpow2 src2) %{
   format %{ "ANDDI   $dst, $src1, $src2" %}
   size(4);
   ins_encode %{
-    __ clrrdi($dst$$Register, $src1$$Register, log2_long((jlong)-$src2$$constant));
+    __ clrrdi($dst$$Register, $src1$$Register, log2i_exact(-(julong)$src2$$constant));
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -9858,7 +9855,7 @@ instruct andL_reg_immLpow2minus1(iRegLdst dst, iRegLsrc src1, immLpow2minus1 src
   format %{ "ANDDI   $dst, $src1, $src2" %}
   size(4);
   ins_encode %{
-    __ clrldi($dst$$Register, $src1$$Register, 64-log2_long((((jlong) $src2$$constant)+1)));
+    __ clrldi($dst$$Register, $src1$$Register, 64 - log2i_exact((julong)$src2$$constant + 1ull));
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -9871,7 +9868,7 @@ instruct convL2I_andL_reg_immLpow2minus1(iRegIdst dst, iRegLsrc src1, immLpow2mi
   format %{ "ANDDI   $dst, $src1, $src2 \t// long + l2i" %}
   size(4);
   ins_encode %{
-    __ clrldi($dst$$Register, $src1$$Register, 64-log2_long((((jlong) $src2$$constant)+1)));
+    __ clrldi($dst$$Register, $src1$$Register, 64 - log2i_exact((julong)$src2$$constant + 1ull));
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -10459,7 +10456,7 @@ instruct convI2Bool_andI_reg_immIpowerOf2(iRegIdst dst, iRegIsrc src, immIpowerO
   format %{ "RLWINM  $dst, $src, $mask \t// convI2B(AndI($src, $mask))" %}
   size(4);
   ins_encode %{
-    __ rlwinm($dst$$Register, $src$$Register, (32-log2_long((jlong)$mask$$constant)) & 0x1f, 31, 31);
+    __ rlwinm($dst$$Register, $src$$Register, 32 - log2i_exact((juint)($mask$$constant)), 31, 31);
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -12154,7 +12151,7 @@ instruct align_addr(iRegPdst dst, iRegPsrc src, immLnegpow2 mask) %{
   format %{ "ANDDI   $dst, $src, $mask \t// next aligned address" %}
   size(4);
   ins_encode %{
-    __ clrrdi($dst$$Register, $src$$Register, log2_long((jlong)-$mask$$constant));
+    __ clrrdi($dst$$Register, $src$$Register, log2i_exact(-(julong)$mask$$constant));
   %}
   ins_pipe(pipe_class_default);
 %}
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 97794d85dc233..0e2e1c29135d7 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -1897,7 +1897,7 @@ void TemplateTable::tableswitch() {
 
   // Align bcp.
   __ addi(Rdef_offset_addr, R14_bcp, BytesPerInt);
-  __ clrrdi(Rdef_offset_addr, Rdef_offset_addr, log2_long((jlong)BytesPerInt));
+  __ clrrdi(Rdef_offset_addr, Rdef_offset_addr, LogBytesPerInt);
 
   // Load lo & hi.
   __ get_u4(Rlow_byte, Rdef_offset_addr, BytesPerInt, InterpreterMacroAssembler::Unsigned);
@@ -1956,7 +1956,7 @@ void TemplateTable::fast_linearswitch() {
 
   // Align bcp.
   __ addi(Rdef_offset_addr, R14_bcp, BytesPerInt);
-  __ clrrdi(Rdef_offset_addr, Rdef_offset_addr, log2_long((jlong)BytesPerInt));
+  __ clrrdi(Rdef_offset_addr, Rdef_offset_addr, LogBytesPerInt);
 
   // Setup loop counter and limit.
   __ get_u4(Rcount, Rdef_offset_addr, BytesPerInt, InterpreterMacroAssembler::Unsigned);
@@ -2044,7 +2044,7 @@ void TemplateTable::fast_binaryswitch() {
 
   // Find Array start,
   __ addi(Rarray, R14_bcp, 3 * BytesPerInt);
-  __ clrrdi(Rarray, Rarray, log2_long((jlong)BytesPerInt));
+  __ clrrdi(Rarray, Rarray, LogBytesPerInt);
 
   // initialize i & j
   __ li(Ri,0);
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index fb99fca8cf267..70c92551f6262 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -1802,7 +1802,7 @@ void LIR_Assembler::arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right,
       Register treg1 = Z_R0_scratch;
       Register treg2 = Z_R1_scratch;
       jlong divisor = right->as_jlong();
-      jlong log_divisor = log2_long(right->as_jlong());
+      jlong log_divisor = log2i_exact(right->as_jlong());
 
       if (divisor == min_jlong) {
         // Min_jlong is special. Result is '0' except for min_jlong/min_jlong = 1.
@@ -1890,7 +1890,7 @@ void LIR_Assembler::arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right,
     Register treg1 = Z_R0_scratch;
     Register treg2 = Z_R1_scratch;
     jlong divisor = right->as_jint();
-    jlong log_divisor = log2_long(right->as_jint());
+    jlong log_divisor = log2i_exact(right->as_jint());
     __ move_reg_if_needed(dreg, T_LONG, lreg, T_INT); // sign extend
     if (divisor == 2) {
       __ z_srlg(treg2, dreg, 63);     // dividend < 0 ?  1 : 0
diff --git a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
index 7224426d56e56..ff4fd48672b1d 100644
--- a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
@@ -228,12 +228,12 @@ bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result
   if (tmp->is_valid()) {
     if (is_power_of_2(c + 1)) {
       __ move(left, tmp);
-      __ shift_left(left, log2_int(c + 1), left);
+      __ shift_left(left, log2i_exact(c + 1), left);
       __ sub(left, tmp, result);
       return true;
     } else if (is_power_of_2(c - 1)) {
       __ move(left, tmp);
-      __ shift_left(left, log2_int(c - 1), left);
+      __ shift_left(left, log2i_exact(c - 1), left);
       __ add(left, tmp, result);
       return true;
     }
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index f7a0ffce1e99a..8caff08e52fb3 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -2630,7 +2630,7 @@ void LIR_Assembler::arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right,
         __ andl(rdx, divisor - 1);
         __ addl(lreg, rdx);
       }
-      __ sarl(lreg, log2_jint(divisor));
+      __ sarl(lreg, log2i_exact(divisor));
       move_regs(lreg, dreg);
     } else if (code == lir_irem) {
       Label done;
diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
index f8cb7bb70e64e..77c49237ff997 100644
--- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
@@ -249,12 +249,12 @@ bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result
   if (tmp->is_valid() && c > 0 && c < max_jint) {
     if (is_power_of_2(c + 1)) {
       __ move(left, tmp);
-      __ shift_left(left, log2_jint(c + 1), left);
+      __ shift_left(left, log2i_exact(c + 1), left);
       __ sub(left, tmp, result);
       return true;
     } else if (is_power_of_2(c - 1)) {
       __ move(left, tmp);
-      __ shift_left(left, log2_jint(c - 1), left);
+      __ shift_left(left, log2i_exact(c - 1), left);
       __ add(left, tmp, result);
       return true;
     }
diff --git a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
index 78afbda693ba7..896bcb1ac1611 100644
--- a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
@@ -139,7 +139,7 @@ size_t ZPlatformAddressOffsetBits() {
   const size_t min_address_offset_bits = 42; // 4TB
   const size_t max_address_offset_bits = 44; // 16TB
   const size_t address_offset = round_up_power_of_2(MaxHeapSize * ZVirtualToPhysicalRatio);
-  const size_t address_offset_bits = log2_intptr(address_offset);
+  const size_t address_offset_bits = log2i_exact(address_offset);
   return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
 }
 
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index e7b0df3d675ba..efd41b32c3160 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -153,7 +153,7 @@ void InterpreterMacroAssembler::profile_arguments_type(Register mdp, Register ca
         // CallTypeData/VirtualCallTypeData to reach its end. Non null
         // if there's a return to profile.
         assert(ReturnTypeEntry::static_cell_count() < TypeStackSlotEntries::per_arg_count(), "can't move past ret type");
-        shll(tmp, exact_log2(DataLayout::cell_size));
+        shll(tmp, log2i_exact((int)DataLayout::cell_size));
         addptr(mdp, tmp);
       }
       movptr(Address(rbp, frame::interpreter_frame_mdp_offset * wordSize), mdp);
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index eac8c54367e80..3212a0fee0962 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -782,7 +782,7 @@ void VM_Version::get_processor_features() {
               cores_per_cpu(), threads_per_core(),
               cpu_family(), _model, _stepping, os::cpu_microcode_revision());
   assert(res > 0, "not enough temporary space allocated");
-  assert(exact_log2_long(CPU_MAX_FEATURE) + 1 == sizeof(_features_names) / sizeof(char*), "wrong size features_names");
+  assert(log2i_exact((uint64_t)CPU_MAX_FEATURE) + 1 == sizeof(_features_names) / sizeof(char*), "wrong size features_names");
   insert_features_names(buf + res, sizeof(buf) - res, _features_names);
 
   _features_string = os::strdup(buf);
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 73fe153752806..7b23b45ef1ead 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -9592,7 +9592,7 @@ instruct btrL_mem_imm(memory dst, immL_NotPow2 con, rFlagsReg cr)
 %{
   // con should be a pure 64-bit immediate given that not(con) is a power of 2
   // because AND/OR works well enough for 8/32-bit values.
-  predicate(log2_long(~n->in(3)->in(2)->get_long()) > 30);
+  predicate(log2i_graceful(~n->in(3)->in(2)->get_long()) > 30);
 
   match(Set dst (StoreL dst (AndL (LoadL dst) con)));
   effect(KILL cr);
@@ -9600,7 +9600,7 @@ instruct btrL_mem_imm(memory dst, immL_NotPow2 con, rFlagsReg cr)
   ins_cost(125);
   format %{ "btrq    $dst, log2(not($con))\t# long" %}
   ins_encode %{
-    __ btrq($dst$$Address, log2_long(~$con$$constant));
+    __ btrq($dst$$Address, log2i_exact(~$con$$constant));
   %}
   ins_pipe(ialu_mem_imm);
 %}
@@ -9802,7 +9802,7 @@ instruct btsL_mem_imm(memory dst, immL_Pow2 con, rFlagsReg cr)
 %{
   // con should be a pure 64-bit power of 2 immediate
   // because AND/OR works well enough for 8/32-bit values.
-  predicate(log2_long(n->in(3)->in(2)->get_long()) > 31);
+  predicate(log2i_graceful(n->in(3)->in(2)->get_long()) > 31);
 
   match(Set dst (StoreL dst (OrL (LoadL dst) con)));
   effect(KILL cr);
@@ -9810,7 +9810,7 @@ instruct btsL_mem_imm(memory dst, immL_Pow2 con, rFlagsReg cr)
   ins_cost(125);
   format %{ "btsq    $dst, log2($con)\t# long" %}
   ins_encode %{
-    __ btsq($dst$$Address, log2_long((julong)$con$$constant));
+    __ btsq($dst$$Address, log2i_exact((julong)$con$$constant));
   %}
   ins_pipe(ialu_mem_imm);
 %}
diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index 030357f3d5902..777f1f534cf8f 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -251,7 +251,7 @@ void SimpleCompPolicy::initialize() {
     // Example: if CICompilerCountPerCPU is true, then we get
     // max(log2(8)-1,1) = 2 compiler threads on an 8-way machine.
     // May help big-app startup time.
-    _compiler_count = MAX2(log2_int(os::active_processor_count())-1,1);
+    _compiler_count = MAX2(log2i_graceful(os::active_processor_count()) - 1, 1);
     // Make sure there is enough space in the code cache to hold all the compiler buffers
     size_t buffer_size = 1;
 #ifdef COMPILER1
diff --git a/src/hotspot/share/compiler/compilerDefinitions.cpp b/src/hotspot/share/compiler/compilerDefinitions.cpp
index 5e3c2ef9052cd..4aa2512982b7a 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.cpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.cpp
@@ -117,19 +117,14 @@ intx CompilerConfig::scaled_freq_log(intx freq_log, double scale) {
   // of length InvocationCounter::number_of_count_bits. Mask values are always
   // one bit shorter then the value of the notification frequency. Set
   // max_freq_bits accordingly.
-  intx max_freq_bits = InvocationCounter::number_of_count_bits + 1;
+  int max_freq_bits = InvocationCounter::number_of_count_bits + 1;
   intx scaled_freq = scaled_compile_threshold((intx)1 << freq_log, scale);
 
   if (scaled_freq == 0) {
     // Return 0 right away to avoid calculating log2 of 0.
     return 0;
   } else {
-    intx res = log2_intptr(scaled_freq);
-    if (res > max_freq_bits) {
-      return max_freq_bits;
-    } else {
-      return res;
-    }
+    return MIN2(log2i(scaled_freq), max_freq_bits);
   }
 }
 
diff --git a/src/hotspot/share/compiler/tieredThresholdPolicy.cpp b/src/hotspot/share/compiler/tieredThresholdPolicy.cpp
index b72d604e1d51f..f076a36a082cc 100644
--- a/src/hotspot/share/compiler/tieredThresholdPolicy.cpp
+++ b/src/hotspot/share/compiler/tieredThresholdPolicy.cpp
@@ -253,8 +253,8 @@ void TieredThresholdPolicy::initialize() {
   }
   if (CICompilerCountPerCPU) {
     // Simple log n seems to grow too slowly for tiered, try something faster: log n * log log n
-    int log_cpu = log2_int(os::active_processor_count());
-    int loglog_cpu = log2_int(MAX2(log_cpu, 1));
+    int log_cpu = log2i(os::active_processor_count());
+    int loglog_cpu = log2i(MAX2(log_cpu, 1));
     count = MAX2(log_cpu * loglog_cpu * 3 / 2, 2);
     // Make sure there is enough space in the code cache to hold all the compiler buffers
     size_t c1_size = Compiler::code_buffer_size();
diff --git a/src/hotspot/share/gc/g1/g1BiasedArray.hpp b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
index 7c6047065666e..8080b76fe5788 100644
--- a/src/hotspot/share/gc/g1/g1BiasedArray.hpp
+++ b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
@@ -82,7 +82,7 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
     size_t num_target_elems = pointer_delta(end, bottom, mapping_granularity_in_bytes);
     idx_t bias = (uintptr_t)bottom / mapping_granularity_in_bytes;
     address base = create_new_base_array(num_target_elems, target_elem_size_in_bytes);
-    initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes, log2_intptr(mapping_granularity_in_bytes));
+    initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes, log2i_exact(mapping_granularity_in_bytes));
   }
 
   size_t bias() const { return _bias; }
diff --git a/src/hotspot/share/gc/g1/g1FreeIdSet.cpp b/src/hotspot/share/gc/g1/g1FreeIdSet.cpp
index 6b78ab7432608..37e663b9e6b1d 100644
--- a/src/hotspot/share/gc/g1/g1FreeIdSet.cpp
+++ b/src/hotspot/share/gc/g1/g1FreeIdSet.cpp
@@ -29,6 +29,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 G1FreeIdSet::G1FreeIdSet(uint start, uint size) :
   _sem(size),          // counting semaphore for available ids
@@ -43,7 +44,7 @@ G1FreeIdSet::G1FreeIdSet(uint start, uint size) :
          "start (%u) + size (%u) overflow: ", start, size);
   // 2^shift must be greater than size. Equal is not permitted, because
   // size is the "end of list" value, and can be the index part of _head.
-  uint shift = log2_intptr((uintptr_t)size) + 1;
+  uint shift = log2i(size) + 1;
   assert(shift <= (BitsPerWord / 2), "excessive size %u", size);
   _head_index_mask = (uintx(1) << shift) - 1;
   assert(size <= _head_index_mask, "invariant");
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index 9c9a699938b84..a737da25ceabc 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -57,6 +57,7 @@
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/powerOfTwo.hpp"
 #include "utilities/stack.inline.hpp"
 #include "utilities/ticks.hpp"
 
@@ -289,7 +290,7 @@ class G1RemSetScanState : public CHeapObj<mtGC> {
     _collection_set_iter_state(NULL),
     _card_table_scan_state(NULL),
     _scan_chunks_per_region(get_chunks_per_region(HeapRegion::LogOfHRGrainBytes)),
-    _log_scan_chunks_per_region(log2_uint(_scan_chunks_per_region)),
+    _log_scan_chunks_per_region(log2i(_scan_chunks_per_region)),
     _region_scan_chunks(NULL),
     _num_total_scan_chunks(0),
     _scan_chunks_shift(0),
@@ -313,7 +314,7 @@ class G1RemSetScanState : public CHeapObj<mtGC> {
     _num_total_scan_chunks = max_reserved_regions * _scan_chunks_per_region;
     _region_scan_chunks = NEW_C_HEAP_ARRAY(bool, _num_total_scan_chunks, mtGC);
 
-    _scan_chunks_shift = (uint8_t)log2_intptr(HeapRegion::CardsPerRegion / _scan_chunks_per_region);
+    _scan_chunks_shift = (uint8_t)log2i(HeapRegion::CardsPerRegion / _scan_chunks_per_region);
     _scan_top = NEW_C_HEAP_ARRAY(HeapWord*, max_reserved_regions, mtGC);
   }
 
diff --git a/src/hotspot/share/gc/g1/heapRegion.cpp b/src/hotspot/share/gc/g1/heapRegion.cpp
index d954d1603176a..d856b6d4b26dd 100644
--- a/src/hotspot/share/gc/g1/heapRegion.cpp
+++ b/src/hotspot/share/gc/g1/heapRegion.cpp
@@ -78,7 +78,7 @@ void HeapRegion::setup_heap_region_size(size_t max_heap_size) {
   region_size = clamp(region_size, HeapRegionBounds::min_size(), HeapRegionBounds::max_size());
 
   // Calculate the log for the region size.
-  int region_size_log = exact_log2_long((jlong)region_size);
+  int region_size_log = log2i_exact(region_size);
 
   // Now, set up the globals.
   guarantee(LogOfHRGrainBytes == 0, "we should only set it once");
@@ -99,7 +99,7 @@ void HeapRegion::setup_heap_region_size(size_t max_heap_size) {
   guarantee(CardsPerRegion == 0, "we should only set it once");
   CardsPerRegion = GrainBytes >> G1CardTable::card_shift;
 
-  LogCardsPerRegion = log2_long((jlong) CardsPerRegion);
+  LogCardsPerRegion = log2i(CardsPerRegion);
 
   if (G1HeapRegionSize != GrainBytes) {
     FLAG_SET_ERGO(G1HeapRegionSize, GrainBytes);
diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp b/src/hotspot/share/gc/g1/heapRegionRemSet.cpp
index f23932b9d0e97..4c122ab41bd0f 100644
--- a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp
+++ b/src/hotspot/share/gc/g1/heapRegionRemSet.cpp
@@ -39,6 +39,7 @@
 #include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 const char* HeapRegionRemSet::_state_strings[] =  {"Untracked", "Updating", "Complete"};
 const char* HeapRegionRemSet::_short_state_strings[] =  {"UNTRA", "UPDAT", "CMPLT"};
@@ -83,7 +84,7 @@ OtherRegionsTable::OtherRegionsTable(Mutex* m) :
 
   if (_max_fine_entries == 0) {
     assert(_mod_max_fine_entries_mask == 0, "Both or none.");
-    size_t max_entries_log = (size_t)log2_long((jlong)G1RSetRegionEntries);
+    size_t max_entries_log = (size_t)log2i(G1RSetRegionEntries);
     _max_fine_entries = (size_t)1 << max_entries_log;
     _mod_max_fine_entries_mask = _max_fine_entries - 1;
 
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
index 7b60e1b0e1185..ed52d7abff18c 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
@@ -26,6 +26,7 @@
 #include "gc/shared/partialArrayTaskStepper.hpp"
 #include "oops/arrayOop.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 static uint compute_task_limit(uint n_workers) {
   // Don't need more than n_workers tasks at a time.  But allowing up to
@@ -39,7 +40,7 @@ static uint compute_task_fanout(uint task_limit) {
   // number of enqueued tasks.  A constant fanout may be too slow when
   // parallelism (and so task_limit) is large.  A constant fraction might
   // be overly eager.  Using log2 attempts to balance between those.
-  uint result = log2_uint(task_limit);
+  uint result = log2i(task_limit);
   // result must be > 0.  result should be > 1 if task_limit > 1, to
   // provide some potentially parallel tasks.  But don't just +1 to
   // avoid otherwise increasing rate of task generation.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
index 40e0957fa72e1..f9872b04fdaaf 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
@@ -36,6 +36,7 @@
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 template <class T>
 void ShenandoahConcurrentMark::do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveData* live_data, ShenandoahMarkTask* task) {
@@ -120,7 +121,7 @@ inline void ShenandoahConcurrentMark::do_chunked_array_start(ShenandoahObjToScan
     // A few slices only, process directly
     array->oop_iterate_range(cl, 0, len);
   } else {
-    int bits = log2_long((size_t) len);
+    int bits = log2i_graceful(len);
     // Compensate for non-power-of-two arrays, cover the array in excess:
     if (len != (1 << bits)) bits++;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index 2dd5f161d1df4..2ba5fa01a1604 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -40,6 +40,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 size_t ShenandoahHeapRegion::RegionCount = 0;
 size_t ShenandoahHeapRegion::RegionSizeBytes = 0;
@@ -548,7 +549,7 @@ void ShenandoahHeapRegion::setup_sizes(size_t max_heap_size) {
     region_size = MAX2(region_size, os::large_page_size());
   }
 
-  int region_size_log = log2_long((jlong) region_size);
+  int region_size_log = log2i(region_size);
   // Recalculate the region size to make sure it's a power of
   // 2. This means that region_size is the largest power of 2 that's
   // <= what we've calculated so far.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.cpp b/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.cpp
index b55d50e9bb6e2..33d5df425b35b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.cpp
@@ -139,7 +139,7 @@ void BinaryMagnitudeSeq::clear() {
 void BinaryMagnitudeSeq::add(size_t val) {
   Atomic::add(&_sum, val);
 
-  int mag = log2_intptr(val) + 1;
+  int mag = log2i_graceful(val) + 1;
 
   // Defensively saturate for product bits:
   if (mag < 0) {
diff --git a/src/hotspot/share/gc/z/zHeuristics.cpp b/src/hotspot/share/gc/z/zHeuristics.cpp
index ca704962ae76b..6f67c93536771 100644
--- a/src/hotspot/share/gc/z/zHeuristics.cpp
+++ b/src/hotspot/share/gc/z/zHeuristics.cpp
@@ -45,7 +45,7 @@ void ZHeuristics::set_medium_page_size() {
   if (size > ZPageSizeSmall) {
     // Enable medium pages
     ZPageSizeMedium             = size;
-    ZPageSizeMediumShift        = log2_intptr(ZPageSizeMedium);
+    ZPageSizeMediumShift        = log2i_exact(ZPageSizeMedium);
     ZObjectSizeLimitMedium      = ZPageSizeMedium / 8;
     ZObjectAlignmentMediumShift = (int)ZPageSizeMediumShift - 13;
     ZObjectAlignmentMedium      = 1 << ZObjectAlignmentMediumShift;
diff --git a/src/hotspot/share/opto/divnode.cpp b/src/hotspot/share/opto/divnode.cpp
index 2e5d65682707d..7f7d6e5ea013f 100644
--- a/src/hotspot/share/opto/divnode.cpp
+++ b/src/hotspot/share/opto/divnode.cpp
@@ -134,7 +134,7 @@ static Node *transform_int_divide( PhaseGVN *phase, Node *dividend, jint divisor
     }
 
     // Add rounding to the shift to handle the sign bit
-    int l = log2_jint(d-1)+1;
+    int l = log2i_graceful(d - 1) + 1;
     if (needs_rounding) {
       // Divide-by-power-of-2 can be made into a shift, but you have to do
       // more math for the rounding.  You need to add 0 for positive
@@ -380,7 +380,7 @@ static Node *transform_long_divide( PhaseGVN *phase, Node *dividend, jlong divis
     }
 
     // Add rounding to the shift to handle the sign bit
-    int l = log2_long(d-1)+1;
+    int l = log2i_graceful(d - 1) + 1;
     if (needs_rounding) {
       // Divide-by-power-of-2 can be made into a shift, but you have to do
       // more math for the rounding.  You need to add 0 for positive
@@ -929,8 +929,8 @@ Node *ModINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   int log2_con = -1;
 
   // If this is a power of two, they maybe we can mask it
-  if( is_power_of_2(pos_con) ) {
-    log2_con = log2_intptr((intptr_t)pos_con);
+  if (is_power_of_2(pos_con)) {
+    log2_con = log2i_exact(pos_con);
 
     const Type *dt = phase->type(in(1));
     const TypeInt *dti = dt->isa_int();
@@ -1036,8 +1036,8 @@ Node *ModLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   Node *hook = new Node(1);
 
   // Expand mod
-  if( con >= 0 && con < max_jlong && is_power_of_2(con+1) ) {
-    uint k = exact_log2_long(con+1);  // Extract k
+  if(con >= 0 && con < max_jlong && is_power_of_2(con + 1)) {
+    uint k = log2i_exact(con + 1);  // Extract k
 
     // Basic algorithm by David Detlefs.  See fastmod_long.java for gory details.
     // Used to help a popular random number generator which does a long-mod
@@ -1096,8 +1096,8 @@ Node *ModLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   int log2_con = -1;
 
   // If this is a power of two, then maybe we can mask it
-  if( is_power_of_2(pos_con) ) {
-    log2_con = exact_log2_long(pos_con);
+  if (is_power_of_2(pos_con)) {
+    log2_con = log2i_exact(pos_con);
 
     const Type *dt = phase->type(in(1));
     const TypeLong *dtl = dt->isa_long();
diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index 734cd2f131932..14cc03f58df0a 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -201,21 +201,19 @@ Node *MulINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   Node *res = NULL;
   unsigned int bit1 = abs_con & (0-abs_con);       // Extract low bit
   if (bit1 == abs_con) {           // Found a power of 2?
-    res = new LShiftINode(in(1), phase->intcon(log2_uint(bit1)));
+    res = new LShiftINode(in(1), phase->intcon(log2i_exact(bit1)));
   } else {
-
     // Check for constant with 2 bits set
-    unsigned int bit2 = abs_con-bit1;
-    bit2 = bit2 & (0-bit2);          // Extract 2nd bit
+    unsigned int bit2 = abs_con - bit1;
+    bit2 = bit2 & (0 - bit2);          // Extract 2nd bit
     if (bit2 + bit1 == abs_con) {    // Found all bits in con?
-      Node *n1 = phase->transform( new LShiftINode(in(1), phase->intcon(log2_uint(bit1))));
-      Node *n2 = phase->transform( new LShiftINode(in(1), phase->intcon(log2_uint(bit2))));
+      Node *n1 = phase->transform(new LShiftINode(in(1), phase->intcon(log2i_exact(bit1))));
+      Node *n2 = phase->transform(new LShiftINode(in(1), phase->intcon(log2i_exact(bit2))));
       res = new AddINode(n2, n1);
-
-    } else if (is_power_of_2(abs_con+1)) {
-      // Sleezy: power-of-2 -1.  Next time be generic.
+    } else if (is_power_of_2(abs_con + 1)) {
+      // Sleezy: power-of-2 - 1.  Next time be generic.
       unsigned int temp = abs_con + 1;
-      Node *n1 = phase->transform(new LShiftINode(in(1), phase->intcon(log2_uint(temp))));
+      Node *n1 = phase->transform(new LShiftINode(in(1), phase->intcon(log2i_exact(temp))));
       res = new SubINode(n1, in(1));
     } else {
       return MulNode::Ideal(phase, can_reshape);
@@ -297,21 +295,21 @@ Node *MulLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   Node *res = NULL;
   julong bit1 = abs_con & (0-abs_con);      // Extract low bit
   if (bit1 == abs_con) {           // Found a power of 2?
-    res = new LShiftLNode(in(1), phase->intcon(log2_long(bit1)));
+    res = new LShiftLNode(in(1), phase->intcon(log2i_exact(bit1)));
   } else {
 
     // Check for constant with 2 bits set
     julong bit2 = abs_con-bit1;
     bit2 = bit2 & (0-bit2);          // Extract 2nd bit
     if (bit2 + bit1 == abs_con) {    // Found all bits in con?
-      Node *n1 = phase->transform(new LShiftLNode(in(1), phase->intcon(log2_long(bit1))));
-      Node *n2 = phase->transform(new LShiftLNode(in(1), phase->intcon(log2_long(bit2))));
+      Node *n1 = phase->transform(new LShiftLNode(in(1), phase->intcon(log2i_exact(bit1))));
+      Node *n2 = phase->transform(new LShiftLNode(in(1), phase->intcon(log2i_exact(bit2))));
       res = new AddLNode(n2, n1);
 
     } else if (is_power_of_2(abs_con+1)) {
       // Sleezy: power-of-2 -1.  Next time be generic.
       julong temp = abs_con + 1;
-      Node *n1 = phase->transform( new LShiftLNode(in(1), phase->intcon(log2_long(temp))));
+      Node *n1 = phase->transform( new LShiftLNode(in(1), phase->intcon(log2i_exact(temp))));
       res = new SubLNode(n1, in(1));
     } else {
       return MulNode::Ideal(phase, can_reshape);
@@ -447,9 +445,9 @@ Node* AndINode::Identity(PhaseGVN* phase) {
   if (t2 && t2->is_con()) {
     int con = t2->get_con();
     // Masking off high bits which are always zero is useless.
-    const TypeInt* t1 = phase->type( in(1) )->isa_int();
+    const TypeInt* t1 = phase->type(in(1))->isa_int();
     if (t1 != NULL && t1->_lo >= 0) {
-      jint t1_support = right_n_bits(1 + log2_jint(t1->_hi));
+      jint t1_support = right_n_bits(1 + log2i_graceful(t1->_hi));
       if ((t1_support & con) == t1_support)
         return in1;
     }
@@ -572,7 +570,7 @@ Node* AndLNode::Identity(PhaseGVN* phase) {
     // Masking off high bits which are always zero is useless.
     const TypeLong* t1 = phase->type( in(1) )->isa_long();
     if (t1 != NULL && t1->_lo >= 0) {
-      int bit_count = log2_long(t1->_hi) + 1;
+      int bit_count = log2i_graceful(t1->_hi) + 1;
       jlong t1_support = jlong(max_julong >> (BitsPerJavaLong - bit_count));
       if ((t1_support & con) == t1_support)
         return usr;
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index c006de2ae5acb..17dee7032e80e 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -975,7 +975,7 @@ void Parse::jump_switch_ranges(Node* key_val, SwitchRange *lo, SwitchRange *hi,
 #ifndef PRODUCT
   if (switch_depth == 0) {
     _max_switch_depth = 0;
-    _est_switch_depth = log2_intptr((hi-lo+1)-1)+1;
+    _est_switch_depth = log2i_graceful((hi - lo + 1) - 1) + 1;
   }
 #endif
 
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 76cfc71239fc5..d5006a510b2eb 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -368,7 +368,7 @@ bool LibraryCallKit::inline_vector_shuffle_iota() {
     Node* bcast_step     = gvn().transform(VectorNode::scalar2vector(step, num_elem, type_bt));
     res = gvn().transform(VectorNode::make(Op_MulI, res, bcast_step, num_elem, elem_bt));
   } else if (step_val->get_con() > 1) {
-    Node* cnt = gvn().makecon(TypeInt::make(log2_int(step_val->get_con())));
+    Node* cnt = gvn().makecon(TypeInt::make(log2i_exact(step_val->get_con())));
     res = gvn().transform(VectorNode::make(Op_LShiftVB, res, cnt, vt));
   }
 
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index fd691e02d9b40..b7f8b1a4b0bce 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -1042,59 +1042,6 @@ inline T clamp(T value, T min, T max) {
   return MIN2(MAX2(value, min), max);
 }
 
-// Returns largest i such that 2^i <= x.
-// If x == 0, the function returns -1.
-inline int log2_intptr(uintptr_t x) {
-  int i = -1;
-  uintptr_t p = 1;
-  while (p != 0 && p <= x) {
-    // p = 2^(i+1) && p <= x (i.e., 2^(i+1) <= x)
-    i++; p *= 2;
-  }
-  // p = 2^(i+1) && x < p (i.e., 2^i <= x < 2^(i+1))
-  // If p = 0, overflow has occurred and i = 31 or i = 63 (depending on the machine word size).
-  return i;
-}
-
-//* largest i such that 2^i <= x
-inline int log2_long(julong x) {
-  int i = -1;
-  julong p =  1;
-  while (p != 0 && p <= x) {
-    // p = 2^(i+1) && p <= x (i.e., 2^(i+1) <= x)
-    i++; p *= 2;
-  }
-  // p = 2^(i+1) && x < p (i.e., 2^i <= x < 2^(i+1))
-  // (if p = 0 then overflow occurred and i = 63)
-  return i;
-}
-
-// If x < 0, the function returns 31 on a 32-bit machine and 63 on a 64-bit machine.
-inline int log2_intptr(intptr_t x) {
-  return log2_intptr((uintptr_t)x);
-}
-
-inline int log2_int(int x) {
-  STATIC_ASSERT(sizeof(int) <= sizeof(uintptr_t));
-  return log2_intptr((uintptr_t)(unsigned int)x);
-}
-
-inline int log2_jint(jint x) {
-  STATIC_ASSERT(sizeof(jint) <= sizeof(uintptr_t));
-  return log2_intptr((uintptr_t)(juint)x);
-}
-
-inline int log2_uint(uint x) {
-  STATIC_ASSERT(sizeof(uint) <= sizeof(uintptr_t));
-  return log2_intptr((uintptr_t)x);
-}
-
-//  A negative value of 'x' will return '63'
-inline int log2_jlong(jlong x) {
-  STATIC_ASSERT(sizeof(jlong) <= sizeof(julong));
-  return log2_long((julong)x);
-}
-
 inline bool is_odd (intx x) { return x & 1;      }
 inline bool is_even(intx x) { return !is_odd(x); }
 
diff --git a/src/hotspot/share/utilities/hashtable.cpp b/src/hotspot/share/utilities/hashtable.cpp
index 682bb97d5d5d5..b7fa6481adffc 100644
--- a/src/hotspot/share/utilities/hashtable.cpp
+++ b/src/hotspot/share/utilities/hashtable.cpp
@@ -64,8 +64,7 @@ template <MEMFLAGS F> BasicHashtableEntry<F>* BasicHashtable<F>::new_entry(unsig
     if (_first_free_entry + _entry_size >= _end_block) {
       int block_size = MAX2((int)_table_size / 2, (int)_number_of_entries); // pick a reasonable value
       block_size = clamp(block_size, 2, 512); // but never go out of this range
-      int len = _entry_size * block_size;
-      len = 1 << log2_int(len); // round down to power of 2
+      int len = round_down_power_of_2(_entry_size * block_size);
       assert(len >= _entry_size, "");
       _first_free_entry = NEW_C_HEAP_ARRAY2(char, len, F, CURRENT_PC);
       _entry_blocks.append(_first_free_entry);
diff --git a/src/hotspot/share/utilities/powerOfTwo.hpp b/src/hotspot/share/utilities/powerOfTwo.hpp
index 3fb10dbc3ca71..a98b81e803709 100644
--- a/src/hotspot/share/utilities/powerOfTwo.hpp
+++ b/src/hotspot/share/utilities/powerOfTwo.hpp
@@ -27,6 +27,7 @@
 
 #include "metaprogramming/enableIf.hpp"
 #include "utilities/count_leading_zeros.hpp"
+#include "utilities/count_trailing_zeros.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include <limits>
@@ -40,26 +41,52 @@ constexpr T max_power_of_2() {
   return max_val - (max_val >> 1);
 }
 
-// Returns true iff there exists integer i such that (T(1) << i) == x.
+// Returns true iff there exists integer i such that (T(1) << i) == value.
 template <typename T, ENABLE_IF(std::is_integral<T>::value)>
-constexpr bool is_power_of_2(T x) {
-  return (x > T(0)) && ((x & (x - 1)) == T(0));
+constexpr bool is_power_of_2(T value) {
+  return (value > T(0)) && ((value & (value - 1)) == T(0));
 }
 
-// Log2 of a power of 2
-inline int exact_log2(intptr_t x) {
-  assert(is_power_of_2((uintptr_t)x), "x must be a power of 2: " INTPTR_FORMAT, x);
+// Log2 of a positive, integral value, i.e., largest i such that 2^i <= value
+// Precondition: value > 0
+template<typename T, ENABLE_IF(std::is_integral<T>::value)>
+inline int log2i(T value) {
+  assert(value > T(0), "value must be > 0");
+  const int bits = sizeof(value) * BitsPerByte;
+  return bits - count_leading_zeros(value) - 1;
+}
+
+// Log2 of positive, integral value, i.e., largest i such that 2^i <= value
+// Returns -1 if value is zero
+// For negative values this will return 63 for 64-bit types, 31 for
+// 32-bit types, and so on.
+template<typename T, ENABLE_IF(std::is_integral<T>::value)>
+inline int log2i_graceful(T value) {
+  if (value == 0) {
+    return -1;
+  }
+  const int bits = sizeof(value) * BitsPerByte;
+  return bits - count_leading_zeros(value) - 1;
+}
 
-  const int bits = sizeof x * BitsPerByte;
-  return bits - count_leading_zeros(x) - 1;
+// Log2 of a power of 2, i.e., i such that 2^i == value
+// Preconditions: value > 0, value is a power of two
+template<typename T, ENABLE_IF(std::is_integral<T>::value)>
+inline int log2i_exact(T value) {
+  assert(is_power_of_2(value),
+         "value must be a power of 2: " UINT64_FORMAT_X,
+         static_cast<uint64_t>(value));
+  return count_trailing_zeros(value);
 }
 
-// Log2 of a power of 2
-inline int exact_log2_long(jlong x) {
-  assert(is_power_of_2((julong)x), "x must be a power of 2: " JLONG_FORMAT, x);
+// Preconditions: value != 0, and the unsigned representation of value is a power of two
+inline int exact_log2(intptr_t value) {
+  return log2i_exact((uintptr_t)value);
+}
 
-  const int bits = sizeof x * BitsPerByte;
-  return bits - count_leading_zeros(x) - 1;
+// Preconditions: value != 0, and the unsigned representation of value is a power of two
+inline int exact_log2_long(jlong value) {
+  return log2i_exact((julong)value);
 }
 
 // Round down to the closest power of two less than or equal to the given value.
@@ -67,8 +94,7 @@ inline int exact_log2_long(jlong x) {
 template<typename T, ENABLE_IF(std::is_integral<T>::value)>
 inline T round_down_power_of_2(T value) {
   assert(value > 0, "Invalid value");
-  uint32_t lz = count_leading_zeros(value);
-  return T(1) << (sizeof(T) * BitsPerByte - 1 - lz);
+  return T(1) << log2i(value);
 }
 
 // Round up to the closest power of two greater to or equal to the given value.
@@ -81,8 +107,7 @@ inline T round_up_power_of_2(T value) {
   if (is_power_of_2(value)) {
     return value;
   }
-  uint32_t lz = count_leading_zeros(value);
-  return T(1) << (sizeof(T) * BitsPerByte - lz);
+  return T(1) << (log2i(value) + 1);
 }
 
 // Calculate the next power of two greater than the given value.
diff --git a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
index e82eea051aed3..503bd2d3eead7 100644
--- a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
+++ b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
@@ -190,41 +190,6 @@ TEST(globalDefinitions, byte_size_in_exact_unit) {
 #endif
 }
 
-#define EXPECT_EQ_LOG2(fn, type)                                \
-{                                                               \
-  int limit = sizeof (type) * BitsPerByte;                      \
-  if (std::is_signed<type>::value) {                            \
-    EXPECT_EQ(limit - 1, fn(std::numeric_limits<type>::min())); \
-    EXPECT_EQ(limit - 1, fn((type)-1));                         \
-    limit--;                                                    \
-  }                                                             \
-  {                                                             \
-    /* Test the all-1s bit patterns */                          \
-    type var = 1;                                               \
-    for (int i = 0; i < limit; i++, var = (var << 1) | 1) {     \
-      EXPECT_EQ(i, fn(var));                                    \
-    }                                                           \
-  }                                                             \
-  {                                                             \
-    /* Test the powers of 2 and powers + 1*/                    \
-    type var = 1;                                               \
-    for (int i = 0; i < limit; i++, var <<= 1) {                \
-      EXPECT_EQ(i, fn(var));                                    \
-      EXPECT_EQ(i, fn(var | 1));                                \
-    }                                                           \
-  }                                                             \
-}
-
-TEST(globalDefinitions, log2) {
-  EXPECT_EQ_LOG2(log2_intptr, uintptr_t);
-  EXPECT_EQ_LOG2(log2_intptr, intptr_t);
-  EXPECT_EQ_LOG2(log2_long, julong);
-  EXPECT_EQ_LOG2(log2_int, int);
-  EXPECT_EQ_LOG2(log2_jint, jint);
-  EXPECT_EQ_LOG2(log2_uint, uint);
-  EXPECT_EQ_LOG2(log2_jlong, jlong);
-}
-
 TEST(globalDefinitions, array_size) {
   const size_t test_size = 10;
 
diff --git a/test/hotspot/gtest/utilities/test_powerOfTwo.cpp b/test/hotspot/gtest/utilities/test_powerOfTwo.cpp
index 3cf22fb032ab4..3830c6301092b 100644
--- a/test/hotspot/gtest/utilities/test_powerOfTwo.cpp
+++ b/test/hotspot/gtest/utilities/test_powerOfTwo.cpp
@@ -262,3 +262,45 @@ TEST(power_of_2, max) {
   EXPECT_EQ(max_power_of_2<uint32_t>(), 0x80000000u);
   EXPECT_EQ(max_power_of_2<uint64_t>(), UCONST64(0x8000000000000000));
 }
+
+template <typename T, ENABLE_IF(std::is_integral<T>::value)>
+void check_log2i_variants_for(T dummy) {
+  int limit = sizeof(T) * BitsPerByte;
+  if (std::is_signed<T>::value) {
+    T min = std::numeric_limits<T>::min();
+    EXPECT_EQ(limit - 1, log2i_graceful(min));
+    EXPECT_EQ(limit - 1, log2i_graceful((T)-1));
+    limit--;
+  }
+  {
+    // Test log2i_graceful handles 0 input
+    EXPECT_EQ(-1, log2i_graceful(T(0)));
+  }
+  {
+    // Test the all-1s bit patterns
+    T var = 1;
+    for (int i = 0; i < limit; i++, var = (var << 1) | 1) {
+      EXPECT_EQ(i, log2i(var));
+    }
+  }
+  {
+    // Test the powers of 2 and powers + 1
+    T var = 1;
+    for (int i = 0; i < limit; i++, var <<= 1) {
+      EXPECT_EQ(i, log2i(var));
+      EXPECT_EQ(i, log2i_graceful(var));
+      EXPECT_EQ(i, log2i_exact(var));
+      EXPECT_EQ(i, log2i(var | 1));
+    }
+  }
+}
+
+TEST(power_of_2, log2i) {
+  check_log2i_variants_for((uintptr_t)0);
+  check_log2i_variants_for((intptr_t)0);
+  check_log2i_variants_for((julong)0);
+  check_log2i_variants_for((int)0);
+  check_log2i_variants_for((jint)0);
+  check_log2i_variants_for((uint)0);
+  check_log2i_variants_for((jlong)0);
+}

From e6f9926009be24144290cd1ec731f1c7c7796434 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Mon, 4 Jan 2021 21:09:01 +0000
Subject: [PATCH 005/129] 8257809: JNI warnings from Toolkit JPEG image
 decoding

Reviewed-by: serb
---
 .../share/native/libjavajpeg/jpegdecoder.c    |  20 +++---
 .../GetImageJNICheck/GetImageJNICheck.java    |  42 ++++++++++++
 .../GetImageJNICheck/GetImageJNICheck.sh      |  64 ++++++++++++++++++
 .../java/awt/image/GetImageJNICheck/duke.jpg  | Bin 0 -> 6031 bytes
 4 files changed, 116 insertions(+), 10 deletions(-)
 create mode 100644 test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.java
 create mode 100644 test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.sh
 create mode 100644 test/jdk/java/awt/image/GetImageJNICheck/duke.jpg

diff --git a/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c b/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
index 419c4a94b60cd..61ea804906f1f 100644
--- a/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
+++ b/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c
@@ -221,27 +221,27 @@ static void RELEASE_ARRAYS(JNIEnv *env, sun_jpeg_source_ptr src)
 
 static int GET_ARRAYS(JNIEnv *env, sun_jpeg_source_ptr src)
 {
+    if (src->hOutputBuffer) {
+        assert(src->outbuf.ip == 0);
+        src->outbufSize = (*env)->GetArrayLength(env, src->hOutputBuffer);
+        src->outbuf.ip = (int *)(*env)->GetPrimitiveArrayCritical
+            (env, src->hOutputBuffer, 0);
+        if (src->outbuf.ip == 0) {
+            return 0;
+        }
+    }
     if (src->hInputBuffer) {
         assert(src->inbuf == 0);
         src->inbuf = (JOCTET *)(*env)->GetPrimitiveArrayCritical
             (env, src->hInputBuffer, 0);
         if (src->inbuf == 0) {
+            RELEASE_ARRAYS(env, src);
             return 0;
         }
         if ((int)(src->inbufoffset) >= 0) {
             src->pub.next_input_byte = src->inbuf + src->inbufoffset;
         }
     }
-    if (src->hOutputBuffer) {
-        assert(src->outbuf.ip == 0);
-        src->outbufSize = (*env)->GetArrayLength(env, src->hOutputBuffer);
-        src->outbuf.ip = (int *)(*env)->GetPrimitiveArrayCritical
-            (env, src->hOutputBuffer, 0);
-        if (src->outbuf.ip == 0) {
-            RELEASE_ARRAYS(env, src);
-            return 0;
-        }
-    }
     return 1;
 }
 
diff --git a/test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.java b/test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.java
new file mode 100644
index 0000000000000..3780fa46ba798
--- /dev/null
+++ b/test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Component;
+import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.Toolkit;
+
+public class GetImageJNICheck extends Component {
+
+     public static void main(String[] args) throws Exception {
+        System.setProperty("java.awt.headless", "true");
+        Toolkit tk = Toolkit.getDefaultToolkit();
+        String testPath = System.getProperty("test.src", ".");
+        String imgFile = testPath + java.io.File.separator + "duke.jpg";
+        Image image = tk.getImage(imgFile);
+        MediaTracker mt = new MediaTracker(new GetImageJNICheck() );
+        mt.addImage(image, 0);
+        mt.waitForAll();
+        System.exit(0);
+     }
+}
diff --git a/test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.sh b/test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.sh
new file mode 100644
index 0000000000000..31b43744b89e8
--- /dev/null
+++ b/test/jdk/java/awt/image/GetImageJNICheck/GetImageJNICheck.sh
@@ -0,0 +1,64 @@
+#!/bin/ksh -p
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+#   @test
+#   @bug        8257809
+#   @summary    Tests that there are no JNI warnings.
+#   @compile GetImageJNICheck.java
+#   @run shell/timeout=300 GetImageJNICheck.sh
+#
+OS=`uname`
+
+if [ "${TESTJAVA}" = "" ]
+then
+  echo "TESTJAVA not set.  Test cannot execute.  Failed."
+  exit 1
+fi
+
+# pick up the compiled class files.
+if [ -z "${TESTCLASSES}" ]; then
+  CP="."
+  $TESTJAVA/bin/javac GetImageJNICheck.java
+else
+  CP="${TESTCLASSES}"
+fi
+
+$TESTJAVA/bin/java ${TESTVMOPTS} \
+    -cp "${CP}" -Xcheck:jni GetImageJNICheck | grep ReleasePrimitiveArrayCritical > "${CP}"/log.txt
+
+#if [ $? -ne 0 ]
+#    then
+#      echo "Test fails: exception thrown!"
+#      exit 1
+#fi
+
+# any messages logged indicate a failure.
+if [ -s "${CP}"/log.txt ]; then
+    echo "Test failed"
+    cat "${CP}"/log.txt
+    exit 1
+fi
+
+echo "Test passed"
+exit 0
diff --git a/test/jdk/java/awt/image/GetImageJNICheck/duke.jpg b/test/jdk/java/awt/image/GetImageJNICheck/duke.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3bdf9a4fc648afda6a083f90767ba4363b1c24a7
GIT binary patch
literal 6031
zcmbVQcT`hbvp)eLfFJ^b3TmztMGz4is6Z41L@q=?sY)&)VnDh;Xo-pvs$8XcQHV<K
zHFOecC<2ihIs~MMU<f4y(q6ppuKTU^{(A4t-skLD=ggipzuD)^>^<BO?hLU1mZ7mB
z00M!4o4f{aDZn!WB;pYOn3@7A000O90w76%pT~iC4FJgk0)O)Wa0?{&FK+=-{zrxn
z05Aw(&p$GDyzv+DH2<3Y&&c<Y?_UYTNB;ltzeKs?fIh$n0{!ZIyv`$j0sdbkxMvT)
z09X(V1`7%bf`#@9gM~zd1O<h~ghlr56%`c)3ybX&6WzyS_x@7yYcBuaa|QMa2@37~
zKNGhRkPre80D>PR5AaEV_$5HxRsh07BEa+4FPHs8AU^&*0z8X&cJKsn`+4T`^YihH
z71+ab1SpjE9@rxxAbDKlx}cP~BUs-1z`5sdJ_#x4l{QIR^sOnLf8g^%SVZRFp~JFD
zCr&D#Qn_&PlBU+>EBZGK42^CY-?F@O*UH+)*3Rjn^COqX2v^^ye*OW-z@V^~ufj1A
zkx_5s6B3h>-~E;HIXxpYD?2AQudKWRS6NkEQ`_9q+D2^e=<Mnr7#tcVkBp8{X6L@m
zFDx#7U#6{ZY;MuF89TebaDf2+|AzH1vj2fgf`^Nbw+4H_zi@&00(cj{#2$g;8iJD7
z&B2b|Qu61X3mwpV^Qp8+SmC_In)CyoJ`owk3lt^VFKB-w``-b3@&7{hFR=gM8UsZ6
zLA=G|mjIx^540<6EPD1)B-1p+pzJH^IAgh&NNSV)AVXhsBb&F0y7|fH$rn76&k+HR
z3V5N{h6&PKU@42G&jp&JHn_m+J6N2>4i*P)4d0@fWlg6};F?0Q>=gEiL@ghqNqc|j
z>D<e{UmS{aC%8b1U5GUo_?$|U;sPR9Nu0|jTtLi;X3vQVXoazqsZhqe7r})KJgVj?
zCLG!%Jj3qu)YhMU)-U8OU07DB*pQ0<X8aRoIpU#{+hdV^@RZ_P>5CQ_3CI1XFrQgG
zZ7(p4_L+s46in-M3|_NeO)2zE#gtORv}%B`Y=><J^_iPx^K|86D_o8dM7q0H+!l8X
zjv)6%7XFl{9i`ab*@o1!n!dx|a)FBOF>2g}^Rv{b?O5+Z*W!0-;Z{d4O&lpOKeYt4
z9Ncgi;sSeW*x71^sXQ>#M9b5bk;mo?-n{3#-CCc-X+7GDuX`8d(%QT*Sb8Y#;Y@-<
z?>K>Rk`U9W;^;LsWL%?0zER&G{*?<b+|;9{H!V@exd6o|kPEb*0<R)y_fgbVY6P5d
zdkRhKnw6C#1bUk?q0EcaVCBLiX#T}?^9D~w>NM+OaT|K~6k$IXSo>7R1?Cd7DTJ}~
z+04ZhMMgXg)U`j5CNTPg3%ILxqez?{4~8J*yj7A80j15kad#jStXN|`;SyOuG40fe
z%Rup=hIF+C)FDhKBI?W#&OFCv!p`1dnQVDIP}D~wZDPK+d4}j?s3FHcT!h5XlW6!j
zm)X5;>T<{ugIsu|`}Lup4kpTp(bzLqq2t#yh#D=d_Ow%60KDlgv(Y&0`<?FYy4EqA
z?0#Z2qv72%E+GH#LTlKo=hv=D+adht#l@L79BdfymXw0qGIhfjuYQ>5QRD>TI-xa^
zGl8!U`fmfGo5#{xy#{leI-3yRLi~RBbKM$L(4=1VWTS6x6q?ZM8M%HrrfP&%LWD$m
zjdJd+T;l<$M!*<eiyl|!0y^(G%;LrJ6)vzsrn=B`IP4HJU!kdeUy7GdsR=!qidfG<
z)@^pyJ5%P(kZWivBiS69I*4lx)T={}Nu3V~q4AuIZauiVGtuB9Cl-7MFSL712lm>b
zpm<({5l{b2`x4^M&JBO%v9c@vJZ_XOUZ*w+bT3Y#Y}l1mg`w$lFbRVh0(iNW_=%H#
zvpi)Tw(X?1xGBB!gL$r9x1?%}SUKhXGgozjbbNXJs*DpO-r?Z>2S-j3qnP%)>I~?c
z&3l@dyDDb&_}*yVC)ju%>KgIhVxardocx96=Pa$F^YmbL5(`GNzm2izx4M7Qq~g!>
zuA~}C8B6TMn=r+&63eD#gV3<g9Maf@vHM8`n#wry)>Z1%_(+oc(Z48}?doZDSDcF6
z>S;3NLTh0Y*N>bXx6zOI7|D0znO9z3HQ-WG)Sdt8W3IM`uGLHHi%Ilb+n%2*8%TeV
zSl9CH4~t@zvPpIsLl<^^jdOA`wmr<ozM~dH*S^g5BdZ#RQL;4y7Ylvcf^HR9Z6|$=
zd^Gfxy->q1@^)X%5m}4_&A*hQW3n=(^7Y}sJQqmw?b1gtNkdoQwB`00nM~inP|qV|
zYee`Pa?)gH(<+RefxmK+NRpDvf1GIObF;VwiD~;VtwFq%C6V`ZpzL05XJ&bPKpo2J
z{>4&GGSYGL3I%nndEm>&%IQ+egag_3W4-%hja9oYd;-f|*O7Xk@V>r+pn`4TDC207
ziJ0ziuX7LL!{Y8LywFV~vvfxAXUlC<-(LPe?9PAt@%6`m;-hQ$^jdw7qFk@^(0U9*
zkw30+Q=z&TvS!4Rc2!fDbx%v2L-WI1F5)vPeN3H^N>+}_dV2M4)9gI9W*D;Ta*t5G
zbGn6^L+9wuP9V06a1*-6iBkDsF2R@twmRp%fantQl-XQ>cWqa0<EEE&$T3eRWiGGc
z4~*PH^!<*vgx@P`_*S~_>?PW<pV^0X7o%u|*s*6!_cZKbE?^NJ2xgiNKzV;!dwyj#
zBRUHSGfLaA3xE7uh3Q6}yApa7kcv+`t4hMl-^Bk`9cr$J`HSd1fPkof6F~LFHC8(+
z&TiS^<_9@S9p%X3ZVCz9F>bumAcKXr9SKNKrT<_exd4hF<uA)dai(+&;qP5USXk&+
zcAbj<;tnc%9^Eb|72-+@LkHV8KtHTotCd*8Xu;=0Y-sw6)a7lLjlc5R8%LfR>z+s6
zMJc(vgK#F^C<xnL@1b1PTxvCQWYwWIBq5<r{p*Gr>27-+YjknC65e<}*oYVI{aF??
zdQH`>{?kt%z7|N<4W*7fGI=@<F_#N0+(;9DLT-eY7syXHL)347Cb$!3YO&>{sQQb%
z&|S`$%vm~XzZ~RWJN7U##{gMwj6O2flbm?u@iS$h{_!W@=B;-AUg#q#LvwM)r5P&3
z2yTSnFzq#)yyS#BKF~kEsdj0XD2@BG$nI(|A~CB*BDJwYXyR^(K*&B#Ic;~dz#v6b
zZ1T+U<bJx>4t}v6BIvgl9XT!RUYLRGAz@Mrekufv*O)m-{RoGggiIFM&k`a|*Mrxl
zcC<|t?c64fk5(A|zJRd1yWV#vzNB)PRQ7Ggk}#8rE?sOTFce+dBmTe*QwA@1?!UJF
zxR#v(SxV^!V!x91dI+mHn;05%)>9aJ=K|WH(jm??*@=*AgFRo%J1WB!Z5*pe7Ns8n
zsn;-g&~DHNm>J&swBjr~Jq#0Xc1CkL*v-u&j<n7ZEKc&)5nXsWw~{;j>LG4n;pO0t
zyPGY}ZTbfND>J<XC2t>nM^dv}P|U-qNYQPb+>I`Ww#yMBHHUTO>`j={lD~)4J$84W
z3LuPSM&5~$s#ku1Y!9L<+uPOR?Nv=7Hc4C4U+kZjC3JNoiC=4a(3(!??A`?x-jdy}
zjN_$72c%QmJsIC*VkKmMN?EP@$)lIv;$uT6ElUZr#j;1w^xC@5JF0|LxlFS(;I>G0
z%9--DxRzaq_cT4CDfITh=8|IKiSO};+#5H43*v+fVoT60DHOF?14bj!H>#@E2+y>E
z=mLX`<@gMB^trR^X=|meXY=2Yl28Fx4JW(;#m9^|B0DqG*U85etJbpVYTe1AL{m$P
z>T78?l|GD**Ye9k5=3R5_@JEDIpdTQw@Rc{oV<O^qsxpd-UqLadZ0mU4c6`KHmFs{
zdPHsS!GuL=q=AlFcZK_M1)loobqmqqZ1mh>WTAY&S%_Nt%OtD4&vPcE!JgGexxg;V
zj&^@mjW9~;IevTu9U$Gx>BSy6jruJ_uuof`qKa^=81CsFo~LMFguN9{FYoiwZ2JxJ
zb9nQ8#v_F8BaaO7%IIqs;r{t_rISke_VygPpU{}<V2o>Xh3o7e6j{%kIO^q-p&pg6
zVtfB7u@?k$E>I<2`~#jmE{4Kz0gpH;FCamC4>oPE#mVOi16SvFvEYzf?Cn<fP!erf
z6TFd_f9#Nh@f$~Gx1laBckZ(8(43eReCK=Md5(uEv^fYphWn$ZUjs|TV?g>pB(q@+
zgyQO*g7Je}BGRQt@2)Oy!XvAg2FP*qGIlh}(}QfCe5v+g!j;|8NSoFkM?V1?==^I`
z_k{I)9P0p@j;&{BqFvFlEJSSz6GpDTTU1$`u9@Og+o$H_by_|)VL>zM5alF-$&3w6
z<^lrBj1^ru)?t{K?ZnP`#=^{)S>A|eN%NlMLv-{+YiL$+B>Ew2WV#K$W-%R?9OU`Z
zVnKZGlE@jqR6Qlp2Qig0%GW6iA!iLXtvte{*FQL6S}3&Tw4+Kt^E3N4cgEU>7`_q2
z2R_->hsNu%svfI_XQ<;T^o`oF_GS3$z+9+4M?``bY=j0l^2iY*?^$uNrCM~9U1+t&
zWV`&>Wa6fzYPUD1pF9s=;pfTy$@tDQT9;O)&(vh-{oqJUL%-l@Ryl=;&xmJ7G=h`B
z-OjwEcso*&3%DF1Z-z4YINetSF>4pK`RCvQ%~O0OC6)c3`*0%yJ-C&#>oUl1;GQo6
z{z_h^p#l{2XcZAE{ba6;(J-sbx;#_u?uf%Qr%6TF*sbW-V8#?$+K<i0{1y`~QrIzd
zjWJ<r+h6wb$on0o<*6^!(0C}UtK?9Ki#AQ`UH?n>;OtXZH(y$}vhO{p?Yzgpa)h^d
z0RCdYcz1T#jkT&qdt+S{BoiL)OiPY?L6kC%l|KAOxMb_NeMfiZS(~nd{@>5?g}$GG
zkC?#92MHCd>z=hgIJSn??Atmd!g_J&nt01maY_+J5IgfjsNl(J!k!zC9(Y}P(fh3;
z1|Tjdl3@nY7N=_8)`eC&nB;GvlfnZN?;W)zYN?o=jlzASo~o<rQ46#zH%YppnDld%
zgG4tW(KFbo^XzQsOmYwxctvn#27ie=u$0n<iTF71WL#>w)0I?vs2%h{IAq9dRpfcE
z>Q2EBVI~z_AybYPD~?1-v+lXyqW8_eRwao~@trVivYL7adcnf63#Q>}c~U2@-y2%U
z&6>XFQT<}r8l3-8dpP^R!&%e;F3_Y-n2Co<a`@3rSL@BN6|tGaiL<fRcQ})4oJd8y
z+xN5W`$nCfNaiZFciA3TbBw6E%>QA;jlMmXlqoP&Z$`XuGu(JafPV)Bk3uQB1;<Ii
zJ2PmHw<RwqFmr5H*{VMn9`%{R{lTjC3n4J6uQ4imd6SdS#F*7^{19hqyEvLIyKBOc
zg6;ASSZ`E|HBHy;Nt@cNOcq*waOcN8r%O0qBA@<?v_QnMAmZ^(+C76G#9O!k*@pbr
z+jXlgAGF=lX5xMZ>LR>;@#IEvF@@oKXJHk>057tft>eXI;XTl%`y2%19q%Y&uH$RR
z&Om#<hhy+USDi~uJjKU_;ScqUy)X1bt~1-jruWm}rPwty@lkR!9E5(DqkU@a1#xQJ
zwl5=49k)Mh)h=^bzhXTNwHp$3MLG7`cX%Rn%_{EM7`6o#dF3FH^s0%HbTt~ebxPqd
zQ|+5#XbJ_BzQ?8)+3m*OWsC5(1}><PU07S{UVYk`Xl-wMMyyOPXHeG+i+b1Xp|#Ww
zyy@!5!dq)}4WG!;y=cw60oM-sUKBmg$cQWL@@)@GPc)0>0uK{H6UggB{=*Js<C!1c
z_hGZA%N}l<BeP*O!)KIgUo4ylNmkBV7<Dxs19jN#;!vw0ZOkhLn)`SB>z`bm<0<fi
zB!;SH!|2h@kCt1o#X*dNxw~(zP7ekg<P++2efrkD$di~Re_!47&1h+btiBdC79yio
z4@oDfeT$0XZQFKVh0NumCUs@jL<df`ianU>U6M4-^GHFmrQd**(Nk@K)~o|^^yK>f
zp@I-iufEBNn|=E7e$l{TMN9VlzE7dwI_6a=3u+27$=*(#C-9ilok?e~xV)8Go1J>H
zHc}<6E2?gJT7MZfHoy_N>`MzasQs#YU~Cdm>pXVojHkz;z0naQ(TKd8F`9Zl#z(y2
zsx!N?@s8<^#rZ9c2*=}{#<mcJXyRQWDJ{Q_Q>oCjd65^y#tExBfmtp0A@ou%pj8aL
z#DqY<u5@kv+7e!E#cEJ{LaTTI3EPaVz^q)QG+58{q^4Fyvvj1!mqnu_?W6w;IJBtK
z5?d$yeVtw$@x;En{3RC%lqTGwLq`_rISuS&j-uMc3loyK>$|F<f+}=j9CI0pZ!p?X
zC`xbDOHgriMi6`a{g;?o-g!2+wp@(l1XO(L;mE0}_28_+0U8ebmW5!ryVDL*vLjjQ
zvrL_}<x83}zD+8WS+DG)L07aabVSH=RV#f=Q&)I-=E?xWaQn`{PmhOI2(|2P*y|TJ
zAsToc?`nT}LI#?lY}7oxZ|bpKKpXsJz;HkiEK<=vkX1R0IBaYStc)1$)3Mg^g-1;D
z()!FB*`fB=erm88PP(&iy6eGn_l%rR$XAz%1_ZiQzx-2d1nlzx<!8$*Orw;HhV!YX
zX?Gcin7fVz_y>&NH#;VEN6SSnrpwpZXcYFQ=?mp8*&+A77BwsO{t{`3z&K83$$T+l
zmuzj!#6={1|IE_wU)BAZr5&w<I?x#Shp35x3VSgkp15FPsK;q#K#BWZlX9H=jyK8^
zl8PBh$t##*PA8;7i1CW1{(JN)9^#Xt?Q`$h#!iHV_0uTBYkYMoKh?gt91-PEQ6wnN
z858kT&Sdr2Y9{Upm{;Dh^_c9xJ`zXHnZ+NJNPgfoIA>LGI&-}$Zwd7Y({uJ+ZCSb=
zqI$e=U?3fz>*q2$7M@c|Z1+QASLJBOpF;NC$8+xP12;Gf>7KLe%nFRYLW#dT2|tJG
zgB&W{`Vkr1Ix_GCR9%CnTfYV87HJuDj;fh`$4UE#1TZa-Z?>pW7W(H)nR|rgAk?dz
zEz;m&4K4sG*2>2#l9gzh5$ZTO>K1vUq2+m>iN*u);+_1>dL2l9f2?k&!g{wUx?m{L
zVYTFQl&TYug?1CCqM>WqWM0Zx8Jcy0u2UCxj}4pCIq=-NPaP-vo=gU53mMIRE+GGj
zfY6rE)0`KDgZf(YQE?}x&}(~>%zGzlw%2*VD46dD89Rz_RGMtDQ4II1+_3Mm6>9RT
zA$k*CbtdNBI+lu7pi;M9-qT4-t7MCxlxsdfOO%EqT*~{m;ekKYNUA$l*f5q~9s_)b
z>GG0#0{1RP>qtgEn{3$xv7=p4mEGC&7S6Tk+a$2~^MzZ=nnsD`wWDLC4PC+julOSd
zW6G_J(UYn~34W_TQzYW_GBh`eRA-Ia#Vlvl;zmXlN(QQ^kL4fyp5Y@J6EwFZ5c0zy
zu!45T&XWFTO9tB?Wp}L2?oihtJAo!vyjE!a=x0!-^!!t67dnZ3m4%);0w0;)+*sp5
z{rkB&yPOM{aRCSe#E#_xFsL}=WS%uIGc;R*S)0)9PF~HdkXP$ER>lRY(TR@Myc5$_
VFWi5aU|9?f+s)Q&2*z?p{|oOZ3DE!m

literal 0
HcmV?d00001


From 216c2ec077447718ae912831647250561a969f4e Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Mon, 4 Jan 2021 23:41:51 +0000
Subject: [PATCH 006/129] 8258703: Incorrect 512-bit vector registers restore
 on x86_32

Reviewed-by: kvn, sviswanathan
---
 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index 812b56f6b5166..5c1056e8e0268 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -314,18 +314,19 @@ void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_ve
   }
 
   if (restore_vectors) {
+    off = additional_frame_bytes - ymm_bytes;
+    // Restore upper half of YMM registers.
+    for (int n = 0; n < num_xmm_regs; n++) {
+      __ vinsertf128_high(as_XMMRegister(n), Address(rsp, n*16+off));
+    }
+
     if (UseAVX > 2) {
       // Restore upper half of ZMM registers.
       for (int n = 0; n < num_xmm_regs; n++) {
         __ vinsertf64x4_high(as_XMMRegister(n), Address(rsp, n*32));
       }
-      __ addptr(rsp, zmm_bytes);
-    }
-    // Restore upper half of YMM registers.
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ vinsertf128_high(as_XMMRegister(n), Address(rsp, n*16));
     }
-    __ addptr(rsp, ymm_bytes);
+    __ addptr(rsp, additional_frame_bytes);
   }
 
   __ pop_FPU_state();

From f0aae81ed553303131c84fec3f37ca6c3e981222 Mon Sep 17 00:00:00 2001
From: Xin Liu <xliu@openjdk.org>
Date: Mon, 4 Jan 2021 23:58:53 +0000
Subject: [PATCH 007/129] 8259020: null-check of g1 write_ref_field_pre_entry
 is not necessary

Reviewed-by: kbarrett, ayang, phh
---
 src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
index fbb2c492a15cd..81fb5c0cc2ec8 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp
@@ -45,11 +45,8 @@ void G1BarrierSetRuntime::write_ref_array_post_entry(HeapWord* dst, size_t lengt
 }
 
 // G1 pre write barrier slowpath
-JRT_LEAF(void, G1BarrierSetRuntime::write_ref_field_pre_entry(oopDesc* orig, JavaThread *thread))
-  if (orig == NULL) {
-    assert(false, "should be optimized out");
-    return;
-  }
+JRT_LEAF(void, G1BarrierSetRuntime::write_ref_field_pre_entry(oopDesc* orig, JavaThread* thread))
+  assert(orig != nullptr, "should be optimized out");
   assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error");
   // store the original value that was in the field reference
   SATBMarkQueue& queue = G1ThreadLocalData::satb_mark_queue(thread);

From 2499ac3db5c4a336059263a929031b4eef2d0f0a Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Tue, 5 Jan 2021 00:11:55 +0000
Subject: [PATCH 008/129] 8259069: Fields could be final

Reviewed-by: wetmore
---
 .../sun/security/ssl/DHClientKeyExchange.java |  2 +-
 .../sun/security/ssl/EphemeralKeyManager.java |  2 +-
 .../sun/security/ssl/HelloCookieManager.java  |  6 ++--
 .../security/ssl/SSLAlgorithmConstraints.java |  2 +-
 .../classes/sun/security/ssl/SSLCipher.java   |  6 ++--
 .../sun/security/ssl/SSLConfiguration.java    |  4 +--
 .../security/ssl/SSLEngineOutputRecord.java   |  3 +-
 .../sun/security/ssl/SSLExtensions.java       |  2 +-
 .../sun/security/ssl/SSLKeyExchange.java      | 30 +++++++++----------
 .../sun/security/ssl/SSLSessionImpl.java      |  2 +-
 .../classes/sun/security/ssl/SunJSSE.java     |  2 +-
 .../security/ssl/SunX509KeyManagerImpl.java   |  2 +-
 .../sun/security/ssl/TrustStoreManager.java   |  2 +-
 13 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
index 36bdce58faf73..f9753ffe078b6 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
@@ -67,7 +67,7 @@ final class DHClientKeyExchange {
      */
     private static final
             class DHClientKeyExchangeMessage extends HandshakeMessage {
-        private byte[] y;        // 1 to 2^16 - 1 bytes
+        private final byte[] y;        // 1 to 2^16 - 1 bytes
 
         DHClientKeyExchangeMessage(
                 HandshakeContext handshakeContext) throws IOException {
diff --git a/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java b/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
index b116004996948..2e5540f1f59d6 100644
--- a/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
@@ -109,7 +109,7 @@ private static class EphemeralKeyPair {
 
         private KeyPair keyPair;
         private int uses;
-        private long expirationTime;
+        private final long expirationTime;
 
         private EphemeralKeyPair(KeyPair keyPair) {
             this.keyPair = keyPair;
diff --git a/src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java b/src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java
index b878c7039895d..6880c929ab6fa 100644
--- a/src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/HelloCookieManager.java
@@ -122,9 +122,9 @@ abstract boolean isCookieValid(ServerHandshakeContext context,
             class D10HelloCookieManager extends HelloCookieManager {
 
         final SecureRandom secureRandom;
-        private int         cookieVersion;  // allow to wrap, version + sequence
-        private byte[]      cookieSecret;
-        private byte[]      legacySecret;
+        private int               cookieVersion;  // allow to wrap, version + sequence
+        private final byte[]      cookieSecret;
+        private final byte[]      legacySecret;
 
         private final ReentrantLock d10ManagerLock = new ReentrantLock();
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
index e827247b792d9..e85b1b53ba8bc 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
@@ -225,7 +225,7 @@ public boolean permits(Set<CryptoPrimitive> primitives,
     private static class SupportedSignatureAlgorithmConstraints
                                     implements AlgorithmConstraints {
         // supported signature algorithms
-        private String[] supportedAlgorithms;
+        private final String[] supportedAlgorithms;
 
         SupportedSignatureAlgorithmConstraints(String[] supportedAlgorithms) {
             if (supportedAlgorithms != null) {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
index 866c99263fd5a..bb9b53cce2fcf 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
@@ -411,7 +411,7 @@ enum SSLCipher {
     private static final HashMap<String, Long> cipherLimits = new HashMap<>();
 
     // Keywords found on the jdk.tls.keyLimits security property.
-    final static String tag[] = {"KEYUPDATE"};
+    final static String[] tag = {"KEYUPDATE"};
 
     static  {
         final long max = 4611686018427387904L; // 2^62
@@ -424,12 +424,12 @@ public String run() {
         });
 
         if (prop != null) {
-            String propvalue[] = prop.split(",");
+            String[] propvalue = prop.split(",");
 
             for (String entry : propvalue) {
                 int index;
                 // If this is not a UsageLimit, goto to next entry.
-                String values[] = entry.trim().toUpperCase().split(" ");
+                String[] values = entry.trim().toUpperCase().split(" ");
 
                 if (values[1].contains(tag[0])) {
                     index = 0;
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
index f32a9a1a6b03b..f9a7c64e506c2 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
@@ -434,7 +434,7 @@ public Object clone() {
     //
     // See Effective Java Second Edition: Item 71.
     private static final class CustomizedClientSignatureSchemes {
-        private static List<SignatureScheme> signatureSchemes =
+        private static final List<SignatureScheme> signatureSchemes =
                 getCustomizedSignatureScheme("jdk.tls.client.SignatureSchemes");
     }
 
@@ -442,7 +442,7 @@ private static final class CustomizedClientSignatureSchemes {
     //
     // See Effective Java Second Edition: Item 71.
     private static final class CustomizedServerSignatureSchemes {
-        private static List<SignatureScheme> signatureSchemes =
+        private static final List<SignatureScheme> signatureSchemes =
                 getCustomizedSignatureScheme("jdk.tls.server.SignatureSchemes");
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
index 67a0f393359f7..2f1bd6ffd113c 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
@@ -371,7 +371,8 @@ private static class HandshakeMemo extends RecordMemo {
     }
 
     final class HandshakeFragment {
-        private LinkedList<RecordMemo> handshakeMemos = new LinkedList<>();
+        private final LinkedList<RecordMemo> handshakeMemos =
+                new LinkedList<>();
 
         void queueUpFragment(byte[] source,
                 int offset, int length) throws IOException {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
index aabac0675738b..3787e21caa9eb 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
@@ -38,7 +38,7 @@
  */
 final class SSLExtensions {
     private final HandshakeMessage handshakeMessage;
-    private Map<SSLExtension, byte[]> extMap = new LinkedHashMap<>();
+    private final Map<SSLExtension, byte[]> extMap = new LinkedHashMap<>();
     private int encodedLength;
 
     // Extension map for debug logging
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java
index e9657de057eb7..5f0c5107e0510 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java
@@ -265,78 +265,78 @@ static SSLKeyExchange valueOf(NamedGroup namedGroup) {
     }
 
     private static class SSLKeyExRSA {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.RSA), T12KeyAgreement.RSA);
     }
 
     private static class SSLKeyExRSAExport {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.RSA), T12KeyAgreement.RSA_EXPORT);
     }
 
     private static class SSLKeyExDHEDSS {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.DSA), T12KeyAgreement.DHE);
     }
 
     private static class SSLKeyExDHEDSSExport {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.DSA), T12KeyAgreement.DHE_EXPORT);
     }
 
     private static class SSLKeyExDHERSA {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.RSA), T12KeyAgreement.DHE);
     }
 
     private static class SSLKeyExDHERSAOrPSS {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.RSA_OR_PSS), T12KeyAgreement.DHE);
     }
 
     private static class SSLKeyExDHERSAExport {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.RSA), T12KeyAgreement.DHE_EXPORT);
     }
 
     private static class SSLKeyExDHANON {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 null, T12KeyAgreement.DHE);
     }
 
     private static class SSLKeyExDHANONExport {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 null, T12KeyAgreement.DHE_EXPORT);
     }
 
     private static class SSLKeyExECDHECDSA {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.EC), T12KeyAgreement.ECDH);
     }
 
     private static class SSLKeyExECDHRSA {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.EC), T12KeyAgreement.ECDH);
     }
 
     private static class SSLKeyExECDHEECDSA {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.EC, X509Authentication.EDDSA),
                 T12KeyAgreement.ECDHE);
     }
 
     private static class SSLKeyExECDHERSA {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.RSA), T12KeyAgreement.ECDHE);
     }
 
     private static class SSLKeyExECDHERSAOrPSS {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 List.of(X509Authentication.RSA_OR_PSS), T12KeyAgreement.ECDHE);
     }
 
     private static class SSLKeyExECDHANON {
-        private static SSLKeyExchange KE = new SSLKeyExchange(
+        private static final SSLKeyExchange KE = new SSLKeyExchange(
                 null, T12KeyAgreement.ECDHE);
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
index 19b19cb36fc15..d93c892f57529 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -125,7 +125,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
     /*
      * Use of session caches is globally enabled/disabled.
      */
-    private static boolean      defaultRejoinable = true;
+    private static final boolean defaultRejoinable = true;
 
     // server name indication
     final SNIServerName         serverNameIndication;
diff --git a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
index 6a9ecb5a31645..d4e1f2079e5e1 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
@@ -56,7 +56,7 @@ public class SunJSSE extends java.security.Provider {
     @java.io.Serial
     private static final long serialVersionUID = 3231825739635378733L;
 
-    private static String info = "Sun JSSE provider" +
+    private static final String info = "Sun JSSE provider" +
         "(PKCS12, SunX509/PKIX key/trust factories, " +
         "SSLv3/TLSv1/TLSv1.1/TLSv1.2/TLSv1.3/DTLSv1.0/DTLSv1.2)";
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
index 914017e02d2a4..115a683cddd43 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
@@ -87,7 +87,7 @@ final class SunX509KeyManagerImpl extends X509ExtendedKeyManager {
      * The credentials from the KeyStore as
      * Map: String(alias) -> X509Credentials(credentials)
      */
-    private Map<String,X509Credentials> credentialsMap;
+    private final Map<String,X509Credentials> credentialsMap;
 
     /*
      * Cached server aliases for the case issuers == null.
diff --git a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
index 670d0c37150a3..2b00c3c93b136 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
@@ -149,7 +149,7 @@ public TrustStoreDescriptor run() {
                         for (String fileName : fileNames) {
                             File f = new File(fileName);
                             if (f.isFile() && f.canRead()) {
-                                temporaryName = fileName;;
+                                temporaryName = fileName;
                                 temporaryFile = f;
                                 temporaryTime = f.lastModified();
 

From 5ea960728c5616373c986ae1343b44043c0db487 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 5 Jan 2021 05:57:08 +0000
Subject: [PATCH 009/129] 8258459: Decouple gc_globals.hpp from globals.hpp

Reviewed-by: lfoltan, coleenp
---
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |  3 +-
 .../cpu/aarch64/c1_MacroAssembler_aarch64.cpp |  3 +-
 .../cpu/aarch64/c1_Runtime1_aarch64.cpp       |  3 +-
 .../cardTableBarrierSetAssembler_aarch64.cpp  |  3 +-
 .../cpu/aarch64/gc/z/zGlobals_aarch64.cpp     |  3 +-
 src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad     |  3 +-
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |  3 +-
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |  4 +-
 .../cpu/aarch64/templateTable_aarch64.cpp     |  3 +-
 src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp |  3 +-
 src/hotspot/cpu/arm/c1_Runtime1_arm.cpp       |  3 +-
 src/hotspot/cpu/arm/templateTable_arm.cpp     |  3 +-
 src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp |  3 +-
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp  |  3 +-
 .../cpu/s390/c1_MacroAssembler_s390.cpp       |  3 +-
 src/hotspot/cpu/s390/templateTable_s390.cpp   |  3 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |  3 +-
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp |  3 +-
 src/hotspot/cpu/x86/c1_Runtime1_x86.cpp       |  3 +-
 .../cardTableBarrierSetAssembler_x86.cpp      |  3 +-
 .../c1/shenandoahBarrierSetC1_x86.cpp         |  1 +
 src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp     |  3 +-
 src/hotspot/cpu/x86/gc/z/z_x86_64.ad          |  3 +-
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |  3 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |  3 +-
 src/hotspot/cpu/x86/templateTable_x86.cpp     |  3 +-
 src/hotspot/share/aot/aotCodeHeap.cpp         |  6 +-
 .../share/gc/epsilon/epsilonArguments.cpp     |  1 +
 .../share/gc/epsilon/epsilonInitLogger.cpp    |  1 +
 .../gc/epsilon/epsilonThreadLocalData.hpp     |  1 +
 src/hotspot/share/gc/g1/g1AllocRegion.cpp     |  3 +-
 src/hotspot/share/gc/g1/g1Allocator.cpp       |  3 +-
 src/hotspot/share/gc/g1/g1Analytics.cpp       |  3 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  3 +-
 src/hotspot/share/gc/g1/g1EvacStats.cpp       |  3 +-
 src/hotspot/share/gc/g1/g1FromCardCache.cpp   |  3 +-
 src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp    |  3 +-
 src/hotspot/share/gc/g1/g1HeapVerifier.cpp    |  3 +-
 src/hotspot/share/gc/g1/g1InitLogger.cpp      |  3 +-
 src/hotspot/share/gc/g1/g1ThreadLocalData.hpp |  3 +-
 .../parallel/jvmFlagConstraintsParallel.cpp   |  3 +-
 .../share/gc/parallel/mutableNUMASpace.cpp    |  3 +-
 .../gc/parallel/psPromotionManager.inline.hpp |  3 +-
 .../share/gc/serial/defNewGeneration.hpp      |  3 +-
 src/hotspot/share/gc/serial/markSweep.cpp     |  3 +-
 src/hotspot/share/gc/shared/ageTable.cpp      |  5 +-
 .../share/gc/shared/blockOffsetTable.hpp      |  3 +-
 .../gc/shared/c1/cardTableBarrierSetC1.cpp    |  3 +-
 .../share/gc/shared/c2/barrierSetC2.cpp       |  3 +-
 .../gc/shared/c2/cardTableBarrierSetC2.cpp    |  3 +-
 src/hotspot/share/gc/shared/collectedHeap.cpp |  4 +-
 .../share/gc/shared/gcConfiguration.cpp       |  6 +-
 src/hotspot/share/gc/shared/gcInitLogger.cpp  |  3 +-
 .../share/gc/shared/gcOverheadChecker.hpp     |  3 +-
 .../share/gc/shared/gcPolicyCounters.cpp      |  3 +-
 src/hotspot/share/gc/shared/gcStats.cpp       |  3 +-
 .../share/gc/shared/gcVMOperations.cpp        |  3 +-
 src/hotspot/share/gc/shared/gc_globals.hpp    | 50 +---------
 .../share/gc/shared/jvmFlagConstraintsGC.cpp  |  3 +-
 src/hotspot/share/gc/shared/memAllocator.cpp  |  3 +-
 src/hotspot/share/gc/shared/plab.cpp          |  4 +-
 src/hotspot/share/gc/shared/pretouchTask.cpp  |  3 +-
 .../share/gc/shared/referencePolicy.cpp       |  3 +-
 .../share/gc/shared/referenceProcessor.cpp    |  3 +-
 .../shared/stringdedup/stringDedupTable.cpp   |  3 +-
 .../share/gc/shared/suspendibleThreadSet.cpp  |  3 +-
 .../share/gc/shared/taskTerminator.cpp        |  6 +-
 .../gc/shared/threadLocalAllocBuffer.cpp      |  7 +-
 .../gc/shared/threadLocalAllocBuffer.hpp      |  8 +-
 .../shared/threadLocalAllocBuffer.inline.hpp  |  3 +-
 src/hotspot/share/gc/shared/tlab_globals.hpp  | 93 +++++++++++++++++++
 src/hotspot/share/gc/shared/weakProcessor.cpp |  3 +-
 src/hotspot/share/gc/shared/workerManager.hpp |  3 +-
 src/hotspot/share/gc/shared/workgroup.cpp     | 13 ++-
 src/hotspot/share/gc/shared/workgroup.hpp     | 13 +--
 .../gc/shenandoah/shenandoahArguments.cpp     |  1 +
 .../share/gc/shenandoah/shenandoahFreeSet.cpp |  2 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  1 +
 .../gc/shenandoah/shenandoahHeap.inline.hpp   |  1 +
 .../gc/shenandoah/shenandoahHeapRegion.cpp    |  5 +-
 .../gc/shenandoah/shenandoahHeapRegion.hpp    |  1 +
 .../gc/shenandoah/shenandoahMarkCompact.cpp   |  2 +-
 .../shenandoah/shenandoahThreadLocalData.hpp  |  1 +
 .../gc/shenandoah/shenandoahVerifier.cpp      |  2 +-
 .../gc/shenandoah/shenandoahWorkerPolicy.cpp  |  1 +
 src/hotspot/share/gc/z/zAddressSpaceLimit.cpp |  3 +-
 src/hotspot/share/gc/z/zDirector.cpp          |  3 +-
 src/hotspot/share/gc/z/zHeap.cpp              |  3 +-
 src/hotspot/share/gc/z/zHeapIterator.cpp      |  3 +-
 src/hotspot/share/gc/z/zHeuristics.cpp        |  3 +-
 .../share/gc/z/zMarkStackAllocator.cpp        |  3 +-
 src/hotspot/share/gc/z/zRelocate.cpp          |  3 +-
 .../share/gc/z/zRelocationSetSelector.cpp     |  3 +-
 src/hotspot/share/gc/z/zRuntimeWorkers.cpp    |  3 +-
 src/hotspot/share/gc/z/zStat.cpp              |  3 +-
 .../share/gc/z/zThreadLocalAllocBuffer.cpp    |  3 +-
 src/hotspot/share/gc/z/zUncommitter.cpp       |  3 +-
 src/hotspot/share/gc/z/zUnmapper.cpp          |  3 +-
 src/hotspot/share/gc/z/zValue.inline.hpp      |  3 +-
 src/hotspot/share/gc/z/zVerify.cpp            |  3 +-
 src/hotspot/share/gc/z/zWorkers.inline.hpp    |  3 +-
 .../interpreter/zero/bytecodeInterpreter.cpp  |  3 +-
 .../chains/pathToGcRootsOperation.cpp         |  3 +-
 .../jfr/support/jfrObjectAllocationSample.cpp |  3 +-
 .../share/jvmci/jvmciCompilerToVMInit.cpp     |  4 +-
 src/hotspot/share/memory/dynamicArchive.cpp   |  3 +-
 src/hotspot/share/memory/heapShared.hpp       |  3 +-
 .../memory/metaspace/virtualSpaceNode.cpp     |  3 +-
 src/hotspot/share/memory/universe.cpp         |  3 +-
 src/hotspot/share/oops/oop.cpp                |  5 +-
 src/hotspot/share/oops/oop.hpp                |  6 +-
 src/hotspot/share/oops/oop.inline.hpp         |  4 +-
 src/hotspot/share/opto/arraycopynode.cpp      |  3 +-
 src/hotspot/share/opto/lcm.cpp                |  3 +-
 src/hotspot/share/opto/macro.cpp              |  3 +-
 src/hotspot/share/opto/macroArrayCopy.cpp     |  3 +-
 src/hotspot/share/opto/memnode.cpp            |  3 +-
 src/hotspot/share/runtime/arguments.cpp       |  1 +
 src/hotspot/share/runtime/flags/allFlags.hpp  | 13 ++-
 src/hotspot/share/runtime/globals.hpp         |  1 -
 .../share/runtime/interfaceSupport.inline.hpp |  3 +-
 src/hotspot/share/runtime/mutexLocker.cpp     |  3 +-
 src/hotspot/share/runtime/thread.cpp          | 10 +-
 src/hotspot/share/runtime/thread.hpp          |  8 +-
 src/hotspot/share/runtime/thread.inline.hpp   |  4 +-
 .../share/runtime/threadSMR.inline.hpp        |  4 +-
 test/hotspot/gtest/runtime/test_globals.cpp   |  3 +-
 127 files changed, 375 insertions(+), 192 deletions(-)
 create mode 100644 src/hotspot/share/gc/shared/tlab_globals.hpp

diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 19d20dde9a449..79e6e7f2e1786 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,6 +36,7 @@
 #include "ci/ciInstance.hpp"
 #include "code/compiledIC.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "nativeInst_aarch64.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "runtime/frame.inline.hpp"
diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
index 48759ca7122c8..535312a94f162 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +29,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/markWord.hpp"
diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
index 2126695d673b9..dcf7351493591 100644
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,6 +32,7 @@
 #include "compiler/disassembler.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_aarch64.hpp"
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
index 30dfa5df55c55..9c0a66b255adc 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTableBarrierSetAssembler.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "interpreter/interp_masm.hpp"
 
 #define __ masm->
diff --git a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
index d887717913836..6aa6d41fee7c5 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
diff --git a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
index f88deb84d4c6d..bd1c2cc9f938a 100644
--- a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 source_hpp %{
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/c2/zBarrierSetC2.hpp"
 #include "gc/z/zThreadLocalData.hpp"
 
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 7de5f870f51ba..423eb12cd4d57 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,6 +33,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "compiler/disassembler.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 6bb9ca308d535..afbeb39c96b0a 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +28,8 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/gc_globals.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_aarch64.hpp"
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index 79e1971edde04..2179f91f5ae7b 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
diff --git a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
index 9d5c82dceb9f1..40956f09dc7ae 100644
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/markWord.hpp"
diff --git a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
index f823660fa2565..ce928e9bcfdbf 100644
--- a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "ci/ciUtilities.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_arm.hpp"
diff --git a/src/hotspot/cpu/arm/templateTable_arm.cpp b/src/hotspot/cpu/arm/templateTable_arm.cpp
index ccfd7a6f166b2..a09324f777a2e 100644
--- a/src/hotspot/cpu/arm/templateTable_arm.cpp
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
index 1dd18861dea95..aa31a26d7b3ea 100644
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +29,7 @@
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/markWord.hpp"
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 0e2e1c29135d7..2d67de784b955 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
index 6c040e0bbcbac..003ee3c376fcb 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +29,7 @@
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/markWord.hpp"
diff --git a/src/hotspot/cpu/s390/templateTable_s390.cpp b/src/hotspot/cpu/s390/templateTable_s390.cpp
index 485d6d962e898..8e9e9163e064e 100644
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index 8caff08e52fb3..e32e882e60f8d 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 #include "ci/ciArrayKlass.hpp"
 #include "ci/ciInstance.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "nativeInst_x86.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "runtime/frame.inline.hpp"
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index 687a33b253e39..1ef26701ac14a 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/markWord.hpp"
diff --git a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
index 90b5b0ff913e6..b9ac8274acf97 100644
--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "ci/ciUtilities.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_x86.hpp"
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
index eb0717f2c30a3..c00ea223f00dc 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTableBarrierSetAssembler.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 #define __ masm->
 
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
index 65599ccddf641..64ccaa8c15ad5 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
diff --git a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
index 896bcb1ac1611..875eb8855ddca 100644
--- a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
index b7d63e2439b25..f3e19b41733fd 100644
--- a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 source_hpp %{
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/c2/zBarrierSetC2.hpp"
 #include "gc/z/zThreadLocalData.hpp"
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index f1000eb32397d..b6371fab853b4 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 7cd48bd9583ec..be8377cde0d70 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_x86.hpp"
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 95e0cd89c4440..13a895375238c 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
 #include "compiler/disassembler.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
diff --git a/src/hotspot/share/aot/aotCodeHeap.cpp b/src/hotspot/share/aot/aotCodeHeap.cpp
index fb60aa73e27e9..d5e124137c84a 100644
--- a/src/hotspot/share/aot/aotCodeHeap.cpp
+++ b/src/hotspot/share/aot/aotCodeHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  */
 
 #include "precompiled.hpp"
-#include "runtime/stubRoutines.hpp"
-
 #include "aot/aotCodeHeap.hpp"
 #include "aot/aotLoader.hpp"
 #include "ci/ciUtilities.inline.hpp"
@@ -32,6 +30,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/gcConfig.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/g1/heapRegion.hpp"
 #include "interpreter/abstractInterpreter.hpp"
 #include "jvmci/compilerRuntime.hpp"
@@ -49,6 +48,7 @@
 #include "runtime/java.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
 #include "runtime/vmOperations.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/sizes.hpp"
diff --git a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
index 17cac8d86bf7a..d80154bcaddca 100644
--- a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
@@ -26,6 +26,7 @@
 #include "gc/epsilon/epsilonArguments.hpp"
 #include "gc/epsilon/epsilonHeap.hpp"
 #include "gc/shared/gcArguments.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
 #include "utilities/macros.hpp"
diff --git a/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp b/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp
index 1006e848b5db4..a75e9e7679da7 100644
--- a/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/epsilon/epsilonHeap.hpp"
 #include "gc/epsilon/epsilonInitLogger.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
diff --git a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
index 24f1e987d4a6b..3c0a2ab067806 100644
--- a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
 #define SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
index a45a11358b244..b3834c96c065a 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #include "gc/g1/g1AllocRegion.inline.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index 1bf55c51579fc..6b93b0cc84b57 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionSet.inline.hpp"
 #include "gc/g1/heapRegionType.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "utilities/align.hpp"
 
 G1Allocator::G1Allocator(G1CollectedHeap* heap) :
diff --git a/src/hotspot/share/gc/g1/g1Analytics.cpp b/src/hotspot/share/gc/g1/g1Analytics.cpp
index db8c1384fb452..537224853fa62 100644
--- a/src/hotspot/share/gc/g1/g1Analytics.cpp
+++ b/src/hotspot/share/gc/g1/g1Analytics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1Analytics.hpp"
 #include "gc/g1/g1Predictions.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 43b969df45c54..379ab145d0e8d 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,7 @@
 #include "gc/shared/referenceProcessor.inline.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/workerPolicy.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.cpp b/src/hotspot/share/gc/g1/g1EvacStats.cpp
index 42b57de220a87..f8acabf6be658 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.cpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1EvacStats.hpp"
 #include "gc/shared/gcId.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/share/gc/g1/g1FromCardCache.cpp b/src/hotspot/share/gc/g1/g1FromCardCache.cpp
index e677f04e6de6b..0a566af9d13e0 100644
--- a/src/hotspot/share/gc/g1/g1FromCardCache.cpp
+++ b/src/hotspot/share/gc/g1/g1FromCardCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
 #include "gc/g1/g1FromCardCache.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/padded.inline.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index 9ff4d0887fed4..1cefd9cce673b 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "gc/g1/g1StringDedup.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/oopStorage.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/workerDataArray.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp
index 80d49da1667d9..84b76c7ba4dbe 100644
--- a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/g1/g1StringDedup.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/iterator.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1InitLogger.cpp b/src/hotspot/share/gc/g1/g1InitLogger.cpp
index 6a6fd14657cdf..2f5753f9ff6a5 100644
--- a/src/hotspot/share/gc/g1/g1InitLogger.cpp
+++ b/src/hotspot/share/gc/g1/g1InitLogger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1InitLogger.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp b/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp
index 4a23b0eb7203e..d531f8ac56a3e 100644
--- a/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp
+++ b/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/satbMarkQueue.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp
index e951014fd965c..8630f57a7a768 100644
--- a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp
+++ b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/parallel/jvmFlagConstraintsParallel.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index ce7b215265912..271b39ff0e99a 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/parallel/mutableNUMASpace.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "gc/shared/workgroup.hpp"
 #include "memory/allocation.inline.hpp"
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index d97694466d53e..be8ddd55a6eda 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "gc/parallel/psPromotionManager.hpp"
 #include "gc/parallel/psScavenge.inline.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/iterator.inline.hpp"
 #include "oops/access.inline.hpp"
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index 139d8d5449841..ac8d834782a2c 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "gc/shared/generation.hpp"
 #include "gc/shared/generationCounters.hpp"
 #include "gc/shared/preservedMarks.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "utilities/align.hpp"
 #include "utilities/stack.hpp"
 
diff --git a/src/hotspot/share/gc/serial/markSweep.cpp b/src/hotspot/share/gc/serial/markSweep.cpp
index 5ed5df58a5c6e..ca8a9fe80a4be 100644
--- a/src/hotspot/share/gc/serial/markSweep.cpp
+++ b/src/hotspot/share/gc/serial/markSweep.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
diff --git a/src/hotspot/share/gc/shared/ageTable.cpp b/src/hotspot/share/gc/shared/ageTable.cpp
index d09139c2efc80..cefa8a5223db5 100644
--- a/src/hotspot/share/gc/shared/ageTable.cpp
+++ b/src/hotspot/share/gc/shared/ageTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,13 @@
 #include "gc/shared/ageTable.inline.hpp"
 #include "gc/shared/ageTableTracer.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/resourceArea.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "utilities/copy.hpp"
 
-/* Copyright (c) 1992, 2016, Oracle and/or its affiliates, and Stanford University.
+/* Copyright (c) 1992, 2021, Oracle and/or its affiliates, and Stanford University.
    See the LICENSE file for license information. */
 
 AgeTable::AgeTable(bool global) {
diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.hpp
index 6383000192cbf..f7db2d47d77f1 100644
--- a/src/hotspot/share/gc/shared/blockOffsetTable.hpp
+++ b/src/hotspot/share/gc/shared/blockOffsetTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
 #define SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
diff --git a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
index 5909d442b959b..106412d90b48a 100644
--- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #include "gc/shared/c1/cardTableBarrierSetC1.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index 377391e24aa91..f06c4d460aed2 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/c2/barrierSetC2.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/convertnode.hpp"
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
index 3b59faddce565..b39bec32ecd84 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/c2/cardTableBarrierSetC2.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/graphKit.hpp"
 #include "opto/idealKit.hpp"
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index dd3c5e273168b..1e1160ab54e20 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,9 @@
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/gcWhen.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/memAllocator.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/classLoaderMetaspace.hpp"
diff --git a/src/hotspot/share/gc/shared/gcConfiguration.cpp b/src/hotspot/share/gc/shared/gcConfiguration.cpp
index 195b64dcc3c94..9a26adf9b2f4c 100644
--- a/src/hotspot/share/gc/shared/gcConfiguration.cpp
+++ b/src/hotspot/share/gc/shared/gcConfiguration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,15 @@
  *
  */
 #include "precompiled.hpp"
-#include "runtime/globals_extension.hpp"
-
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gcConfiguration.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals.hpp"
+#include "runtime/globals_extension.hpp"
 #include "utilities/debug.hpp"
 
 GCName GCConfiguration::young_collector() const {
diff --git a/src/hotspot/share/gc/shared/gcInitLogger.cpp b/src/hotspot/share/gc/shared/gcInitLogger.cpp
index 106304890df0e..ec9bd60a83faa 100644
--- a/src/hotspot/share/gc/shared/gcInitLogger.cpp
+++ b/src/hotspot/share/gc/shared/gcInitLogger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/shared/gcInitLogger.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "oops/compressedOops.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/share/gc/shared/gcOverheadChecker.hpp b/src/hotspot/share/gc/shared/gcOverheadChecker.hpp
index 28cb799ec35f6..52e51d5809ce0 100644
--- a/src/hotspot/share/gc/shared/gcOverheadChecker.hpp
+++ b/src/hotspot/share/gc/shared/gcOverheadChecker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, Google and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +28,7 @@
 
 #include "memory/allocation.hpp"
 #include "gc/shared/gcCause.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/globals.hpp"
 
 class SoftRefPolicy;
diff --git a/src/hotspot/share/gc/shared/gcPolicyCounters.cpp b/src/hotspot/share/gc/shared/gcPolicyCounters.cpp
index b6ce0afcf11c5..dba53e9ee3193 100644
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.cpp
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/gcPolicyCounters.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/resourceArea.hpp"
 
 GCPolicyCounters::GCPolicyCounters(const char* name, int collectors,
diff --git a/src/hotspot/share/gc/shared/gcStats.cpp b/src/hotspot/share/gc/shared/gcStats.cpp
index 55514d91fd0dd..a90f0f01a5cb4 100644
--- a/src/hotspot/share/gc/shared/gcStats.cpp
+++ b/src/hotspot/share/gc/shared/gcStats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,5 +25,6 @@
 #include "precompiled.hpp"
 #include "gc/shared/gcStats.hpp"
 #include "gc/shared/gcUtil.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 GCStats::GCStats() : _avg_promoted(new AdaptivePaddedNoZeroDevAverage(AdaptiveSizePolicyWeight, PromotedPadding)) {}
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.cpp b/src/hotspot/share/gc/shared/gcVMOperations.cpp
index d5fd095cf850c..cee546b267bb4 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.cpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "gc/shared/gcId.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcVMOperations.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index cc8372221a7f5..402409161a8ea 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -290,18 +290,6 @@
   develop(uintx, MetadataAllocationFailALotInterval, 1000,                  \
           "Metadata allocation failure a lot interval")                     \
                                                                             \
-  product(bool, UseTLAB, true,                                              \
-          "Use thread-local object allocation")                             \
-                                                                            \
-  product(bool, ResizeTLAB, true,                                           \
-          "Dynamically resize TLAB size for threads")                       \
-                                                                            \
-  product(bool, ZeroTLAB, false,                                            \
-          "Zero out the newly created TLAB")                                \
-                                                                            \
-  product(bool, TLABStats, true,                                            \
-          "Provide more detailed and expensive TLAB statistics.")           \
-                                                                            \
   product_pd(bool, NeverActAsServerClassMachine,                            \
           "Never act like a server-class machine")                          \
                                                                             \
@@ -634,42 +622,6 @@
           "generation; zero means no maximum")                              \
           range(0, max_uintx)                                               \
                                                                             \
-  product(size_t, MinTLABSize, 2*K,                                         \
-          "Minimum allowed TLAB size (in bytes)")                           \
-          range(1, max_uintx/2)                                             \
-          constraint(MinTLABSizeConstraintFunc,AfterMemoryInit)             \
-                                                                            \
-  product(size_t, TLABSize, 0,                                              \
-          "Starting TLAB size (in bytes); zero means set ergonomically")    \
-          constraint(TLABSizeConstraintFunc,AfterMemoryInit)                \
-                                                                            \
-  product(size_t, YoungPLABSize, 4096,                                      \
-          "Size of young gen promotion LAB's (in HeapWords)")               \
-          constraint(YoungPLABSizeConstraintFunc,AfterMemoryInit)           \
-                                                                            \
-  product(size_t, OldPLABSize, 1024,                                        \
-          "Size of old gen promotion LAB's (in HeapWords)")                 \
-          constraint(OldPLABSizeConstraintFunc,AfterMemoryInit)             \
-                                                                            \
-  product(uintx, TLABAllocationWeight, 35,                                  \
-          "Allocation averaging weight")                                    \
-          range(0, 100)                                                     \
-                                                                            \
-  /* Limit the lower bound of this flag to 1 as it is used  */              \
-  /* in a division expression.                              */              \
-  product(uintx, TLABWasteTargetPercent, 1,                                 \
-          "Percentage of Eden that can be wasted")                          \
-          range(1, 100)                                                     \
-                                                                            \
-  product(uintx, TLABRefillWasteFraction,    64,                            \
-          "Maximum TLAB waste at a refill (internal fragmentation)")        \
-          range(1, max_juint)                                               \
-                                                                            \
-  product(uintx, TLABWasteIncrement,    4,                                  \
-          "Increment allowed waste at slow allocation")                     \
-          range(0, max_jint)                                                \
-          constraint(TLABWasteIncrementConstraintFunc,AfterMemoryInit)      \
-                                                                            \
   product(uintx, SurvivorRatio, 8,                                          \
           "Ratio of eden/survivor space size")                              \
           range(1, max_uintx-2)                                             \
diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
index 70043c430b4e5..83f0f8e43ca93 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "gc/shared/jvmFlagConstraintsGC.hpp"
 #include "gc/shared/plab.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index f35a29334c529..73c77a43d6fbf 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/memAllocator.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "memory/universe.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/oop.inline.hpp"
diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
index e1a3c2b181209..ccfb8760f2344 100644
--- a/src/hotspot/share/gc/shared/plab.cpp
+++ b/src/hotspot/share/gc/shared/plab.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,10 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/plab.inline.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
diff --git a/src/hotspot/share/gc/shared/pretouchTask.cpp b/src/hotspot/share/gc/shared/pretouchTask.cpp
index 4398d3924cc11..d802e827fe370 100644
--- a/src/hotspot/share/gc/shared/pretouchTask.cpp
+++ b/src/hotspot/share/gc/shared/pretouchTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/pretouchTask.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/share/gc/shared/referencePolicy.cpp b/src/hotspot/share/gc/shared/referencePolicy.cpp
index 795a5379b6ac6..e3d9e81a8d1fb 100644
--- a/src/hotspot/share/gc/shared/referencePolicy.cpp
+++ b/src/hotspot/share/gc/shared/referencePolicy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "classfile/javaClasses.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "memory/universe.hpp"
 #include "runtime/arguments.hpp"
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp
index 394b3741c21a9..c4ba975cfeacf 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.cpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessor.inline.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
index 5e8ebf54d0183..b1b6a7a15197b 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/javaClasses.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/stringdedup/stringDedupTable.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
diff --git a/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp b/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp
index cc77435124105..e91b1b4980209 100644
--- a/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp
+++ b/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/semaphore.hpp"
diff --git a/src/hotspot/share/gc/shared/taskTerminator.cpp b/src/hotspot/share/gc/shared/taskTerminator.cpp
index 9d84150c56aa2..0bf1bc61d4532 100644
--- a/src/hotspot/share/gc/shared/taskTerminator.cpp
+++ b/src/hotspot/share/gc/shared/taskTerminator.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
index 8cda596e31621..19504d96e90c2 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
@@ -58,6 +59,10 @@ ThreadLocalAllocBuffer::ThreadLocalAllocBuffer() :
   // do nothing. TLABs must be inited by initialize() calls
 }
 
+size_t ThreadLocalAllocBuffer::initial_refill_waste_limit()     { return desired_size() / TLABRefillWasteFraction; }
+size_t ThreadLocalAllocBuffer::min_size()                       { return align_object_size(MinTLABSize / HeapWordSize) + alignment_reserve(); }
+size_t ThreadLocalAllocBuffer::refill_waste_limit_increment()   { return TLABWasteIncrement; }
+
 size_t ThreadLocalAllocBuffer::remaining() {
   if (end() == NULL) {
     return 0;
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
index 51d9727085061..a4c38ccd4edca 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,7 +80,7 @@ class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
   void set_desired_size(size_t desired_size)     { _desired_size = desired_size; }
   void set_refill_waste_limit(size_t waste)      { _refill_waste_limit = waste;  }
 
-  size_t initial_refill_waste_limit()            { return desired_size() / TLABRefillWasteFraction; }
+  size_t initial_refill_waste_limit();
 
   static int    target_refills()                 { return _target_refills; }
   size_t initial_desired_size();
@@ -113,7 +113,7 @@ class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
 public:
   ThreadLocalAllocBuffer();
 
-  static size_t min_size()                       { return align_object_size(MinTLABSize / HeapWordSize) + alignment_reserve(); }
+  static size_t min_size();
   static size_t max_size()                       { assert(_max_size != 0, "max_size not set up"); return _max_size; }
   static size_t max_size_in_bytes()              { return max_size() * BytesPerWord; }
   static void set_max_size(size_t max_size)      { _max_size = max_size; }
@@ -171,7 +171,7 @@ class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
   void set_back_allocation_end();
   void set_sample_end(bool reset_byte_accumulation);
 
-  static size_t refill_waste_limit_increment()   { return TLABWasteIncrement; }
+  static size_t refill_waste_limit_increment();
 
   template <typename T> void addresses_do(T f) {
     f(&_start);
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
index 0bef051496e91..bc8991248c02d 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #define SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
 
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
 #include "memory/universe.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shared/tlab_globals.hpp b/src/hotspot/share/gc/shared/tlab_globals.hpp
new file mode 100644
index 0000000000000..8ecc5283642ba
--- /dev/null
+++ b/src/hotspot/share/gc/shared/tlab_globals.hpp
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHARED_TLAB_GLOBALS_HPP
+#define SHARE_GC_SHARED_TLAB_GLOBALS_HPP
+
+#include "runtime/globals_shared.hpp"
+
+#define TLAB_FLAGS(develop,                                                 \
+                   develop_pd,                                              \
+                   product,                                                 \
+                   product_pd,                                              \
+                   notproduct,                                              \
+                   range,                                                   \
+                   constraint)                                              \
+                                                                            \
+  /* Thread Local Allocation Buffer */                                      \
+                                                                            \
+  product(bool, UseTLAB, true,                                              \
+          "Use thread-local object allocation")                             \
+                                                                            \
+  product(bool, ResizeTLAB, true,                                           \
+          "Dynamically resize TLAB size for threads")                       \
+                                                                            \
+  product(bool, ZeroTLAB, false,                                            \
+          "Zero out the newly created TLAB")                                \
+                                                                            \
+  product(bool, TLABStats, true,                                            \
+          "Provide more detailed and expensive TLAB statistics.")           \
+                                                                            \
+  product(size_t, MinTLABSize, 2*K,                                         \
+          "Minimum allowed TLAB size (in bytes)")                           \
+          range(1, max_uintx/2)                                             \
+          constraint(MinTLABSizeConstraintFunc,AfterMemoryInit)             \
+                                                                            \
+  product(size_t, TLABSize, 0,                                              \
+          "Starting TLAB size (in bytes); zero means set ergonomically")    \
+          constraint(TLABSizeConstraintFunc,AfterMemoryInit)                \
+                                                                            \
+  product(size_t, YoungPLABSize, 4096,                                      \
+          "Size of young gen promotion LAB's (in HeapWords)")               \
+          constraint(YoungPLABSizeConstraintFunc,AfterMemoryInit)           \
+                                                                            \
+  product(size_t, OldPLABSize, 1024,                                        \
+          "Size of old gen promotion LAB's (in HeapWords)")                 \
+          constraint(OldPLABSizeConstraintFunc,AfterMemoryInit)             \
+                                                                            \
+  product(uintx, TLABAllocationWeight, 35,                                  \
+          "Allocation averaging weight")                                    \
+          range(0, 100)                                                     \
+                                                                            \
+  /* Limit the lower bound of this flag to 1 as it is used  */              \
+  /* in a division expression.                              */              \
+  product(uintx, TLABWasteTargetPercent, 1,                                 \
+          "Percentage of Eden that can be wasted")                          \
+          range(1, 100)                                                     \
+                                                                            \
+  product(uintx, TLABRefillWasteFraction,    64,                            \
+          "Maximum TLAB waste at a refill (internal fragmentation)")        \
+          range(1, max_juint)                                               \
+                                                                            \
+  product(uintx, TLABWasteIncrement,    4,                                  \
+          "Increment allowed waste at slow allocation")                     \
+          range(0, max_jint)                                                \
+          constraint(TLABWasteIncrementConstraintFunc,AfterMemoryInit)      \
+                                                                            \
+
+// end of TLAB_FLAGS
+
+DECLARE_FLAGS(TLAB_FLAGS)
+
+#endif // SHARE_GC_SHARED_TLAB_GLOBALS_HPP
diff --git a/src/hotspot/share/gc/shared/weakProcessor.cpp b/src/hotspot/share/gc/shared/weakProcessor.cpp
index 4d1db7e46ad09..f8a6e123682d8 100644
--- a/src/hotspot/share/gc/shared/weakProcessor.cpp
+++ b/src/hotspot/share/gc/shared/weakProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/stringTable.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
 #include "gc/shared/oopStorageParState.inline.hpp"
 #include "gc/shared/oopStorageSet.hpp"
diff --git a/src/hotspot/share/gc/shared/workerManager.hpp b/src/hotspot/share/gc/shared/workerManager.hpp
index 2502506387aad..4ae3920fd25ab 100644
--- a/src/hotspot/share/gc/shared/workerManager.hpp
+++ b/src/hotspot/share/gc/shared/workerManager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_SHARED_WORKERMANAGER_HPP
 #define SHARE_GC_SHARED_WORKERMANAGER_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/os.hpp"
diff --git a/src/hotspot/share/gc/shared/workgroup.cpp b/src/hotspot/share/gc/shared/workgroup.cpp
index 6a125af3b36cf..138713ec07eb9 100644
--- a/src/hotspot/share/gc/shared/workgroup.cpp
+++ b/src/hotspot/share/gc/shared/workgroup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,17 @@
 
 // Definitions of WorkGang methods.
 
+AbstractWorkGang::AbstractWorkGang(const char* name, uint workers, bool are_GC_task_threads, bool are_ConcurrentGC_threads) :
+      _workers(NULL),
+      _total_workers(workers),
+      _active_workers(UseDynamicNumberOfGCThreads ? 1U : workers),
+      _created_workers(0),
+      _name(name),
+      _are_GC_task_threads(are_GC_task_threads),
+      _are_ConcurrentGC_threads(are_ConcurrentGC_threads)
+  { }
+
+
 // The current implementation will exit if the allocation
 // of any worker fails.
 void  AbstractWorkGang::initialize_workers() {
diff --git a/src/hotspot/share/gc/shared/workgroup.hpp b/src/hotspot/share/gc/shared/workgroup.hpp
index da2049a9223a9..9799d3c45f4f7 100644
--- a/src/hotspot/share/gc/shared/workgroup.hpp
+++ b/src/hotspot/share/gc/shared/workgroup.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,16 +109,7 @@ class AbstractWorkGang : public CHeapObj<mtInternal> {
   }
 
  public:
-  AbstractWorkGang(const char* name, uint workers, bool are_GC_task_threads, bool are_ConcurrentGC_threads) :
-      _workers(NULL),
-      _total_workers(workers),
-      _active_workers(UseDynamicNumberOfGCThreads ? 1U : workers),
-      _created_workers(0),
-      _name(name),
-      _are_GC_task_threads(are_GC_task_threads),
-      _are_ConcurrentGC_threads(are_ConcurrentGC_threads)
-  { }
-
+  AbstractWorkGang(const char* name, uint workers, bool are_GC_task_threads, bool are_ConcurrentGC_threads);
   // Initialize workers in the gang.  Return true if initialization succeeded.
   void initialize_workers();
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index f0733a6fa453d..938a84c29b069 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/gcArguments.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/workerPolicy.hpp"
 #include "gc/shenandoah/shenandoahArguments.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index bf63bf05a3ef8..2c7ecd69250b4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index f7d65771034f5..cc0b775129c74 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -32,6 +32,7 @@
 #include "gc/shared/locationPrinter.inline.hpp"
 #include "gc/shared/memAllocator.hpp"
 #include "gc/shared/plab.hpp"
+#include "gc/shared/tlab_globals.hpp"
 
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahClosures.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index 0891da8336d39..a5c8bb14b839b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -29,6 +29,7 @@
 #include "gc/shared/markBitMap.inline.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index 2ba5fa01a1604..6adc450e46c7d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -23,13 +23,14 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/allocation.hpp"
+#include "gc/shared/space.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
-#include "gc/shared/space.inline.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "memory/allocation.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
index 766ab496c446e..21eaf71dca1eb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
index dfdf3fe698c08..22cad0c5f06c4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
@@ -23,10 +23,10 @@
  */
 
 #include "precompiled.hpp"
-
 #include "code/codeCache.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahForwarding.inline.hpp"
 #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp"
 #include "gc/shenandoah/shenandoahConcurrentRoots.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
index 212483510a392..74aab55b94f5d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
@@ -27,6 +27,7 @@
 
 #include "gc/shared/plab.hpp"
 #include "gc/shared/gcThreadLocalData.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahCodeRoots.hpp"
 #include "gc/shenandoah/shenandoahSATBMarkQueueSet.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index 4e4ba4c696d14..5fd3dbfd90ab5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahConcurrentRoots.hpp"
 #include "gc/shenandoah/shenandoahForwarding.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp
index 867dbc6aa8c7e..2c9c0a8aacc5b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/workerPolicy.hpp"
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
 #include "runtime/thread.hpp"
diff --git a/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp b/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
index b81d7a29a87e6..518fa07e0d4d5 100644
--- a/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
+++ b/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zAddressSpaceLimit.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/share/gc/z/zDirector.cpp b/src/hotspot/share/gc/z/zDirector.cpp
index 8263d7a6b3e68..1a39d828e5437 100644
--- a/src/hotspot/share/gc/z/zDirector.cpp
+++ b/src/hotspot/share/gc/z/zDirector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zCollectedHeap.hpp"
 #include "gc/z/zDirector.hpp"
 #include "gc/z/zHeap.inline.hpp"
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index 1e1032e2a856f..89b99181b0f0a 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/locationPrinter.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zArray.inline.hpp"
 #include "gc/z/zGlobals.hpp"
diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
index 7fdadba7b8528..c95963e2c661f 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 #include "precompiled.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zGlobals.hpp"
diff --git a/src/hotspot/share/gc/z/zHeuristics.cpp b/src/hotspot/share/gc/z/zHeuristics.cpp
index 6f67c93536771..c6ae14f7604ee 100644
--- a/src/hotspot/share/gc/z/zHeuristics.cpp
+++ b/src/hotspot/share/gc/z/zHeuristics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeuristics.hpp"
diff --git a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
index dbb4e7f4711d1..2c3feabe105f1 100644
--- a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
+++ b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zLock.inline.hpp"
 #include "gc/z/zMarkStack.inline.hpp"
 #include "gc/z/zMarkStackAllocator.hpp"
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index f956e2026e345..d3158e52a94aa 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zBarrier.inline.hpp"
 #include "gc/z/zForwarding.inline.hpp"
diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
index 65d5fc57d3596..04160480fe8d8 100644
--- a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zArray.inline.hpp"
 #include "gc/z/zForwarding.inline.hpp"
 #include "gc/z/zPage.inline.hpp"
diff --git a/src/hotspot/share/gc/z/zRuntimeWorkers.cpp b/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
index 27c70b02aadf9..33c2847b5b342 100644
--- a/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
+++ b/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zLock.inline.hpp"
 #include "gc/z/zRuntimeWorkers.hpp"
 #include "gc/z/zTask.hpp"
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
index 7b029cc8b6e21..afba6a9db3095 100644
--- a/src/hotspot/share/gc/z/zStat.cpp
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zCollectedHeap.hpp"
 #include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zGlobals.hpp"
diff --git a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp
index 5fd3a07c78ad4..97ff123412319 100644
--- a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zStackWatermark.hpp"
 #include "gc/z/zThreadLocalAllocBuffer.hpp"
diff --git a/src/hotspot/share/gc/z/zUncommitter.cpp b/src/hotspot/share/gc/z/zUncommitter.cpp
index 42fe602ca8bee..27ca4f4c19313 100644
--- a/src/hotspot/share/gc/z/zUncommitter.cpp
+++ b/src/hotspot/share/gc/z/zUncommitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zLock.inline.hpp"
 #include "gc/z/zStat.hpp"
diff --git a/src/hotspot/share/gc/z/zUnmapper.cpp b/src/hotspot/share/gc/z/zUnmapper.cpp
index eae5b5dbeab6f..1997449fd5d28 100644
--- a/src/hotspot/share/gc/z/zUnmapper.cpp
+++ b/src/hotspot/share/gc/z/zUnmapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zList.inline.hpp"
 #include "gc/z/zLock.inline.hpp"
 #include "gc/z/zPage.inline.hpp"
diff --git a/src/hotspot/share/gc/z/zValue.inline.hpp b/src/hotspot/share/gc/z/zValue.inline.hpp
index 587f2976f897f..6e5783048bf28 100644
--- a/src/hotspot/share/gc/z/zValue.inline.hpp
+++ b/src/hotspot/share/gc/z/zValue.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 #ifndef SHARE_GC_Z_ZVALUE_INLINE_HPP
 #define SHARE_GC_Z_ZVALUE_INLINE_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zNUMA.hpp"
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index fc1bff711c712..83cec9c6882c1 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/classLoaderData.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zNMethod.hpp"
diff --git a/src/hotspot/share/gc/z/zWorkers.inline.hpp b/src/hotspot/share/gc/z/zWorkers.inline.hpp
index 7b79682e800e7..cdfa7b862d84f 100644
--- a/src/hotspot/share/gc/z/zWorkers.inline.hpp
+++ b/src/hotspot/share/gc/z/zWorkers.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 #ifndef SHARE_GC_Z_ZWORKERS_INLINE_HPP
 #define SHARE_GC_Z_ZWORKERS_INLINE_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/z/zWorkers.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
index 8acab4b13303f..89116d7177406 100644
--- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
+++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/zero/bytecodeInterpreter.inline.hpp"
 #include "interpreter/interpreter.hpp"
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/pathToGcRootsOperation.cpp b/src/hotspot/share/jfr/leakprofiler/chains/pathToGcRootsOperation.cpp
index 98f6c907e8c86..7710481dd7fc1 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/pathToGcRootsOperation.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/pathToGcRootsOperation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "jfr/leakprofiler/leakProfiler.hpp"
 #include "jfr/leakprofiler/chains/bfsClosure.hpp"
 #include "jfr/leakprofiler/chains/bitset.inline.hpp"
diff --git a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp
index ae45a8f124f44..412c35229b452 100644
--- a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp
+++ b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/support/jfrObjectAllocationSample.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index b6300db91306e..55b734156775c 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "jvmci/jvmciEnv.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/vmStructs_jvmci.hpp"
diff --git a/src/hotspot/share/memory/dynamicArchive.cpp b/src/hotspot/share/memory/dynamicArchive.cpp
index a8c357a16d639..1c828f74faa31 100644
--- a/src/hotspot/share/memory/dynamicArchive.cpp
+++ b/src/hotspot/share/memory/dynamicArchive.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "gc/shared/gcVMOperations.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/archiveBuilder.hpp"
 #include "memory/archiveUtils.inline.hpp"
diff --git a/src/hotspot/share/memory/heapShared.hpp b/src/hotspot/share/memory/heapShared.hpp
index 76861666d2cb3..429613c2af712 100644
--- a/src/hotspot/share/memory/heapShared.hpp
+++ b/src/hotspot/share/memory/heapShared.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/allocation.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "oops/compressedOops.hpp"
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
index 88a6b9fe27c5d..eb6e45a1b5e1f 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspace/chunkHeaderPool.hpp"
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 855b1cf9931f5..e69d34ef94acc 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@
 #include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/oopStorageSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/heapShared.hpp"
diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp
index bbea8fd4cd627..c560932b3479f 100644
--- a/src/hotspot/share/oops/oop.cpp
+++ b/src/hotspot/share/oops/oop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -214,4 +214,7 @@ void oopDesc::verify_forwardee(oop forwardee) {
          "forwarding archive object");
 #endif
 }
+
+bool oopDesc::get_UseParallelGC() { return UseParallelGC; }
+bool oopDesc::get_UseG1GC()       { return UseG1GC;       }
 #endif
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index f395d72b3188a..c37d4852e7977 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -311,6 +311,10 @@ class oopDesc {
   // for error reporting
   static void* load_klass_raw(oop obj);
   static void* load_oop_raw(oop obj, int offset);
+
+  // Avoid include gc_globals.hpp in oop.inline.hpp
+  DEBUG_ONLY(bool get_UseParallelGC();)
+  DEBUG_ONLY(bool get_UseG1GC();)
 };
 
 #endif // SHARE_OOPS_OOP_HPP
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index da8421f34406f..cab2264309b49 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,7 +185,7 @@ int oopDesc::size_given_klass(Klass* klass)  {
       // disjunct below to fail if the two comparands are computed across such
       // a concurrent change.
       assert((s == klass->oop_size(this)) ||
-             (Universe::heap()->is_gc_active() && is_objArray() && is_forwarded() && (UseParallelGC || UseG1GC)),
+             (Universe::heap()->is_gc_active() && is_objArray() && is_forwarded() && (get_UseParallelGC() || get_UseG1GC())),
              "wrong array object size");
     } else {
       // Must be zero, so bite the bullet and take the virtual call.
diff --git a/src/hotspot/share/opto/arraycopynode.cpp b/src/hotspot/share/opto/arraycopynode.cpp
index 4fc21c9ac1f0d..e5be140901d83 100644
--- a/src/hotspot/share/opto/arraycopynode.cpp
+++ b/src/hotspot/share/opto/arraycopynode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/c2/barrierSetC2.hpp"
 #include "gc/shared/c2/cardTableBarrierSetC2.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/graphKit.hpp"
 #include "runtime/sharedRuntime.hpp"
diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index f2e52cb9bf6bc..cf45ff971f7d4 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/compressedOops.hpp"
 #include "opto/ad.hpp"
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 58dc422a3c0ce..5eb07da817d1c 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "compiler/compileLog.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "libadt/vectset.hpp"
 #include "memory/universe.hpp"
 #include "opto/addnode.hpp"
diff --git a/src/hotspot/share/opto/macroArrayCopy.cpp b/src/hotspot/share/opto/macroArrayCopy.cpp
index a8f26010d11bf..bf53050a0eacc 100644
--- a/src/hotspot/share/opto/macroArrayCopy.cpp
+++ b/src/hotspot/share/opto/macroArrayCopy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/barrierSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "opto/arraycopynode.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "opto/convertnode.hpp"
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 67347f10b8155..00610e10ce8c1 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "compiler/compileLog.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/c2/barrierSetC2.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/objArrayKlass.hpp"
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index dbf730a493a84..a10e418d8a955 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -31,6 +31,7 @@
 #include "classfile/symbolTable.hpp"
 #include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gcConfig.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logConfiguration.hpp"
 #include "logging/logStream.hpp"
diff --git a/src/hotspot/share/runtime/flags/allFlags.hpp b/src/hotspot/share/runtime/flags/allFlags.hpp
index cd62753cca664..9d655e02a1c43 100644
--- a/src/hotspot/share/runtime/flags/allFlags.hpp
+++ b/src/hotspot/share/runtime/flags/allFlags.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 #define SHARE_RUNTIME_FLAGS_ALLFLAGS_HPP
 
 #include "compiler/compiler_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "runtime/globals.hpp"
 
 // Put LP64/ARCH/JVMCI/COMPILER1/COMPILER2 at the top,
@@ -111,6 +113,15 @@
     constraint)               \
                               \
   GC_FLAGS(                   \
+    develop,                  \
+    develop_pd,               \
+    product,                  \
+    product_pd,               \
+    notproduct,               \
+    range,                    \
+    constraint)               \
+                              \
+  TLAB_FLAGS(                 \
     develop,                  \
     develop_pd,               \
     product,                  \
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 2c3a4f25db5bd..2bd40302863a2 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -26,7 +26,6 @@
 #define SHARE_RUNTIME_GLOBALS_HPP
 
 #include "compiler/compiler_globals_pd.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "runtime/globals_shared.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index 4af8c2b8fa8a1..1372589756160 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifndef SHARE_RUNTIME_INTERFACESUPPORT_INLINE_HPP
 #define SHARE_RUNTIME_INTERFACESUPPORT_INLINE_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/orderAccess.hpp"
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index fea5e23cf43cd..140ff4f10b93a 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/universe.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.inline.hpp"
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 5b9449ccc96a3..980cd730afad3 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "runtime/thread.inline.hpp"
 #include "jvm.h"
 #include "aot/aotLoader.hpp"
 #include "classfile/classLoader.hpp"
@@ -42,6 +41,7 @@
 #include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/oopStorage.hpp"
 #include "gc/shared/oopStorageSet.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/workgroup.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
@@ -326,6 +326,12 @@ Thread::Thread() {
   }
 }
 
+void Thread::initialize_tlab() {
+  if (UseTLAB) {
+    tlab().initialize();
+  }
+}
+
 void Thread::initialize_thread_current() {
 #ifndef USE_LIBRARY_BASED_TLS_ONLY
   assert(_thr_current == NULL, "Thread::current already initialized");
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 32faa694cc13f..08e36e0a48429 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -598,11 +598,7 @@ class Thread: public ThreadShadow {
 
   // Thread-Local Allocation Buffer (TLAB) support
   ThreadLocalAllocBuffer& tlab()                 { return _tlab; }
-  void initialize_tlab() {
-    if (UseTLAB) {
-      tlab().initialize();
-    }
-  }
+  void initialize_tlab();
 
   jlong allocated_bytes()               { return _allocated_bytes; }
   void set_allocated_bytes(jlong value) { _allocated_bytes = value; }
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index 2a485547b57bd..e072ce90d5ae2 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
 #ifndef SHARE_RUNTIME_THREAD_INLINE_HPP
 #define SHARE_RUNTIME_THREAD_INLINE_HPP
 
+#include "gc/shared/tlab_globals.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/globals.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
diff --git a/src/hotspot/share/runtime/threadSMR.inline.hpp b/src/hotspot/share/runtime/threadSMR.inline.hpp
index fb5f9105ca182..22230ec139cd1 100644
--- a/src/hotspot/share/runtime/threadSMR.inline.hpp
+++ b/src/hotspot/share/runtime/threadSMR.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 #ifndef SHARE_RUNTIME_THREADSMR_INLINE_HPP
 #define SHARE_RUNTIME_THREADSMR_INLINE_HPP
 
+#include "gc/shared/gc_globals.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "runtime/atomic.hpp"
 #include "memory/iterator.hpp"
 #include "runtime/prefetch.inline.hpp"
diff --git a/test/hotspot/gtest/runtime/test_globals.cpp b/test/hotspot/gtest/runtime/test_globals.cpp
index bf44a6ce653e0..529e5d2557081 100644
--- a/test/hotspot/gtest/runtime/test_globals.cpp
+++ b/test/hotspot/gtest/runtime/test_globals.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "compiler/compiler_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/flags/flagSetting.hpp"
 #include "runtime/flags/jvmFlag.hpp"

From dd8996c5f5784b18a01a86354e3ccaae1f86adae Mon Sep 17 00:00:00 2001
From: Hao Sun <hao.sun@arm.com>
Date: Tue, 5 Jan 2021 07:31:44 +0000
Subject: [PATCH 010/129] 8258946: Fix optimization-unstable code involving
 signed integer overflow

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/opto/ifnode.cpp        |  6 +++---
 src/hotspot/share/opto/loopTransform.cpp | 10 +++++-----
 src/hotspot/share/opto/parse2.cpp        |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 4d1ef3cf8651f..9f4c7f700cc00 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -631,7 +631,7 @@ const TypeInt* IfNode::filtered_int_type(PhaseGVN* gvn, Node* val, Node* if_proj
               return cmp2_t;
             case BoolTest::lt:
               lo = TypeInt::INT->_lo;
-              if (hi - 1 < hi) {
+              if (hi != min_jint) {
                 hi = hi - 1;
               }
               break;
@@ -639,7 +639,7 @@ const TypeInt* IfNode::filtered_int_type(PhaseGVN* gvn, Node* val, Node* if_proj
               lo = TypeInt::INT->_lo;
               break;
             case BoolTest::gt:
-              if (lo + 1 > lo) {
+              if (lo != max_jint) {
                 lo = lo + 1;
               }
               hi = TypeInt::INT->_hi;
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index e43b1a10defe1..a4486df9afd40 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -912,12 +912,12 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) {
       const TypeInt* iv_type = phase->_igvn.type(phi)->is_int();
       int next_stride = stride_con * 2; // stride after this unroll
       if (next_stride > 0) {
-        if (iv_type->_lo + next_stride <= iv_type->_lo || // overflow
+        if (iv_type->_lo > max_jint - next_stride || // overflow
             iv_type->_lo + next_stride >  iv_type->_hi) {
           return false;  // over-unrolling
         }
       } else if (next_stride < 0) {
-        if (iv_type->_hi + next_stride >= iv_type->_hi || // overflow
+        if (iv_type->_hi < min_jint - next_stride || // overflow
             iv_type->_hi + next_stride <  iv_type->_lo) {
           return false;  // over-unrolling
         }
@@ -928,8 +928,8 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) {
   // After unroll limit will be adjusted: new_limit = limit-stride.
   // Bailout if adjustment overflow.
   const TypeInt* limit_type = phase->_igvn.type(limit_n)->is_int();
-  if ((stride_con > 0 && ((limit_type->_hi - stride_con) >= limit_type->_hi)) ||
-      (stride_con < 0 && ((limit_type->_lo - stride_con) <= limit_type->_lo)))
+  if ((stride_con > 0 && ((min_jint + stride_con) > limit_type->_hi)) ||
+      (stride_con < 0 && ((max_jint + stride_con) < limit_type->_lo)))
     return false;  // overflow
 
   // Adjust body_size to determine if we unroll or not
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index 17dee7032e80e..4258c228a1c00 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -536,7 +536,7 @@ void Parse::do_lookupswitch() {
     }
     prev = match_int+1;
   }
-  if (prev-1 != max_jint) {
+  if (prev != min_jint) {
     defaults += (float)max_jint - prev + 1;
   }
   float default_cnt = 1;

From 17d1645ecee778f55c132b70baf34a494002cb8d Mon Sep 17 00:00:00 2001
From: Hao Sun <hao.sun@arm.com>
Date: Tue, 5 Jan 2021 08:29:41 +0000
Subject: [PATCH 011/129] 8258751: Improve ExceptionHandlerTable dump

Reviewed-by: thartmann, chagedorn, njian
---
 .../share/code/exceptionHandlerTable.cpp      | 22 ++++++++++++++-----
 .../share/code/exceptionHandlerTable.hpp      |  6 ++---
 src/hotspot/share/code/nmethod.cpp            |  4 ++--
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/code/exceptionHandlerTable.cpp b/src/hotspot/share/code/exceptionHandlerTable.cpp
index 86161e9e37159..f3c2a78704458 100644
--- a/src/hotspot/share/code/exceptionHandlerTable.cpp
+++ b/src/hotspot/share/code/exceptionHandlerTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,22 +120,32 @@ HandlerTableEntry* ExceptionHandlerTable::entry_for(int catch_pco, int handler_b
 }
 
 
-void ExceptionHandlerTable::print_subtable(HandlerTableEntry* t) const {
+void ExceptionHandlerTable::print_subtable(HandlerTableEntry* t, address base) const {
   int l = t->len();
-  tty->print_cr("catch_pco = %d (%d entries)", t->pco(), l);
+  bool have_base_addr = (base != NULL);
+  if (have_base_addr) {
+    tty->print_cr("catch_pco = %d (pc=" INTPTR_FORMAT ", %d entries)", t->pco(), p2i(base + t->pco()), l);
+  } else {
+    tty->print_cr("catch_pco = %d (%d entries)", t->pco(), l);
+  }
   while (l-- > 0) {
     t++;
-    tty->print_cr("  bci %d at scope depth %d -> pco %d", t->bci(), t->scope_depth(), t->pco());
+    if (have_base_addr) {
+      tty->print_cr("  bci %d at scope depth %d -> pco %d (pc=" INTPTR_FORMAT ")",
+                    t->bci(), t->scope_depth(), t->pco(), p2i(base + t->pco()));
+    } else {
+      tty->print_cr("  bci %d at scope depth %d -> pco %d", t->bci(), t->scope_depth(), t->pco());
+    }
   }
 }
 
 
-void ExceptionHandlerTable::print() const {
+void ExceptionHandlerTable::print(address base) const {
   tty->print_cr("ExceptionHandlerTable (size = %d bytes)", size_in_bytes());
   int i = 0;
   while (i < _length) {
     HandlerTableEntry* t = _table + i;
-    print_subtable(t);
+    print_subtable(t, base);
     // advance to next subtable
     i += t->len() + 1; // +1 for header
   }
diff --git a/src/hotspot/share/code/exceptionHandlerTable.hpp b/src/hotspot/share/code/exceptionHandlerTable.hpp
index d9f88e4a53959..d563e9492c5bd 100644
--- a/src/hotspot/share/code/exceptionHandlerTable.hpp
+++ b/src/hotspot/share/code/exceptionHandlerTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,8 +123,8 @@ class ExceptionHandlerTable {
   HandlerTableEntry* entry_for(int catch_pco, int handler_bci, int scope_depth) const;
 
   // debugging
-  void print_subtable(HandlerTableEntry* t) const;
-  void print() const;
+  void print_subtable(HandlerTableEntry* t, address base = NULL) const;
+  void print(address base = NULL) const;
   void print_subtable_for(int catch_pco) const;
 };
 
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 351a1bb7e2ba5..b05ef488ba2c2 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2700,7 +2700,7 @@ void nmethod::print_native_invokers() {
 }
 
 void nmethod::print_handler_table() {
-  ExceptionHandlerTable(this).print();
+  ExceptionHandlerTable(this).print(code_begin());
 }
 
 void nmethod::print_nul_chk_table() {

From 3817c32fd1dba46ff1ee1831aa5efb03c6546ace Mon Sep 17 00:00:00 2001
From: Lehua Ding <lehuading@tencent.com>
Date: Tue, 5 Jan 2021 08:34:11 +0000
Subject: [PATCH 012/129] 8258534: Epsilon: clean up unused includes

Reviewed-by: shade, jiefu
---
 src/hotspot/share/gc/epsilon/epsilonArguments.cpp  | 1 -
 src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
index d80154bcaddca..17c4783d5c8f5 100644
--- a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp
@@ -29,7 +29,6 @@
 #include "gc/shared/tlab_globals.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
-#include "utilities/macros.hpp"
 
 size_t EpsilonArguments::conservative_max_heap_alignment() {
   return UseLargePages ? os::large_page_size() : os::vm_page_size();
diff --git a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp
index b039a949dcfaa..84b76f75d5e0c 100644
--- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp
@@ -28,7 +28,6 @@
 #include "gc/epsilon/epsilonThreadLocalData.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
-#include "utilities/macros.hpp"
 #ifdef COMPILER1
 #include "gc/shared/c1/barrierSetC1.hpp"
 #endif

From db6f39302b972a468452e2c2b7200039b2c23556 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 5 Jan 2021 08:37:06 +0000
Subject: [PATCH 013/129] 8251944: Add Shenandoah test config to
 compiler/gcbarriers/UnsafeIntrinsicsTest.java

Reviewed-by: rkennke, adityam
---
 .../gcbarriers/UnsafeIntrinsicsTest.java      | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
index 04b8db184aab4..f6d579053814a 100644
--- a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
+++ b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
@@ -22,14 +22,36 @@
  */
 
 /*
- * @test
+ * @test id=z
  * @key randomness
  * @bug 8059022
  * @modules java.base/jdk.internal.misc:+open
  * @summary Validate barriers after Unsafe getReference, CAS and swap (GetAndSet)
  * @requires vm.gc.Z
  * @library /test/lib
- * @run main/othervm -XX:+UseZGC -XX:+UnlockDiagnosticVMOptions -XX:+ZVerifyViews -XX:ZCollectionInterval=1 -XX:-CreateCoredumpOnCrash -XX:CompileCommand=dontinline,*::mergeImpl* compiler.gcbarriers.UnsafeIntrinsicsTest
+ * @run main/othervm -XX:+UseZGC
+ *                   -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+ZVerifyViews -XX:ZCollectionInterval=1
+ *                   -XX:-CreateCoredumpOnCrash
+ *                   -XX:CompileCommand=dontinline,*::mergeImpl*
+ *                   compiler.gcbarriers.UnsafeIntrinsicsTest
+ */
+
+/*
+ * @test id=shenandoah
+ * @key randomness
+ * @bug 8255401 8251944
+ * @modules java.base/jdk.internal.misc:+open
+ * @summary Validate barriers after Unsafe getReference, CAS and swap (GetAndSet)
+ * @requires vm.gc.Shenandoah
+ * @library /test/lib
+ * @run main/othervm -XX:+UseShenandoahGC
+ *                   -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:-CreateCoredumpOnCrash
+ *                   -XX:+ShenandoahVerify
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers
+ *                   -XX:CompileCommand=dontinline,*::mergeImpl*
+ *                   compiler.gcbarriers.UnsafeIntrinsicsTest
  */
 
 package compiler.gcbarriers;

From 9f1516492c20f52f249d7389f4058d8978faed9f Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Tue, 5 Jan 2021 09:54:18 +0000
Subject: [PATCH 014/129] 8259049: Uninitialized variable after JDK-8257513

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/constantTable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/constantTable.cpp b/src/hotspot/share/opto/constantTable.cpp
index ce73cdcf2f5ba..285c273bb22cc 100644
--- a/src/hotspot/share/opto/constantTable.cpp
+++ b/src/hotspot/share/opto/constantTable.cpp
@@ -150,7 +150,7 @@ bool ConstantTable::emit(CodeBuffer& cb) const {
              "must be: %d == %d", (int)(constant_addr - _masm.code()->consts()->start()), (int)(con.offset()));
 
       // Expand jump-table
-      address last_addr;
+      address last_addr = NULL;
       for (uint j = 1; j < n->outcnt(); j++) {
         last_addr = _masm.address_constant(dummy + j);
         if (last_addr == NULL) {

From 4ffbe841fca706f5b42fba2aedd872bd63473e50 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 5 Jan 2021 11:40:25 +0000
Subject: [PATCH 015/129] 8256266: Binding variables don't correctly support
 declaration annotations and the final modifier

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Symbol.java      |   4 +-
 .../sun/tools/javac/code/TypeAnnotations.java |   8 +-
 .../com/sun/tools/javac/comp/Attr.java        |   5 +-
 .../sun/tools/javac/parser/JavacParser.java   |  29 +++-
 .../tools/javac/patterns/Annotations.java     | 152 ++++++++++++++++++
 .../tools/javac/patterns/BindingsTest1.java   |  15 ++
 .../tools/javac/patterns/BindingsTest2.java   |   6 +
 .../tools/javac/patterns/BindingsTest2.out    |   3 +-
 .../javac/patterns/NoModifiersOnBinding.java  |  24 +++
 .../javac/patterns/NoModifiersOnBinding.out   |   3 +
 10 files changed, 237 insertions(+), 12 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/Annotations.java
 create mode 100644 test/langtools/tools/javac/patterns/NoModifiersOnBinding.java
 create mode 100644 test/langtools/tools/javac/patterns/NoModifiersOnBinding.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
index d3472f72ccb53..660f5776705ad 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -1865,8 +1865,8 @@ public Name getSimpleName() {
 
     public static class BindingSymbol extends VarSymbol {
 
-        public BindingSymbol(Name name, Type type, Symbol owner) {
-            super(Flags.HASINIT | Flags.MATCH_BINDING, name, type, owner);
+        public BindingSymbol(long flags, Name name, Type type, Symbol owner) {
+            super(flags | Flags.HASINIT | Flags.MATCH_BINDING, name, type, owner);
         }
 
         public boolean isAliasFor(BindingSymbol b) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
index a3976984824ed..f88fbace54118 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
@@ -389,7 +389,8 @@ private void separateAnnotationsKinds(JCTree typetree, Type type,
             if (sym.getKind() == ElementKind.PARAMETER ||
                 sym.getKind() == ElementKind.LOCAL_VARIABLE ||
                 sym.getKind() == ElementKind.RESOURCE_VARIABLE ||
-                sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
+                sym.getKind() == ElementKind.EXCEPTION_PARAMETER ||
+                sym.getKind() == ElementKind.BINDING_VARIABLE) {
                 appendTypeAnnotationsToOwner(sym, typeAnnotations);
             }
         }
@@ -1264,6 +1265,11 @@ public void visitVarDef(final JCVariableDecl tree) {
                 if (!tree.isImplicitlyTyped()) {
                     separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
                 }
+            } else if (tree.sym.getKind() == ElementKind.BINDING_VARIABLE) {
+                final TypeAnnotationPosition pos =
+                    TypeAnnotationPosition.localVariable(currentLambda,
+                                                         tree.pos);
+                separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
             } else if (tree.sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
                 final TypeAnnotationPosition pos =
                     TypeAnnotationPosition.exceptionParameter(currentLambda,
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 30c1c4102e935..733c20f8f4606 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -4000,12 +4000,13 @@ public void visitTypeTest(JCInstanceOf tree) {
     public void visitBindingPattern(JCBindingPattern tree) {
         ResultInfo varInfo = new ResultInfo(KindSelector.TYP, resultInfo.pt, resultInfo.checkContext);
         tree.type = tree.var.type = attribTree(tree.var.vartype, env, varInfo);
-        BindingSymbol v = new BindingSymbol(tree.var.name, tree.var.vartype.type, env.info.scope.owner);
+        BindingSymbol v = new BindingSymbol(tree.var.mods.flags, tree.var.name, tree.var.vartype.type, env.info.scope.owner);
         v.pos = tree.pos;
         tree.var.sym = v;
         if (chk.checkUnique(tree.var.pos(), v, env.info.scope)) {
             chk.checkTransparentVar(tree.var.pos(), v, env.info.scope);
         }
+        annotate.annotateLater(tree.var.mods.annotations, env, v, tree.pos());
         annotate.queueScanTreeAndTypeAnnotate(tree.var.vartype, env, v, tree.var.pos());
         annotate.flush();
         result = tree.type;
@@ -5761,7 +5762,7 @@ public void visitVarDef(JCVariableDecl that) {
         @Override
         public void visitBindingPattern(JCBindingPattern that) {
             if (that.var.sym == null) {
-                that.var.sym = new BindingSymbol(that.var.name, that.var.type, syms.noSymbol);
+                that.var.sym = new BindingSymbol(0, that.var.name, that.var.type, syms.noSymbol);
                 that.var.sym.adr = 0;
             }
             super.visitBindingPattern(that);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index d03fbd52e52ad..c4911dbe2d57e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -490,9 +490,13 @@ JCExpression illegal() {
 
     /** Diagnose a modifier flag from the set, if any. */
     protected void checkNoMods(long mods) {
+        checkNoMods(token.pos, mods);
+    }
+
+    protected void checkNoMods(int pos, long mods) {
         if (mods != 0) {
             long lowestMod = mods & -mods;
-            log.error(DiagnosticFlag.SYNTAX, token.pos, Errors.ModNotAllowedHere(Flags.asFlagSet(lowestMod)));
+            log.error(DiagnosticFlag.SYNTAX, pos, Errors.ModNotAllowedHere(Flags.asFlagSet(lowestMod)));
         }
     }
 
@@ -932,17 +936,30 @@ JCExpression term2Rest(JCExpression t, int minprec) {
             if (token.kind == INSTANCEOF) {
                 int pos = token.pos;
                 nextToken();
+                int patternPos = token.pos;
+                JCModifiers mods = optFinal(0);
                 int typePos = token.pos;
-                JCExpression type = parseType();
+                JCExpression type = unannotatedType(false);
                 JCTree pattern;
                 if (token.kind == IDENTIFIER) {
                     checkSourceLevel(token.pos, Feature.PATTERN_MATCHING_IN_INSTANCEOF);
-                    JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
                     JCVariableDecl var = toP(F.at(token.pos).VarDef(mods, ident(), type, null));
-                    TreeInfo.getStartPos(var);
-                    pattern = toP(F.at(typePos).BindingPattern(var));
-                    TreeInfo.getStartPos(pattern);
+                    pattern = toP(F.at(patternPos).BindingPattern(var));
                 } else {
+                    checkNoMods(typePos, mods.flags & ~Flags.DEPRECATED);
+                    if (mods.annotations.nonEmpty()) {
+                        checkSourceLevel(mods.annotations.head.pos, Feature.TYPE_ANNOTATIONS);
+                        List<JCAnnotation> typeAnnos =
+                                mods.annotations
+                                    .map(decl -> {
+                                        JCAnnotation typeAnno = F.at(decl.pos)
+                                                                 .TypeAnnotation(decl.annotationType,
+                                                                                  decl.args);
+                                        endPosTable.replaceTree(decl, typeAnno);
+                                        return typeAnno;
+                                    });
+                        type = insertAnnotationsToMostInner(type, typeAnnos, false);
+                    }
                     pattern = type;
                 }
                 odStack[top] = F.at(pos).TypeTest(odStack[top], pattern);
diff --git a/test/langtools/tools/javac/patterns/Annotations.java b/test/langtools/tools/javac/patterns/Annotations.java
new file mode 100644
index 0000000000000..94cc9631eeb6e
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/Annotations.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8256266
+ * @summary Verify annotations work correctly on binding variables
+ * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
+ *          jdk.jdeps/com.sun.tools.classfile
+ * @build JavacTestingAbstractProcessor
+ * @compile Annotations.java
+ * @compile -processor Annotations -proc:only Annotations.java
+ * @run main Annotations
+ */
+
+import com.sun.source.tree.InstanceOfTree;
+import com.sun.source.util.TreePath;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
+import com.sun.source.tree.BindingPatternTree;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.util.TreePathScanner;
+import com.sun.source.util.Trees;
+import com.sun.tools.classfile.*;
+import java.io.InputStream;
+import java.util.Arrays;
+
+public class Annotations extends JavacTestingAbstractProcessor {
+    public static void main(String... args) throws Exception {
+        new Annotations().run();
+    }
+
+    void run() throws Exception {
+        InputStream annotationsClass =
+                Annotations.class.getResourceAsStream("Annotations.class");
+        ClassFile cf = ClassFile.read(annotationsClass);
+        for (Method m : cf.methods) {
+            if ("test".equals(cf.constant_pool.getUTF8Value(m.name_index))) {
+                Code_attribute codeAttr =
+                        (Code_attribute) m.attributes.map.get(Attribute.Code);
+                Attribute annoAttr =
+                        codeAttr.attributes.map.get(Attribute.RuntimeInvisibleTypeAnnotations);
+                RuntimeInvisibleTypeAnnotations_attribute annotations =
+                        (RuntimeInvisibleTypeAnnotations_attribute) annoAttr;
+                String expected = "[@Annotations$DTA; pos: [LOCAL_VARIABLE, {start_pc = 35, length = 7, index = 1}, pos = -1], " +
+                                  "@Annotations$TA; pos: [LOCAL_VARIABLE, {start_pc = 56, length = 7, index = 1}, pos = -1]]";
+                String actual = Arrays.toString(annotations.annotations);
+                if (!expected.equals(actual)) {
+                    throw new AssertionError("Unexpected type annotations: " +
+                                              actual);
+                }
+            }
+        }
+    }
+
+    private static void test(Object o) {
+        if (o instanceof @DA String da) {
+            System.err.println(da);
+        }
+        if (o instanceof @DTA String dta) {
+            System.err.println(dta);
+        }
+        if (o instanceof @TA String ta) {
+            System.err.println(ta);
+        }
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        Trees trees = Trees.instance(processingEnv);
+
+        for (Element root : roundEnv.getRootElements()) {
+            TreePath tp = trees.getPath(root);
+            new TreePathScanner<Void, Void>() {
+                @Override
+                public Void visitInstanceOf(InstanceOfTree node, Void p) {
+                    BindingPatternTree bpt = (BindingPatternTree) node.getPattern();
+                    VariableTree var = bpt.getVariable();
+                    Element varEl = trees.getElement(new TreePath(getCurrentPath(), var));
+                    String expectedDeclAnnos;
+                    String expectedType;
+                    switch (var.getName().toString()) {
+                        case "da" -> {
+                            expectedDeclAnnos = "@Annotations.DA";
+                            expectedType = "java.lang.String";
+                        }
+                        case "dta" -> {
+                            expectedDeclAnnos = "@Annotations.DTA";
+                            expectedType = "@Annotations.DTA java.lang.String";
+                        }
+                        case "ta" -> {
+                            expectedDeclAnnos = "";
+                            expectedType = "@Annotations.TA java.lang.String";
+                        }
+                        default -> {
+                            throw new AssertionError("Unexpected variable: " + var);
+                        }
+                    }
+                    String declAnnos = varEl.getAnnotationMirrors().toString();
+                    if (!expectedDeclAnnos.equals(declAnnos)) {
+                        throw new AssertionError("Unexpected modifiers: " + declAnnos +
+                                                  " for: " + var.getName());
+                    }
+                    TypeMirror varType = varEl.asType();
+                    String type = varType.toString();
+                    if (!expectedType.equals(type)) {
+                        throw new AssertionError("Unexpected type: " + type +
+                                                  " for: " + var.getName());
+                    }
+                    return super.visitInstanceOf(node, p);
+                }
+            }.scan(tp.getCompilationUnit(), null);
+        }
+        return false;
+    }
+
+    @Target(ElementType.LOCAL_VARIABLE)
+    @interface DA {}
+    @Target({ElementType.TYPE_USE, ElementType.LOCAL_VARIABLE})
+    @interface DTA {}
+    @Target(ElementType.TYPE_USE)
+    @interface TA {}
+}
+
diff --git a/test/langtools/tools/javac/patterns/BindingsTest1.java b/test/langtools/tools/javac/patterns/BindingsTest1.java
index 018084a98e716..8faf4add7ed84 100644
--- a/test/langtools/tools/javac/patterns/BindingsTest1.java
+++ b/test/langtools/tools/javac/patterns/BindingsTest1.java
@@ -185,6 +185,21 @@ public void run() {
             String s2 = s;
         }
 
+        if (o1 instanceof final String s) {
+            Runnable r1 = new Runnable() {
+                @Override
+                public void run() {
+                    s.length();
+                }
+            };
+            r1.run();
+            Runnable r2 = () -> {
+                s.length();
+            };
+            r2.run();
+            String s2 = s;
+        }
+
         boolean result = (o1 instanceof String a1) ? (o1 instanceof String a2) : (!(o1 instanceof String a3));
         boolean result2 = (o1 instanceof String a1) ? (o1 instanceof String a2) : (!(switch (0) { default -> false; }));
 
diff --git a/test/langtools/tools/javac/patterns/BindingsTest2.java b/test/langtools/tools/javac/patterns/BindingsTest2.java
index 4bbd5f3f532ca..d3247ea427321 100644
--- a/test/langtools/tools/javac/patterns/BindingsTest2.java
+++ b/test/langtools/tools/javac/patterns/BindingsTest2.java
@@ -241,5 +241,11 @@ public static void main(String[] args) {
                 s.length();
             }
         }
+
+        {
+            if (o1 instanceof final String s) {
+                s = "";
+            }
+        }
     }
 }
diff --git a/test/langtools/tools/javac/patterns/BindingsTest2.out b/test/langtools/tools/javac/patterns/BindingsTest2.out
index e52e9db234277..9f22871d39297 100644
--- a/test/langtools/tools/javac/patterns/BindingsTest2.out
+++ b/test/langtools/tools/javac/patterns/BindingsTest2.out
@@ -46,7 +46,8 @@ BindingsTest2.java:212:13: compiler.err.cant.resolve.location: kindname.variable
 BindingsTest2.java:221:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
 BindingsTest2.java:231:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
 BindingsTest2.java:241:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
+BindingsTest2.java:247:17: compiler.err.cant.assign.val.to.final.var: s
 BindingsTest2.java:135:17: compiler.err.unreachable.stmt
 BindingsTest2.java:160:17: compiler.err.unreachable.stmt
 BindingsTest2.java:185:17: compiler.err.unreachable.stmt
-51 errors
\ No newline at end of file
+52 errors
diff --git a/test/langtools/tools/javac/patterns/NoModifiersOnBinding.java b/test/langtools/tools/javac/patterns/NoModifiersOnBinding.java
new file mode 100644
index 0000000000000..85bbb211d3ec7
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/NoModifiersOnBinding.java
@@ -0,0 +1,24 @@
+/* @test /nodynamiccopyright/
+ * @bug 8256266
+ * @summary Binding variables cannot have (non-annotation) modifiers.
+ * @compile/fail/ref=NoModifiersOnBinding.out -XDrawDiagnostics NoModifiersOnBinding.java
+ */
+
+public class NoModifiersOnBinding {
+
+    private static void test(Object o) {
+        if (o instanceof final String) {
+            System.err.println(s);
+        }
+        if (o instanceof /**@deprecated*/ String) {
+            System.err.println(s);
+        }
+        if (o instanceof static String s) {
+            System.err.println(s);
+        }
+        if (o instanceof /**@deprecated*/ String s) {
+            System.err.println(s);
+        }
+    }
+
+}
diff --git a/test/langtools/tools/javac/patterns/NoModifiersOnBinding.out b/test/langtools/tools/javac/patterns/NoModifiersOnBinding.out
new file mode 100644
index 0000000000000..94c1f2a656615
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/NoModifiersOnBinding.out
@@ -0,0 +1,3 @@
+NoModifiersOnBinding.java:10:32: compiler.err.mod.not.allowed.here: final
+NoModifiersOnBinding.java:16:33: compiler.err.mod.not.allowed.here: static
+2 errors

From a6c088131bfeec1ce44e43b513ce3f857fa6e44f Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Tue, 5 Jan 2021 12:47:33 +0000
Subject: [PATCH 016/129] 8256321: Some "inactive" color profiles use the wrong
 profile class

Reviewed-by: prr
---
 .../classes/java/awt/color/ICC_Profile.java   |  4 +-
 .../awt/color/CheckDefaultProperties.java     | 85 +++++++++++++++++++
 2 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/awt/color/CheckDefaultProperties.java

diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
index b4e38a25c7ea6..969696ceadcff 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
@@ -857,7 +857,7 @@ public static ICC_Profile getInstance (int cspace) {
                     ProfileDeferralInfo pInfo =
                         new ProfileDeferralInfo("CIEXYZ.pf",
                                                 ColorSpace.TYPE_XYZ, 3,
-                                                CLASS_DISPLAY);
+                                                CLASS_ABSTRACT);
                     XYZprofile = getDeferredInstance(pInfo);
                 }
                 thisProfile = XYZprofile;
@@ -871,7 +871,7 @@ public static ICC_Profile getInstance (int cspace) {
                     ProfileDeferralInfo pInfo =
                         new ProfileDeferralInfo("PYCC.pf",
                                                 ColorSpace.TYPE_3CLR, 3,
-                                                CLASS_DISPLAY);
+                                                CLASS_COLORSPACECONVERSION);
                     PYCCprofile = getDeferredInstance(pInfo);
                 }
                 thisProfile = PYCCprofile;
diff --git a/test/jdk/java/awt/color/CheckDefaultProperties.java b/test/jdk/java/awt/color/CheckDefaultProperties.java
new file mode 100644
index 0000000000000..583c46da7e10e
--- /dev/null
+++ b/test/jdk/java/awt/color/CheckDefaultProperties.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_Profile;
+
+import static java.awt.color.ColorSpace.TYPE_3CLR;
+import static java.awt.color.ColorSpace.TYPE_GRAY;
+import static java.awt.color.ColorSpace.TYPE_RGB;
+import static java.awt.color.ColorSpace.TYPE_XYZ;
+import static java.awt.color.ICC_Profile.CLASS_ABSTRACT;
+import static java.awt.color.ICC_Profile.CLASS_COLORSPACECONVERSION;
+import static java.awt.color.ICC_Profile.CLASS_DISPLAY;
+
+/**
+ * @test
+ * @bug 8256321
+ * @summary Verifies profile properties are the same before/after activation
+ */
+public final class CheckDefaultProperties {
+
+    public static void main(String[] args) {
+        ICC_Profile srgb = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+        ICC_Profile gray = ICC_Profile.getInstance(ColorSpace.CS_GRAY);
+        ICC_Profile xyz = ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ);
+        ICC_Profile lrgb = ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB);
+        ICC_Profile pycc = ICC_Profile.getInstance(ColorSpace.CS_PYCC);
+
+        // check default values, before profile activation
+        test(srgb, TYPE_RGB, 3, CLASS_DISPLAY);
+        test(gray, TYPE_GRAY, 1, CLASS_DISPLAY);
+        test(xyz, TYPE_XYZ, 3, CLASS_ABSTRACT);
+        test(lrgb, TYPE_RGB, 3, CLASS_DISPLAY);
+        test(pycc, TYPE_3CLR, 3, CLASS_COLORSPACECONVERSION);
+
+        // activate profiles
+        srgb.getData();
+        gray.getData();
+        xyz.getData();
+        lrgb.getData();
+        pycc.getData();
+
+        // check default values, after profile activation
+        test(srgb, TYPE_RGB, 3, CLASS_DISPLAY);
+        test(gray, TYPE_GRAY, 1, CLASS_DISPLAY);
+        test(xyz, TYPE_XYZ, 3, CLASS_ABSTRACT);
+        test(lrgb, TYPE_RGB, 3, CLASS_DISPLAY);
+        test(pycc, TYPE_3CLR, 3, CLASS_COLORSPACECONVERSION);
+    }
+
+    private static void test(ICC_Profile profile, int type, int num, int pcls) {
+        int profileClass = profile.getProfileClass();
+        int colorSpaceType = profile.getColorSpaceType();
+        int numComponents = profile.getNumComponents();
+        if (profileClass != pcls) {
+            throw new RuntimeException("Wrong profile class: " + profileClass);
+        }
+        if (colorSpaceType != type) {
+            throw new RuntimeException("Wrong profile type: " + colorSpaceType);
+        }
+        if (numComponents != num) {
+            throw new RuntimeException("Wrong profile comps: " + numComponents);
+        }
+    }
+}

From 6775113ce88cc819e7c3242730837e4afd7733b0 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 5 Jan 2021 13:06:54 +0000
Subject: [PATCH 017/129] 8258393: Shenandoah: "graph should be schedulable"
 assert failure

Reviewed-by: rkennke, thartmann
---
 .../gc/shenandoah/c2/shenandoahSupport.cpp    | 15 ++++
 src/hotspot/share/opto/loopnode.cpp           | 30 ++++++--
 .../compiler/TestBadRawMemoryAfterCall.java   | 74 +++++++++++++++++++
 3 files changed, 112 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/gc/shenandoah/compiler/TestBadRawMemoryAfterCall.java

diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 6fef738e70c5c..e5c426d2f3dbe 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -2459,6 +2459,21 @@ bool MemoryGraphFixer::mem_is_valid(Node* m, Node* c) const {
 
 Node* MemoryGraphFixer::find_mem(Node* ctrl, Node* n) const {
   assert(n == NULL || _phase->ctrl_or_self(n) == ctrl, "");
+  assert(!ctrl->is_Call() || ctrl == n, "projection expected");
+#ifdef ASSERT
+  if ((ctrl->is_Proj() && ctrl->in(0)->is_Call()) ||
+      (ctrl->is_Catch() && ctrl->in(0)->in(0)->is_Call())) {
+    CallNode* call = ctrl->is_Proj() ? ctrl->in(0)->as_Call() : ctrl->in(0)->in(0)->as_Call();
+    int mems = 0;
+    for (DUIterator_Fast imax, i = call->fast_outs(imax); i < imax; i++) {
+      Node* u = call->fast_out(i);
+      if (u->bottom_type() == Type::MEMORY) {
+        mems++;
+      }
+    }
+    assert(mems <= 1, "No node right after call if multiple mem projections");
+  }
+#endif
   Node* mem = _memory_nodes[ctrl->_idx];
   Node* c = ctrl;
   while (!mem_is_valid(mem, c) &&
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 66c63f4a7d850..bc0da1902b5ee 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4968,18 +4968,18 @@ Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
   if (n->is_Load() && LCA != early) {
     int load_alias_idx = C->get_alias_index(n->adr_type());
     if (C->alias_type(load_alias_idx)->is_rewritable()) {
+      Unique_Node_List worklist;
 
-      Node_List worklist;
-
-      Node *mem = n->in(MemNode::Memory);
+      Node* mem = n->in(MemNode::Memory);
       for (DUIterator_Fast imax, i = mem->fast_outs(imax); i < imax; i++) {
         Node* s = mem->fast_out(i);
         worklist.push(s);
       }
-      while(worklist.size() != 0 && LCA != early) {
-        Node* s = worklist.pop();
+      for (uint i = 0; i < worklist.size() && LCA != early; i++) {
+        Node* s = worklist.at(i);
         if (s->is_Load() || s->Opcode() == Op_SafePoint ||
-            (s->is_CallStaticJava() && s->as_CallStaticJava()->uncommon_trap_request() != 0)) {
+            (s->is_CallStaticJava() && s->as_CallStaticJava()->uncommon_trap_request() != 0) ||
+            s->is_Phi()) {
           continue;
         } else if (s->is_MergeMem()) {
           for (DUIterator_Fast imax, i = s->fast_outs(imax); i < imax; i++) {
@@ -4987,7 +4987,7 @@ Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
             worklist.push(s1);
           }
         } else {
-          Node *sctrl = has_ctrl(s) ? get_ctrl(s) : s->in(0);
+          Node* sctrl = has_ctrl(s) ? get_ctrl(s) : s->in(0);
           assert(sctrl != NULL || !s->is_reachable_from_root(), "must have control");
           if (sctrl != NULL && !sctrl->is_top() && is_dominator(early, sctrl)) {
             const TypePtr* adr_type = s->adr_type();
@@ -5011,6 +5011,22 @@ Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
           }
         }
       }
+      // For Phis only consider Region's inputs that were reached by following the memory edges
+      if (LCA != early) {
+        for (uint i = 0; i < worklist.size(); i++) {
+          Node* s = worklist.at(i);
+          if (s->is_Phi() && C->can_alias(s->adr_type(), load_alias_idx)) {
+            Node* r = s->in(0);
+            for (uint j = 1; j < s->req(); j++) {
+              Node* in = s->in(j);
+              Node* r_in = r->in(j);
+              if (worklist.member(in) && is_dominator(early, r_in)) {
+                LCA = dom_lca_for_get_late_ctrl(LCA, r_in, n);
+              }
+            }
+          }
+        }
+      }
     }
   }
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestBadRawMemoryAfterCall.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestBadRawMemoryAfterCall.java
new file mode 100644
index 0000000000000..099400cc70f94
--- /dev/null
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestBadRawMemoryAfterCall.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8258393
+ * @summary Shenandoah: "graph should be schedulable" assert failure
+ * @requires vm.flavor == "server"
+ * @requires vm.gc.Shenandoah
+ *
+ * @run main/othervm -XX:+UseShenandoahGC -XX:-BackgroundCompilation TestBadRawMemoryAfterCall
+ *
+ */
+
+public class TestBadRawMemoryAfterCall {
+    public static void main(String[] args) {
+        A a = new A();
+        B b = new B();
+        C c = new C();
+        for (int i = 0; i < 20_000; i++) {
+            test(a);
+            test(b);
+            test(c);
+        }
+    }
+
+    private static Object test(A a) {
+        if (a.getClass() == A.class) {
+        }
+
+        Object o = null;
+        try {
+            a.m();
+            o = a.getClass();
+        } catch (Exception e) {
+
+        }
+        return o;
+    }
+
+    private static class A {
+        void m() throws Exception {
+            throw new Exception();
+        }
+    }
+    private static class B extends A {
+        void m() {
+        }
+    }
+    private static class C extends B {
+        void m() {
+        }
+    }
+}

From bbc2e9510bb32d69d823bd572b6c0c02bd2335af Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 5 Jan 2021 13:39:57 +0000
Subject: [PATCH 018/129] 8257906: JFR: RecordingStream leaks memory

Reviewed-by: mgronlun
Backport-of: 3c6648501589bf36945340cb1e82c833ebd7485d
---
 .../jdk/jfr/consumer/RecordingStream.java     | 43 +++++++++++++++++--
 .../jfr/internal/consumer/ChunkParser.java    | 12 ++++++
 .../consumer/EventDirectoryStream.java        |  1 +
 .../internal/consumer/EventFileStream.java    |  1 +
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java
index 78fe38d6d34bc..7938fc22831c2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java
@@ -45,7 +45,6 @@
 import jdk.jfr.internal.SecuritySupport;
 import jdk.jfr.internal.Utils;
 import jdk.jfr.internal.consumer.EventDirectoryStream;
-import jdk.jfr.internal.consumer.JdkJfrConsumer;
 
 /**
  * A recording stream produces events from the current JVM (Java Virtual
@@ -68,9 +67,27 @@
  */
 public final class RecordingStream implements AutoCloseable, EventStream {
 
+    final static class ChunkConsumer implements Consumer<Long> {
+
+        private final Recording recording;
+
+        ChunkConsumer(Recording recording) {
+            this.recording = recording;
+        }
+
+        @Override
+        public void accept(Long endNanos) {
+            Instant t = Utils.epochNanosToInstant(endNanos);
+            PlatformRecording p = PrivateAccess.getInstance().getPlatformRecording(recording);
+            p.removeBefore(t);
+        }
+    }
+
     private final Recording recording;
     private final Instant creationTime;
     private final EventDirectoryStream directoryStream;
+    private long maxSize;
+    private Duration maxAge;
 
     /**
      * Creates an event stream for the current JVM (Java Virtual Machine).
@@ -247,7 +264,11 @@ public EventSettings disable(Class<? extends Event> eventClass) {
      *         state
      */
     public void setMaxAge(Duration maxAge) {
-        recording.setMaxAge(maxAge);
+        synchronized (directoryStream) {
+            recording.setMaxAge(maxAge);
+            this.maxAge = maxAge;
+            updateOnCompleteHandler();
+        }
     }
 
     /**
@@ -270,7 +291,11 @@ public void setMaxAge(Duration maxAge) {
      * @throws IllegalStateException if the recording is in {@code CLOSED} state
      */
     public void setMaxSize(long maxSize) {
-        recording.setMaxSize(maxSize);
+        synchronized (directoryStream) {
+            recording.setMaxSize(maxSize);
+            this.maxSize = maxSize;
+            updateOnCompleteHandler();
+        }
     }
 
     @Override
@@ -320,6 +345,7 @@ public void onError(Consumer<Throwable> action) {
 
     @Override
     public void close() {
+        directoryStream.setChunkCompleteHandler(null);
         recording.close();
         directoryStream.close();
     }
@@ -333,6 +359,7 @@ public boolean remove(Object action) {
     public void start() {
         PlatformRecording pr = PrivateAccess.getInstance().getPlatformRecording(recording);
         long startNanos = pr.start();
+        updateOnCompleteHandler();
         directoryStream.start(startNanos);
     }
 
@@ -363,6 +390,7 @@ public void start() {
     public void startAsync() {
         PlatformRecording pr = PrivateAccess.getInstance().getPlatformRecording(recording);
         long startNanos = pr.start();
+        updateOnCompleteHandler();
         directoryStream.startAsync(startNanos);
     }
 
@@ -380,4 +408,13 @@ public void awaitTermination() throws InterruptedException {
     public void onMetadata(Consumer<MetadataEvent> action) {
         directoryStream.onMetadata(action);
     }
+
+    private void updateOnCompleteHandler() {
+        if (maxAge != null || maxSize != 0) {
+            // User has set a chunk removal policy
+            directoryStream.setChunkCompleteHandler(null);
+        } else {
+            directoryStream.setChunkCompleteHandler(new ChunkConsumer(recording));
+        }
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
index 043bac38589ce..4d2d94d5dcbde 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
@@ -488,4 +488,16 @@ public void setStaleMetadata(boolean stale) {
     public boolean hasStaleMetadata() {
         return staleMetadata;
     }
+
+    public void resetCache() {
+        LongMap<Parser> ps = this.parsers;
+        if (ps != null) {
+            ps.forEach(p -> {
+                if (p instanceof EventParser) {
+                    EventParser ep = (EventParser) p;
+                    ep.resetCache();
+                }
+            });
+        }
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
index 192dabd81381d..9a71c5c145ce9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
@@ -159,6 +159,7 @@ protected void processRecursionSafe() throws IOException {
                     } else {
                         processUnordered(disp);
                     }
+                    currentParser.resetCache();
                     if (currentParser.getStartNanos() + currentParser.getChunkDuration() > filterEnd) {
                         close();
                         return;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventFileStream.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventFileStream.java
index 6db1d7ae1bf7b..91c70973464d6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventFileStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventFileStream.java
@@ -102,6 +102,7 @@ protected void process() throws IOException {
             } else {
                 processUnordered(disp);
             }
+            currentParser.resetCache();
             if (isClosed() || currentParser.isLastChunk()) {
                 return;
             }

From fc3b45c068cf6393d16c254cf9080213f9d592ab Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Tue, 5 Jan 2021 14:46:03 +0000
Subject: [PATCH 019/129] 8258643:
 javax/swing/JComponent/7154030/bug7154030.java failed with "Exception: Failed
 to hide opaque button"

Reviewed-by: psadhukhan
---
 .../swing/JComponent/7154030/bug7154030.java   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/test/jdk/javax/swing/JComponent/7154030/bug7154030.java b/test/jdk/javax/swing/JComponent/7154030/bug7154030.java
index 4835c07bf94f1..4856671727601 100644
--- a/test/jdk/javax/swing/JComponent/7154030/bug7154030.java
+++ b/test/jdk/javax/swing/JComponent/7154030/bug7154030.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,9 @@
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
-import java.awt.AWTException;
-import java.awt.AlphaComposite;
 import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
+import java.awt.Insets;
 import java.awt.Rectangle;
-import java.awt.Robot;
-import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 import javax.imageio.ImageIO;
 import java.io.File;
@@ -98,10 +93,11 @@ public void run() {
             robot.waitForIdle(1000);
 
             Rectangle bounds = frame.getBounds();
-            locx = bounds.x;
-            locy = bounds.y;
-            frw = bounds.width;
-            frh = bounds.height;
+            Insets insets = frame.getInsets();
+            locx = bounds.x + insets.left;
+            locy = bounds.y + insets.top;
+            frw = bounds.width - insets.left - insets.right;
+            frh = bounds.height - insets.top - insets.bottom;
 
             imageInit = robot.createScreenCapture(new Rectangle(locx, locy, frw, frh));
 

From f4122d6aa21fc589cd0f75ea29998447e0f1ea36 Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Tue, 5 Jan 2021 16:14:58 +0000
Subject: [PATCH 020/129] 8258896: Remove the JVM ForceFloatExceptions option

Reviewed-by: lfoltan, iklam, coleenp
---
 src/hotspot/os/windows/os_windows.cpp | 23 ++++++++---------------
 src/hotspot/share/runtime/globals.hpp |  3 ---
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index e8d936f76828d..9eed244f3f559 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4183,21 +4183,14 @@ jint os::init_2(void) {
 #endif
 
   // for debugging float code generation bugs
-  if (ForceFloatExceptions) {
-#ifndef  _WIN64
-    static long fp_control_word = 0;
-    __asm { fstcw fp_control_word }
-    // see Intel PPro Manual, Vol. 2, p 7-16
-    const long precision = 0x20;
-    const long underflow = 0x10;
-    const long overflow  = 0x08;
-    const long zero_div  = 0x04;
-    const long denorm    = 0x02;
-    const long invalid   = 0x01;
-    fp_control_word |= invalid;
-    __asm { fldcw fp_control_word }
+#if defined(ASSERT) && !defined(_WIN64)
+  static long fp_control_word = 0;
+  __asm { fstcw fp_control_word }
+  // see Intel PPro Manual, Vol. 2, p 7-16
+  const long invalid   = 0x01;
+  fp_control_word |= invalid;
+  __asm { fldcw fp_control_word }
 #endif
-  }
 
   // If stack_commit_size is 0, windows will reserve the default size,
   // but only commit a small portion of it.
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 2bd40302863a2..b79332fed6b20 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -461,9 +461,6 @@ const intx ObjectAlignmentInBytes = 8;
   product(bool, BytecodeVerificationLocal, false, DIAGNOSTIC,               \
           "Enable the Java bytecode verifier for local classes")            \
                                                                             \
-  develop(bool, ForceFloatExceptions, trueInDebug,                          \
-          "Force exceptions on FP stack under/overflow")                    \
-                                                                            \
   develop(bool, VerifyStackAtCalls, false,                                  \
           "Verify that the stack pointer is unchanged after calls")         \
                                                                             \

From b7940aa1c4952e206162d4d46e0aca08adae52b9 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Tue, 5 Jan 2021 16:15:28 +0000
Subject: [PATCH 021/129] 8259027: NullPointerException in makeMappedSegment
 due to NULL Unmapper when length of segment is 0

Reviewed-by: chegar, uschindler
---
 .../foreign/MappedMemorySegmentImpl.java      | 38 +++++++++++++++++--
 test/jdk/java/foreign/TestByteBuffer.java     | 18 +++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
index 8df08047d74e6..62e4007282401 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
@@ -116,13 +116,17 @@ public static MemorySegment makeMappedSegment(Path path, long bytesOffset, long
         if (bytesOffset < 0) throw new IllegalArgumentException("Requested bytes offset must be >= 0.");
         try (FileChannelImpl channelImpl = (FileChannelImpl)FileChannel.open(path, openOptions(mapMode))) {
             UnmapperProxy unmapperProxy = channelImpl.mapInternal(mapMode, bytesOffset, bytesSize);
-            MemoryScope scope = MemoryScope.createConfined(null, unmapperProxy::unmap, null);
             int modes = defaultAccessModes(bytesSize);
             if (mapMode == FileChannel.MapMode.READ_ONLY) {
                 modes &= ~WRITE;
             }
-            return new MappedMemorySegmentImpl(unmapperProxy.address(), unmapperProxy, bytesSize,
-                    modes, scope);
+            if (unmapperProxy != null) {
+                MemoryScope scope = MemoryScope.createConfined(null, unmapperProxy::unmap, null);
+                return new MappedMemorySegmentImpl(unmapperProxy.address(), unmapperProxy, bytesSize,
+                        modes, scope);
+            } else {
+                return new EmptyMappedMemorySegmentImpl(modes);
+            }
         }
     }
 
@@ -135,4 +139,32 @@ private static OpenOption[] openOptions(FileChannel.MapMode mapMode) {
             throw new UnsupportedOperationException("Unsupported map mode: " + mapMode);
         }
     }
+
+    static class EmptyMappedMemorySegmentImpl extends MappedMemorySegmentImpl {
+
+        public EmptyMappedMemorySegmentImpl(int modes) {
+            super(0, null, 0, modes,
+                    MemoryScope.createConfined(null, MemoryScope.DUMMY_CLEANUP_ACTION, null));
+        }
+
+        @Override
+        public void load() {
+            // do nothing
+        }
+
+        @Override
+        public void unload() {
+            // do nothing
+        }
+
+        @Override
+        public boolean isLoaded() {
+            return true;
+        }
+
+        @Override
+        public void force() {
+            // do nothing
+        }
+    };
 }
diff --git a/test/jdk/java/foreign/TestByteBuffer.java b/test/jdk/java/foreign/TestByteBuffer.java
index 8c71aeb0d1af5..241a7eefed50a 100644
--- a/test/jdk/java/foreign/TestByteBuffer.java
+++ b/test/jdk/java/foreign/TestByteBuffer.java
@@ -464,12 +464,30 @@ public void testBadMapNegativeOffset() throws IOException {
         MemorySegment.mapFile(f.toPath(), -1, 1, FileChannel.MapMode.READ_WRITE);
     }
 
+    @Test
     public void testMapZeroSize() throws IOException {
         File f = new File("testPos1.out");
         f.createNewFile();
         f.deleteOnExit();
+        //RW
         try (MemorySegment segment = MemorySegment.mapFile(f.toPath(), 0L, 0L, FileChannel.MapMode.READ_WRITE)) {
             assertEquals(segment.byteSize(), 0);
+            assertEquals(segment.isMapped(), true);
+            assertTrue((segment.accessModes() & (READ | WRITE)) == (READ | WRITE));
+            MappedMemorySegments.force(segment);
+            MappedMemorySegments.load(segment);
+            MappedMemorySegments.isLoaded(segment);
+            MappedMemorySegments.unload(segment);
+        }
+        //RO
+        try (MemorySegment segment = MemorySegment.mapFile(f.toPath(), 0L, 0L, FileChannel.MapMode.READ_ONLY)) {
+            assertEquals(segment.byteSize(), 0);
+            assertEquals(segment.isMapped(), true);
+            assertTrue((segment.accessModes() & (READ | WRITE)) == READ);
+            MappedMemorySegments.force(segment);
+            MappedMemorySegments.load(segment);
+            MappedMemorySegments.isLoaded(segment);
+            MappedMemorySegments.unload(segment);
         }
     }
 

From 82bdbfd7fa7a01564745b05237e21fd9dc328547 Mon Sep 17 00:00:00 2001
From: Hao Sun <hao.sun@arm.com>
Date: Tue, 5 Jan 2021 16:28:28 +0000
Subject: [PATCH 022/129] 8258857: Zero: non-PCH release build fails after
 JDK-8258074

Reviewed-by: jiefu, shade, iklam
---
 src/hotspot/share/compiler/compiler_globals.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/compiler/compiler_globals.hpp b/src/hotspot/share/compiler/compiler_globals.hpp
index 9cb81a44bd4e6..e3aa20c4f1540 100644
--- a/src/hotspot/share/compiler/compiler_globals.hpp
+++ b/src/hotspot/share/compiler/compiler_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifndef SHARE_COMPILER_COMPILER_GLOBALS_HPP
 #define SHARE_COMPILER_COMPILER_GLOBALS_HPP
 
+#include "compiler/compiler_globals_pd.hpp"
 #include "runtime/globals_shared.hpp"
 #ifdef COMPILER1
 #include "c1/c1_globals.hpp"

From d5aa49d15417b72bd9a87cdfd5c3fcdf3704b5cf Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Tue, 5 Jan 2021 16:41:17 +0000
Subject: [PATCH 023/129] 8259236: C2 compilation fails with
 assert(is_power_of_2(value)) failed: value must be a power of 2:
 8000000000000000

Reviewed-by: thartmann
---
 src/hotspot/cpu/x86/x86_64.ad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 7b23b45ef1ead..13b8125ad108f 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -9600,7 +9600,7 @@ instruct btrL_mem_imm(memory dst, immL_NotPow2 con, rFlagsReg cr)
   ins_cost(125);
   format %{ "btrq    $dst, log2(not($con))\t# long" %}
   ins_encode %{
-    __ btrq($dst$$Address, log2i_exact(~$con$$constant));
+    __ btrq($dst$$Address, log2i_exact((julong)~$con$$constant));
   %}
   ins_pipe(ialu_mem_imm);
 %}

From 85bac8c415070992a9807599fe1ec07e4ed0c562 Mon Sep 17 00:00:00 2001
From: Peter Levart <plevart@openjdk.org>
Date: Tue, 5 Jan 2021 17:41:50 +0000
Subject: [PATCH 024/129] 8259021: SharedSecrets should avoid double racy reads
 from non-volatile fields

Reviewed-by: shade, redestad, rriggs, mchung, rrich, alanb
---
 .../jdk/internal/access/SharedSecrets.java    | 138 ++++++++++++------
 1 file changed, 93 insertions(+), 45 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
index 1111afcf88315..5a1a59898e000 100644
--- a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
+++ b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,21 +83,25 @@ public static void setJavaUtilCollectionAccess(JavaUtilCollectionAccess juca) {
     }
 
     public static JavaUtilCollectionAccess getJavaUtilCollectionAccess() {
-        if (javaUtilCollectionAccess == null) {
+        var access = javaUtilCollectionAccess;
+        if (access == null) {
             try {
                 Class.forName("java.util.ImmutableCollections$Access", true, null);
+                access = javaUtilCollectionAccess;
             } catch (ClassNotFoundException e) {};
         }
-        return javaUtilCollectionAccess;
+        return access;
     }
 
     public static JavaUtilJarAccess javaUtilJarAccess() {
-        if (javaUtilJarAccess == null) {
+        var access = javaUtilJarAccess;
+        if (access == null) {
             // Ensure JarFile is initialized; we know that this class
             // provides the shared secret
             ensureClassInitialized(JarFile.class);
+            access = javaUtilJarAccess;
         }
-        return javaUtilJarAccess;
+        return access;
     }
 
     public static void setJavaUtilJarAccess(JavaUtilJarAccess access) {
@@ -117,12 +121,14 @@ public static void setJavaLangInvokeAccess(JavaLangInvokeAccess jlia) {
     }
 
     public static JavaLangInvokeAccess getJavaLangInvokeAccess() {
-        if (javaLangInvokeAccess == null) {
+        var access = javaLangInvokeAccess;
+        if (access == null) {
             try {
                 Class.forName("java.lang.invoke.MethodHandleImpl", true, null);
+                access = javaLangInvokeAccess;
             } catch (ClassNotFoundException e) {};
         }
-        return javaLangInvokeAccess;
+        return access;
     }
 
     public static void setJavaLangModuleAccess(JavaLangModuleAccess jlrma) {
@@ -130,10 +136,12 @@ public static void setJavaLangModuleAccess(JavaLangModuleAccess jlrma) {
     }
 
     public static JavaLangModuleAccess getJavaLangModuleAccess() {
-        if (javaLangModuleAccess == null) {
+        var access = javaLangModuleAccess;
+        if (access == null) {
             ensureClassInitialized(ModuleDescriptor.class);
+            access = javaLangModuleAccess;
         }
-        return javaLangModuleAccess;
+        return access;
     }
 
     public static void setJavaLangRefAccess(JavaLangRefAccess jlra) {
@@ -157,9 +165,12 @@ public static void setJavaNetUriAccess(JavaNetUriAccess jnua) {
     }
 
     public static JavaNetUriAccess getJavaNetUriAccess() {
-        if (javaNetUriAccess == null)
+        var access = javaNetUriAccess;
+        if (access == null) {
             ensureClassInitialized(java.net.URI.class);
-        return javaNetUriAccess;
+            access = javaNetUriAccess;
+        }
+        return access;
     }
 
     public static void setJavaNetURLAccess(JavaNetURLAccess jnua) {
@@ -167,9 +178,12 @@ public static void setJavaNetURLAccess(JavaNetURLAccess jnua) {
     }
 
     public static JavaNetURLAccess getJavaNetURLAccess() {
-        if (javaNetURLAccess == null)
+        var access = javaNetURLAccess;
+        if (access == null) {
             ensureClassInitialized(java.net.URL.class);
-        return javaNetURLAccess;
+            access = javaNetURLAccess;
+        }
+        return access;
     }
 
     public static void setJavaNetInetAddressAccess(JavaNetInetAddressAccess jna) {
@@ -177,9 +191,12 @@ public static void setJavaNetInetAddressAccess(JavaNetInetAddressAccess jna) {
     }
 
     public static JavaNetInetAddressAccess getJavaNetInetAddressAccess() {
-        if (javaNetInetAddressAccess == null)
+        var access = javaNetInetAddressAccess;
+        if (access == null) {
             ensureClassInitialized(java.net.InetAddress.class);
-        return javaNetInetAddressAccess;
+            access = javaNetInetAddressAccess;
+        }
+        return access;
     }
 
     public static void setJavaNetHttpCookieAccess(JavaNetHttpCookieAccess a) {
@@ -187,9 +204,12 @@ public static void setJavaNetHttpCookieAccess(JavaNetHttpCookieAccess a) {
     }
 
     public static JavaNetHttpCookieAccess getJavaNetHttpCookieAccess() {
-        if (javaNetHttpCookieAccess == null)
+        var access = javaNetHttpCookieAccess;
+        if (access == null) {
             ensureClassInitialized(java.net.HttpCookie.class);
-        return javaNetHttpCookieAccess;
+            access = javaNetHttpCookieAccess;
+        }
+        return access;
     }
 
     public static void setJavaNioAccess(JavaNioAccess jna) {
@@ -197,12 +217,14 @@ public static void setJavaNioAccess(JavaNioAccess jna) {
     }
 
     public static JavaNioAccess getJavaNioAccess() {
-        if (javaNioAccess == null) {
+        var access = javaNioAccess;
+        if (access == null) {
             // Ensure java.nio.Buffer is initialized, which provides the
             // shared secret.
             ensureClassInitialized(java.nio.Buffer.class);
+            access = javaNioAccess;
         }
-        return javaNioAccess;
+        return access;
     }
 
     public static void setJavaIOAccess(JavaIOAccess jia) {
@@ -210,10 +232,12 @@ public static void setJavaIOAccess(JavaIOAccess jia) {
     }
 
     public static JavaIOAccess getJavaIOAccess() {
-        if (javaIOAccess == null) {
+        var access = javaIOAccess;
+        if (access == null) {
             ensureClassInitialized(Console.class);
+            access = javaIOAccess;
         }
-        return javaIOAccess;
+        return access;
     }
 
     public static void setJavaIOFileDescriptorAccess(JavaIOFileDescriptorAccess jiofda) {
@@ -221,10 +245,12 @@ public static void setJavaIOFileDescriptorAccess(JavaIOFileDescriptorAccess jiof
     }
 
     public static JavaIOFilePermissionAccess getJavaIOFilePermissionAccess() {
-        if (javaIOFilePermissionAccess == null)
+        var access = javaIOFilePermissionAccess;
+        if (access == null) {
             ensureClassInitialized(FilePermission.class);
-
-        return javaIOFilePermissionAccess;
+            access = javaIOFilePermissionAccess;
+        }
+        return access;
     }
 
     public static void setJavaIOFilePermissionAccess(JavaIOFilePermissionAccess jiofpa) {
@@ -232,10 +258,12 @@ public static void setJavaIOFilePermissionAccess(JavaIOFilePermissionAccess jiof
     }
 
     public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() {
-        if (javaIOFileDescriptorAccess == null)
+        var access = javaIOFileDescriptorAccess;
+        if (access == null) {
             ensureClassInitialized(FileDescriptor.class);
-
-        return javaIOFileDescriptorAccess;
+            access = javaIOFileDescriptorAccess;
+        }
+        return access;
     }
 
     public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
@@ -243,16 +271,21 @@ public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
     }
 
     public static JavaSecurityAccess getJavaSecurityAccess() {
-        if (javaSecurityAccess == null) {
+        var access = javaSecurityAccess;
+        if (access == null) {
             ensureClassInitialized(ProtectionDomain.class);
+            access = javaSecurityAccess;
         }
-        return javaSecurityAccess;
+        return access;
     }
 
     public static JavaUtilZipFileAccess getJavaUtilZipFileAccess() {
-        if (javaUtilZipFileAccess == null)
+        var access = javaUtilZipFileAccess;
+        if (access == null) {
             ensureClassInitialized(java.util.zip.ZipFile.class);
-        return javaUtilZipFileAccess;
+            access = javaUtilZipFileAccess;
+        }
+        return access;
     }
 
     public static void setJavaUtilZipFileAccess(JavaUtilZipFileAccess access) {
@@ -288,9 +321,12 @@ public static void setJavaBeansAccess(JavaBeansAccess access) {
     }
 
     public static JavaUtilResourceBundleAccess getJavaUtilResourceBundleAccess() {
-        if (javaUtilResourceBundleAccess == null)
+        var access = javaUtilResourceBundleAccess;
+        if (access == null) {
             ensureClassInitialized(ResourceBundle.class);
-        return javaUtilResourceBundleAccess;
+            access = javaUtilResourceBundleAccess;
+        }
+        return access;
     }
 
     public static void setJavaUtilResourceBundleAccess(JavaUtilResourceBundleAccess access) {
@@ -298,10 +334,12 @@ public static void setJavaUtilResourceBundleAccess(JavaUtilResourceBundleAccess
     }
 
     public static JavaObjectInputStreamReadString getJavaObjectInputStreamReadString() {
-        if (javaObjectInputStreamReadString == null) {
+        var access = javaObjectInputStreamReadString;
+        if (access == null) {
             ensureClassInitialized(ObjectInputStream.class);
+            access = javaObjectInputStreamReadString;
         }
-        return javaObjectInputStreamReadString;
+        return access;
     }
 
     public static void setJavaObjectInputStreamReadString(JavaObjectInputStreamReadString access) {
@@ -309,10 +347,12 @@ public static void setJavaObjectInputStreamReadString(JavaObjectInputStreamReadS
     }
 
     public static JavaObjectInputStreamAccess getJavaObjectInputStreamAccess() {
-        if (javaObjectInputStreamAccess == null) {
+        var access = javaObjectInputStreamAccess;
+        if (access == null) {
             ensureClassInitialized(ObjectInputStream.class);
+            access = javaObjectInputStreamAccess;
         }
-        return javaObjectInputStreamAccess;
+        return access;
     }
 
     public static void setJavaObjectInputStreamAccess(JavaObjectInputStreamAccess access) {
@@ -320,10 +360,12 @@ public static void setJavaObjectInputStreamAccess(JavaObjectInputStreamAccess ac
     }
 
     public static JavaObjectInputFilterAccess getJavaObjectInputFilterAccess() {
-        if (javaObjectInputFilterAccess == null) {
+        var access = javaObjectInputFilterAccess;
+        if (access == null) {
             ensureClassInitialized(ObjectInputFilter.Config.class);
+            access = javaObjectInputFilterAccess;
         }
-        return javaObjectInputFilterAccess;
+        return access;
     }
 
     public static void setJavaObjectInputFilterAccess(JavaObjectInputFilterAccess access) {
@@ -335,10 +377,12 @@ public static void setJavaIORandomAccessFileAccess(JavaIORandomAccessFileAccess
     }
 
     public static JavaIORandomAccessFileAccess getJavaIORandomAccessFileAccess() {
-        if (javaIORandomAccessFileAccess == null) {
+        var access = javaIORandomAccessFileAccess;
+        if (access == null) {
             ensureClassInitialized(RandomAccessFile.class);
+            access = javaIORandomAccessFileAccess;
         }
-        return javaIORandomAccessFileAccess;
+        return access;
     }
 
     public static void setJavaSecuritySignatureAccess(JavaSecuritySignatureAccess jssa) {
@@ -346,10 +390,12 @@ public static void setJavaSecuritySignatureAccess(JavaSecuritySignatureAccess js
     }
 
     public static JavaSecuritySignatureAccess getJavaSecuritySignatureAccess() {
-        if (javaSecuritySignatureAccess == null) {
+        var access = javaSecuritySignatureAccess;
+        if (access == null) {
             ensureClassInitialized(Signature.class);
+            access = javaSecuritySignatureAccess;
         }
-        return javaSecuritySignatureAccess;
+        return access;
     }
 
     public static void setJavaxCryptoSealedObjectAccess(JavaxCryptoSealedObjectAccess jcsoa) {
@@ -357,10 +403,12 @@ public static void setJavaxCryptoSealedObjectAccess(JavaxCryptoSealedObjectAcces
     }
 
     public static JavaxCryptoSealedObjectAccess getJavaxCryptoSealedObjectAccess() {
-        if (javaxCryptoSealedObjectAccess == null) {
+        var access = javaxCryptoSealedObjectAccess;
+        if (access == null) {
             ensureClassInitialized(SealedObject.class);
+            access = javaxCryptoSealedObjectAccess;
         }
-        return javaxCryptoSealedObjectAccess;
+        return access;
     }
 
     private static void ensureClassInitialized(Class<?> c) {

From 50bf4330302174322bf04cf31d905dd9558a1334 Mon Sep 17 00:00:00 2001
From: Sandhya Viswanathan <sviswanathan@openjdk.org>
Date: Tue, 5 Jan 2021 17:42:22 +0000
Subject: [PATCH 025/129] 8259213: Vector conversion with part > 0 is not
 getting intrinsic implementation

Reviewed-by: psandoz
---
 .../classes/jdk/incubator/vector/AbstractShuffle.java    | 5 ++++-
 .../classes/jdk/incubator/vector/AbstractVector.java     | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
index 21f722b5d168e..4d9e714263b5e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,6 +120,9 @@ public int[] toArray() {
 
     @ForceInline
     public final VectorShuffle<E> checkIndexes() {
+        if (VectorIntrinsics.VECTOR_ACCESS_OOB_CHECK == 0) {
+            return this;
+        }
         // FIXME: vectorize this
         for (int index : reorder()) {
             if (index < 0) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
index 3b882a67503da..1ffdb058a273c 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -312,7 +312,7 @@ AbstractVector<F> reinterpretShapeTemplate(VectorSpecies<F> toSpecies, int part)
             int origin = shapeChangeOrigin(vsp, rsp, false, part);
             //System.out.println("*** origin = "+origin+", part = "+part+", reinterpret");
             if (part > 0) {  // Expansion: slice first then cast.
-                return slice(origin, vsp.zero()).convert0('X', rsp);
+                return slice(origin).convert0('X', rsp);
             } else {  // Contraction: cast first then unslice.
                 return rsp.zero().slice(rsp.laneCount() - origin,
                                         convert0('X', rsp));
@@ -323,6 +323,9 @@ AbstractVector<F> reinterpretShapeTemplate(VectorSpecies<F> toSpecies, int part)
     @Override
     public abstract AbstractVector<E> slice(int origin, Vector<E> v1);
 
+    @Override
+    public abstract AbstractVector<E> slice(int origin);
+
     /**
      * This is the template for Vector::convertShape, to be
      * specialized by each distinct vector class.
@@ -365,7 +368,7 @@ AbstractVector<F> convertShapeTemplate(Conversion<E,F> conv, VectorSpecies<F> to
             int origin = shapeChangeOrigin(vsp, rsp, true, part);
             //System.out.println("*** origin = "+origin+", part = "+part+", lanewise");
             if (part > 0) {  // Expansion: slice first then cast.
-                return slice(origin, vsp.zero()).convert0(kind, rsp);
+                return slice(origin).convert0(kind, rsp);
             } else {  // Contraction: cast first then unslice.
                 return rsp.zero().slice(rsp.laneCount() - origin,
                                         convert0(kind, rsp));

From 7ddc2b5606cd5353a3c25dde476ff0e6ccc2ed23 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Tue, 5 Jan 2021 18:29:35 +0000
Subject: [PATCH 026/129] 8258852: Arrays.asList() for single item could be
 replaced with List.of()

Reviewed-by: mullan
---
 .../share/classes/sun/security/ssl/ClientHello.java  |  6 +++---
 .../classes/sun/security/ssl/KeyShareExtension.java  | 12 ++++--------
 .../classes/sun/security/ssl/SSLConfiguration.java   | 10 ++++------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/ClientHello.java b/src/java.base/share/classes/sun/security/ssl/ClientHello.java
index 3d7733a158fbe..967f8f469a4af 100644
--- a/src/java.base/share/classes/sun/security/ssl/ClientHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ClientHello.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -558,7 +558,7 @@ public byte[] produce(ConnectionContext context) throws IOException {
                         cipherSuites = Arrays.asList(sessionSuite,
                             CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV);
                     } else {    // otherwise, use renegotiation_info extension
-                        cipherSuites = Arrays.asList(sessionSuite);
+                        cipherSuites = List.of(sessionSuite);
                     }
 
                     if (SSLLogger.isOn &&
@@ -1076,7 +1076,7 @@ public void consume(ConnectionContext context,
             // Check and launch ClientHello extensions.
             SSLExtension[] extTypes = shc.sslConfig.getExclusiveExtensions(
                     SSLHandshake.CLIENT_HELLO,
-                    Arrays.asList(SSLExtension.CH_SESSION_TICKET));
+                    List.of(SSLExtension.CH_SESSION_TICKET));
             clientHello.extensions.consumeOnLoad(shc, extTypes);
 
             //
diff --git a/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java b/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
index 4097f64cfe17d..a0d9b98a77a36 100644
--- a/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import java.text.MessageFormat;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.LinkedList;
@@ -236,7 +235,7 @@ public byte[] produce(ConnectionContext context,
             List<NamedGroup> namedGroups;
             if (chc.serverSelectedNamedGroup != null) {
                 // Response to HelloRetryRequest
-                namedGroups = Arrays.asList(chc.serverSelectedNamedGroup);
+                namedGroups = List.of(chc.serverSelectedNamedGroup);
             } else {
                 namedGroups = chc.clientRequestedNamedGroups;
                 if (namedGroups == null || namedGroups.isEmpty()) {
@@ -289,7 +288,6 @@ public byte[] produce(ConnectionContext context,
 
         private static byte[] getShare(ClientHandshakeContext chc,
                 NamedGroup ng) {
-            byte[] share = null;
             SSLKeyExchange ke = SSLKeyExchange.valueOf(ng);
             if (ke == null) {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
@@ -307,7 +305,7 @@ private static byte[] getShare(ClientHandshakeContext chc,
                     }
                 }
             }
-            return share;
+            return null;
         }
     }
 
@@ -836,12 +834,10 @@ public byte[] produce(ConnectionContext context,
                     spec.clientShares.size() == 1) {
                 int namedGroupId = spec.clientShares.get(0).namedGroupId;
 
-                byte[] extdata = new byte[] {
+                return new byte[] {
                         (byte)((namedGroupId >> 8) & 0xFF),
                         (byte)(namedGroupId & 0xFF)
                     };
-
-                return extdata;
             }
 
             return null;
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
index f9a7c64e506c2..37d6562dc1781 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import java.security.AlgorithmConstraints;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -139,8 +138,8 @@ final class SSLConfiguration implements Cloneable {
         this.clientAuthType = ClientAuthType.CLIENT_AUTH_NONE;
 
         this.identificationProtocol = null;
-        this.serverNames = Collections.<SNIServerName>emptyList();
-        this.sniMatchers = Collections.<SNIMatcher>emptyList();
+        this.serverNames = Collections.emptyList();
+        this.sniMatchers = Collections.emptyList();
         this.preferLocalCipherSuites = true;
 
         this.applicationProtocols = new String[0];
@@ -368,8 +367,7 @@ SSLExtension[] getExclusiveExtensions(SSLHandshake handshakeType,
      */
     SSLExtension[] getEnabledExtensions(
             SSLHandshake handshakeType, ProtocolVersion protocolVersion) {
-        return getEnabledExtensions(
-            handshakeType, Arrays.asList(protocolVersion));
+        return getEnabledExtensions(handshakeType, List.of(protocolVersion));
     }
 
     /**

From 1b60acd8aa9cbf9aed9deaf16a8eb6c09b44ee55 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Tue, 5 Jan 2021 18:33:41 +0000
Subject: [PATCH 027/129] 8259252: Shenandoah: Shenandoah build failed on
 AArch64 after JDK-8258459

Reviewed-by: rkennke, shade
---
 .../gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
index c05b5f9952477..1347241a7600c 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2021, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"

From 4d3d59912d71a05865b87bb2579571fbda74b668 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Tue, 5 Jan 2021 19:32:46 +0000
Subject: [PATCH 028/129] 8259223: Simplify boolean expression in the SunJSSE
 provider

Reviewed-by: mullan
---
 .../classes/sun/security/ssl/CipherSuite.java    |  4 ++--
 .../sun/security/ssl/EphemeralKeyManager.java    |  4 ++--
 .../share/classes/sun/security/ssl/Finished.java |  4 ++--
 .../sun/security/ssl/HandshakeContext.java       |  4 ++--
 .../sun/security/ssl/KeyManagerFactoryImpl.java  |  4 ++--
 .../sun/security/ssl/ProtocolVersion.java        |  8 ++++----
 .../classes/sun/security/ssl/SSLSocketImpl.java  |  6 +++---
 .../sun/security/ssl/SignatureScheme.java        |  6 +++---
 .../sun/security/ssl/SunX509KeyManagerImpl.java  |  8 ++++----
 .../security/ssl/TrustManagerFactoryImpl.java    |  6 +++---
 .../sun/security/ssl/X509KeyManagerImpl.java     | 16 ++++++++--------
 11 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
index 24d7e1ded8157..95246513a3051 100644
--- a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
+++ b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -890,7 +890,7 @@ private CipherSuite(int id, boolean isDefaultEnabled,
         this.macAlg = macAlg;
         this.hashAlg = hashAlg;
 
-        this.exportable = (cipher == null ? false : cipher.exportable);
+        this.exportable = (cipher != null && cipher.exportable);
     }
 
     static CipherSuite nameOf(String ciperSuiteName) {
diff --git a/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java b/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
index 2e5540f1f59d6..ab3e35dc83ae3 100644
--- a/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -128,7 +128,7 @@ private boolean isValid() {
          * Return the KeyPair or null if it is invalid.
          */
         private KeyPair getKeyPair() {
-            if (isValid() == false) {
+            if (!isValid()) {
                 keyPair = null;
                 return null;
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 60c0abe314a34..01fdf4766415e 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -325,7 +325,7 @@ public byte[] createVerifyData(HandshakeContext context,
         }
     }
 
-    // TLS 1.2
+    // TLS 1.3
     private static final
             class T13VerifyDataGenerator implements VerifyDataGenerator {
         private static final byte[] hkdfLabel = "tls13 finished".getBytes();
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
index 50ee421bae251..af713f8422536 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -576,7 +576,7 @@ private static boolean isActivatable(CipherSuite suite,
 
                     retval |= groupAvailable;
                 } else {
-                    retval |= true;
+                    retval = true;
                 }
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
index 7256466033f10..b97b41bf1d1eb 100644
--- a/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,7 @@ protected void engineInit(KeyStore ks, char[] password) throws
         @Override
         protected void engineInit(ManagerFactoryParameters params) throws
                 InvalidAlgorithmParameterException {
-            if (params instanceof KeyStoreBuilderParameters == false) {
+            if (!(params instanceof KeyStoreBuilderParameters)) {
                 throw new InvalidAlgorithmParameterException(
                 "Parameters must be instance of KeyStoreBuilderParameters");
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java b/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
index 58ed9acd8c793..e4cb5637c60e1 100644
--- a/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
+++ b/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -356,7 +356,7 @@ boolean useTLS12PlusSpec() {
      * TLS 1.1/DTLS 1.0 or newer version.
      */
     boolean useTLS11PlusSpec() {
-        return isDTLS ? true : (this.id >= TLS11.id);
+        return isDTLS || (this.id >= TLS11.id);
     }
 
     /**
@@ -364,7 +364,7 @@ boolean useTLS11PlusSpec() {
      * newer version.
      */
     boolean useTLS10PlusSpec() {
-        return isDTLS ? true : (this.id >= TLS10.id);
+        return isDTLS || (this.id >= TLS10.id);
     }
 
     /**
@@ -372,7 +372,7 @@ boolean useTLS10PlusSpec() {
      * newer version.
      */
     static boolean useTLS10PlusSpec(int id, boolean isDTLS) {
-        return isDTLS ? true : (id >= TLS10.id);
+        return isDTLS || (id >= TLS10.id);
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index 8b28a49eba634..91a7822958727 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -837,7 +837,7 @@ private void shutdownInput(
     @Override
     public boolean isInputShutdown() {
         return conContext.isInboundClosed() &&
-                ((autoClose || !isLayered()) ? super.isInputShutdown(): true);
+                (!autoClose && isLayered() || super.isInputShutdown());
     }
 
     // Please don't synchronized this method.  Otherwise, the read and close
@@ -861,7 +861,7 @@ public void shutdownOutput() throws IOException {
     @Override
     public boolean isOutputShutdown() {
         return conContext.isOutboundClosed() &&
-                ((autoClose || !isLayered()) ? super.isOutputShutdown(): true);
+                (!autoClose && isLayered() || super.isOutputShutdown());
     }
 
     @Override
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
index fe089b1403a9a..ec34aa13c0e12 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -364,8 +364,8 @@ private boolean isPermitted(AlgorithmConstraints constraints) {
                constraints.permits(SIGNATURE_PRIMITIVE_SET,
                         this.algorithm, (signAlgParams != null ?
                                 signAlgParams.parameters : null)) &&
-               (namedGroup != null ?
-                        namedGroup.isPermitted(constraints) : true);
+                        (namedGroup == null ||
+                            namedGroup.isPermitted(constraints));
     }
 
     // Get local supported algorithm collection complying to algorithm
diff --git a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
index 115a683cddd43..22a4d68ed85ad 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,7 +139,7 @@ Set<X500Principal> getIssuerX500Principals() {
                 continue;
             }
             Key key = ks.getKey(alias, password);
-            if (key instanceof PrivateKey == false) {
+            if (!(key instanceof PrivateKey)) {
                 continue;
             }
             Certificate[] certs = ks.getCertificateChain(alias);
@@ -334,7 +334,7 @@ private String[] getAliases(String keyType, Principal[] issuers) {
         if (issuers == null) {
             issuers = new X500Principal[0];
         }
-        if (issuers instanceof X500Principal[] == false) {
+        if (!(issuers instanceof X500Principal[])) {
             // normally, this will never happen but try to recover if it does
             issuers = convertPrincipals(issuers);
         }
@@ -375,7 +375,7 @@ private String[] getAliases(String keyType, Principal[] issuers) {
                         certs[0].getSigAlgName().toUpperCase(Locale.ENGLISH);
                     String pattern = "WITH" +
                         sigType.toUpperCase(Locale.ENGLISH);
-                    if (sigAlgName.contains(pattern) == false) {
+                    if (!sigAlgName.contains(pattern)) {
                         continue;
                     }
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
index 1eab2e6363ad2..3830cb693e390 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -155,13 +155,13 @@ X509TrustManager getInstance(
         @Override
         X509TrustManager getInstance(ManagerFactoryParameters spec)
                 throws InvalidAlgorithmParameterException {
-            if (spec instanceof CertPathTrustManagerParameters == false) {
+            if (!(spec instanceof CertPathTrustManagerParameters)) {
                 throw new InvalidAlgorithmParameterException
                     ("Parameters must be CertPathTrustManagerParameters");
             }
             CertPathParameters params =
                 ((CertPathTrustManagerParameters)spec).getParameters();
-            if (params instanceof PKIXBuilderParameters == false) {
+            if (!(params instanceof PKIXBuilderParameters)) {
                 throw new InvalidAlgorithmParameterException
                     ("Encapsulated parameters must be PKIXBuilderParameters");
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
index 4ab78a4586856..c2bd09e00da17 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -271,7 +271,7 @@ private PrivateKeyEntry getEntry(String alias) {
             KeyStore ks = builder.getKeyStore();
             Entry newEntry = ks.getEntry
                     (keyStoreAlias, builder.getProtectionParameter(alias));
-            if (newEntry instanceof PrivateKeyEntry == false) {
+            if (!(newEntry instanceof PrivateKeyEntry)) {
                 // unexpected type of entry
                 return null;
             }
@@ -581,7 +581,7 @@ CheckResult check(X509Certificate cert, Date date,
                             // require either signature bit
                             // or if server also allow key encipherment bit
                             if (!supportsDigitalSignature) {
-                                if (this == CLIENT || getBit(ku, 2) == false) {
+                                if (this == CLIENT || !getBit(ku, 2)) {
                                     return CheckResult.EXTENSION_MISMATCH;
                                 }
                             }
@@ -599,7 +599,7 @@ CheckResult check(X509Certificate cert, Date date,
                             break;
                         case "DH":
                             // require keyagreement bit
-                            if (getBit(ku, 4) == false) {
+                            if (!getBit(ku, 4)) {
                                 return CheckResult.EXTENSION_MISMATCH;
                             }
                             break;
@@ -614,7 +614,7 @@ CheckResult check(X509Certificate cert, Date date,
                             // exchange and not ephemeral ECDH. We leave it in
                             // for now until there are signs that this check
                             // causes problems for real world EC certificates.
-                            if ((this == SERVER) && (getBit(ku, 4) == false)) {
+                            if (this == SERVER && !getBit(ku, 4)) {
                                 return CheckResult.EXTENSION_MISMATCH;
                             }
                             break;
@@ -748,7 +748,7 @@ private List<EntryStatus> getAliases(int builderIndex,
 
             boolean incompatible = false;
             for (Certificate cert : chain) {
-                if (cert instanceof X509Certificate == false) {
+                if (!(cert instanceof X509Certificate)) {
                     // not an X509Certificate, ignore this alias
                     incompatible = true;
                     break;
@@ -785,7 +785,7 @@ private List<EntryStatus> getAliases(int builderIndex,
                         break;
                     }
                 }
-                if (found == false) {
+                if (!found) {
                     if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
                         SSLLogger.fine(
                                 "Ignore alias " + alias
@@ -820,7 +820,7 @@ private List<EntryStatus> getAliases(int builderIndex,
             if (!preferred && checkResult == CheckResult.OK && keyIndex == 0) {
                 preferred = true;
             }
-            if (preferred && (findAll == false)) {
+            if (preferred && !findAll) {
                 // if we have a good match and do not need all matches,
                 // return immediately
                 return Collections.singletonList(status);

From cf9908b437cb3847c1e813f6eccdc1d3326742ff Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Tue, 5 Jan 2021 21:15:13 +0000
Subject: [PATCH 029/129] 8258937: Remove JVM IgnoreRewrites flag

Reviewed-by: coleenp
---
 src/hotspot/share/oops/generateOopMap.cpp | 27 ++---------------------
 src/hotspot/share/runtime/globals.hpp     |  4 ----
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/hotspot/share/oops/generateOopMap.cpp b/src/hotspot/share/oops/generateOopMap.cpp
index 6ca4dce1ff71b..83d7539242dab 100644
--- a/src/hotspot/share/oops/generateOopMap.cpp
+++ b/src/hotspot/share/oops/generateOopMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2263,34 +2263,11 @@ void GenerateOopMap::rewrite_refval_conflicts()
      return;
 
   // Check if rewrites are allowed in this parse.
-  if (!allow_rewrites() && !IgnoreRewrites) {
+  if (!allow_rewrites()) {
     fatal("Rewriting method not allowed at this stage");
   }
 
 
-  // This following flag is to tempoary supress rewrites. The locals that might conflict will
-  // all be set to contain values. This is UNSAFE - however, until the rewriting has been completely
-  // tested it is nice to have.
-  if (IgnoreRewrites) {
-    if (Verbose) {
-       tty->print("rewrites suppressed for local no. ");
-       for (int l = 0; l < _max_locals; l++) {
-         if (_new_var_map[l] != l) {
-           tty->print("%d ", l);
-           vars()[l] = CellTypeState::value;
-         }
-       }
-       tty->cr();
-    }
-
-    // That was that...
-    _new_var_map = NULL;
-    _nof_refval_conflicts = 0;
-    _conflict = false;
-
-    return;
-  }
-
   // Tracing flag
   _did_rewriting = true;
 
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index b79332fed6b20..096f1943d6f32 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -674,10 +674,6 @@ const intx ObjectAlignmentInBytes = 8;
           "Tell whether the VM should register soft/weak/final/phantom "    \
           "references")                                                     \
                                                                             \
-  develop(bool, IgnoreRewrites, false,                                      \
-          "Suppress rewrites of bytecodes in the oopmap generator. "        \
-          "This is unsafe!")                                                \
-                                                                            \
   develop(bool, PrintCodeCacheExtension, false,                             \
           "Print extension of code cache")                                  \
                                                                             \

From d5293067226011a96f97cd5e8efe0dd2dff521b2 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Tue, 5 Jan 2021 21:35:47 +0000
Subject: [PATCH 030/129] 8213032: program fails with LambdaConversionException
 at execution time

Reviewed-by: jlahoda
---
 .../sun/tools/javac/comp/LambdaToMethod.java  | 17 ++++---
 .../MethodReferenceIntersection4.java         | 45 +++++++++++++++++++
 2 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection4.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 9e8a083eea3f8..4a6ae3a184614 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -968,14 +968,19 @@ VarSymbol addParametersReturnReceiver() {
             for (int i = 0; implPTypes.nonEmpty() && i < last; ++i) {
                 // By default use the implementation method parameter type
                 Type parmType = implPTypes.head;
-                // If the unerased parameter type is a type variable whose
-                // bound is an intersection (eg. <T extends A & B>) then
-                // use the SAM parameter type
-                if (checkForIntersection && descPTypes.head.getKind() == TypeKind.TYPEVAR) {
-                    TypeVar tv = (TypeVar) descPTypes.head;
-                    if (tv.getUpperBound().getKind() == TypeKind.INTERSECTION) {
+                if (checkForIntersection) {
+                    if (descPTypes.head.getKind() == TypeKind.INTERSECTION) {
                         parmType = samPTypes.head;
                     }
+                    // If the unerased parameter type is a type variable whose
+                    // bound is an intersection (eg. <T extends A & B>) then
+                    // use the SAM parameter type
+                    if (descPTypes.head.getKind() == TypeKind.TYPEVAR) {
+                        TypeVar tv = (TypeVar) descPTypes.head;
+                        if (tv.getUpperBound().getKind() == TypeKind.INTERSECTION) {
+                            parmType = samPTypes.head;
+                        }
+                    }
                 }
                 addParameter("x$" + i, parmType, true);
 
diff --git a/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection4.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection4.java
new file mode 100644
index 0000000000000..36d7c1410ff1b
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceIntersection4.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8213032
+ * @summary program fails with LambdaConversionException at execution time
+ */
+
+import java.util.stream.*;
+
+public class MethodReferenceIntersection4 {
+    interface I {}
+    static abstract class C { }
+    static class A extends C implements I { }
+    static class B extends C implements I { }
+
+    static String f(I i) { return null; }
+
+    public static void main(String[] args) {
+        Stream.of(new A(), new B())
+                .map(MethodReferenceIntersection4::f)
+                .forEach(System.out::println);
+    }
+}

From 7d769663b3a7da0db64a6bb4d2aaee595afe3242 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <lgxbslgx@gmail.com>
Date: Tue, 5 Jan 2021 22:21:19 +0000
Subject: [PATCH 031/129] 8255757: Javac emits duplicate pool entries on
 array::clone

Reviewed-by: vromero
---
 .../classes/com/sun/tools/javac/jvm/Gen.java  |  20 +++-
 .../javac/classfiles/T8255757/T8255757.java   | 103 ++++++++++++++++++
 2 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 test/langtools/tools/javac/classfiles/T8255757/T8255757.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index d93d85746cd5b..f206270f960f9 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
 
 package com.sun.tools.javac.jvm;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant;
 import com.sun.tools.javac.tree.TreeInfo.PosKind;
 import com.sun.tools.javac.util.*;
@@ -127,6 +130,7 @@ protected Gen(Context context) {
         // ignore cldc because we cannot have both stackmap formats
         this.stackMap = StackMapFormat.JSR202;
         annotate = Annotate.instance(context);
+        qualifiedSymbolCache = new HashMap<>();
     }
 
     /** Switches
@@ -168,6 +172,12 @@ protected Gen(Context context) {
     List<LocalItem> stackBeforeSwitchExpression;
     LocalItem switchResult;
 
+    /** Cache the symbol to reflect the qualifying type.
+     *  key: corresponding type
+     *  value: qualified symbol
+     */
+    Map<Type, Symbol> qualifiedSymbolCache;
+
     /** Generate code to load an integer constant.
      *  @param n     The integer to be loaded.
      */
@@ -230,8 +240,11 @@ Symbol binaryQualifier(Symbol sym, Type site) {
                 sym.owner != syms.arrayClass)
                 return sym;
             // array clone can be qualified by the array type in later targets
-            Symbol qualifier = new ClassSymbol(Flags.PUBLIC, site.tsym.name,
-                                               site, syms.noSymbol);
+            Symbol qualifier;
+            if ((qualifier = qualifiedSymbolCache.get(site)) == null) {
+                qualifier = new ClassSymbol(Flags.PUBLIC, site.tsym.name, site, syms.noSymbol);
+                qualifiedSymbolCache.put(site, qualifier);
+            }
             return sym.clone(qualifier);
         }
 
@@ -2414,6 +2427,7 @@ public boolean genClass(Env<AttrContext> env, JCClassDecl cdef) {
             toplevel = null;
             endPosTable = null;
             nerrs = 0;
+            qualifiedSymbolCache.clear();
         }
     }
 
diff --git a/test/langtools/tools/javac/classfiles/T8255757/T8255757.java b/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
new file mode 100644
index 0000000000000..4b1b740b94c19
--- /dev/null
+++ b/test/langtools/tools/javac/classfiles/T8255757/T8255757.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8255757
+ * @summary Javac shouldn't emit duplicate pool entries on array::clone
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.classfile
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main T8255757
+ */
+
+import java.nio.file.Path;
+
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPool;
+import com.sun.tools.classfile.ConstantPool.*;
+
+import toolbox.JavacTask;
+import toolbox.ToolBox;
+import toolbox.TestRunner;
+
+public class T8255757 extends TestRunner {
+    ToolBox tb;
+
+    T8255757() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public static void main(String[] args) throws Exception {
+        T8255757 t = new T8255757();
+        t.runTests();
+    }
+
+    @Test
+    public void testDuplicatePoolEntries() throws Exception {
+        String code = """
+                public class Test {
+                    void test(Object[] o) {
+                        o.clone();
+                        o.clone();
+                    }
+                    void test2(Object[] o) {
+                        o.clone();
+                        o.clone();
+                    }
+                }""";
+        Path curPath = Path.of(".");
+        new JavacTask(tb)
+                .sources(code)
+                .outdir(curPath)
+                .run();
+
+        ClassFile cf = ClassFile.read(curPath.resolve("Test.class"));
+        ConstantPool cp = cf.constant_pool;
+        int num = 0;
+        for (CPInfo cpInfo : cp.entries()) {
+            if (cpInfo instanceof CONSTANT_Methodref_info) {
+                int class_index = ((CONSTANT_Methodref_info) cpInfo).class_index;
+                int name_and_type_index = ((CONSTANT_Methodref_info) cpInfo).name_and_type_index;
+                int class_name_index = ((CONSTANT_Class_info)
+                        cp.getClassInfo(class_index)).name_index;
+                int method_name_index = ((CONSTANT_NameAndType_info)
+                        cp.getNameAndTypeInfo(name_and_type_index)).name_index;
+                int method_type_name_index = ((CONSTANT_NameAndType_info)
+                        cp.getNameAndTypeInfo(name_and_type_index)).type_index;
+                if ("[Ljava/lang/Object;".equals(cp.getUTF8Value(class_name_index)) &&
+                        "clone".equals(cp.getUTF8Value(method_name_index)) &&
+                        "()Ljava/lang/Object;".equals(cp.getUTF8Value(method_type_name_index))) {
+                    ++num;
+                }
+            }
+        }
+        if (num != 1) {
+            throw new AssertionError("The number of the pool entries on array::clone is not right. " +
+                    "Expected number: 1, actual number: " + num);
+        }
+    }
+}

From 8b4549773b649a33f8f6795cd054b4bb2ec607ec Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Tue, 5 Jan 2021 22:36:09 +0000
Subject: [PATCH 032/129] 8259037: livenmethods cannot find hsdis library

Reviewed-by: cjplummer, sspitsyn
---
 .../sun/jvm/hotspot/asm/Disassembler.java     | 89 ++++++++++++-------
 .../share/native/libsaproc/sadis.c            | 23 +----
 2 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java
index a95227734714d..925a3bedba120 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,14 @@
 package sun.jvm.hotspot.asm;
 
 import java.io.PrintStream;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Iterator;
+import java.util.Properties;
 import sun.jvm.hotspot.code.CodeBlob;
 import sun.jvm.hotspot.code.NMethod;
 import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.debugger.DebuggerException;
 import sun.jvm.hotspot.runtime.VM;
 
 public class Disassembler {
@@ -59,44 +64,60 @@ private Disassembler(long startPc, byte[] code) {
 
       // Lazily load hsdis
       if (decode_function == 0) {
-         StringBuilder path = new StringBuilder(System.getProperty("java.home"));
-         String sep = System.getProperty("file.separator");
-         String os = System.getProperty("os.name");
-         String libname = "hsdis";
-         String arch = System.getProperty("os.arch");
-         if (os.lastIndexOf("Windows", 0) != -1) {
-            if (arch.equals("x86")) {
-               libname +=  "-i386";
-            } else if (arch.equals("amd64")) {
-               libname +=  "-amd64";
-            } else {
-               libname +=  "-" + arch;
-            }
-            path.append(sep + "bin" + sep);
-            libname += ".dll";
-         } else if (os.lastIndexOf("Linux", 0) != -1) {
-            if (arch.equals("x86") || arch.equals("i386")) {
-               path.append(sep + "lib" + sep + "i386" + sep);
-               libname += "-i386.so";
-            } else if (arch.equals("amd64") || arch.equals("x86_64")) {
-               path.append(sep + "lib" + sep + "amd64" + sep);
-               libname +=  "-amd64.so";
-            } else {
-               path.append(sep + "lib" + sep + arch + sep);
-               libname +=  "-" + arch + ".so";
+         // Search for hsdis library in the following 4 locations:
+         //   1. <home>/lib/<vm>/libhsdis-<arch>.so
+         //   2. <home>/lib/<vm>/hsdis-<arch>.so
+         //   3. <home>/lib/hsdis-<arch>.so
+         //   4. hsdis-<arch>.so  (using LD_LIBRARY_PATH)
+         Properties targetSysProps = VM.getVM().getSystemProperties();
+         String os = targetSysProps.getProperty("os.name");
+         String ext = ".so";
+         if (os.contains("Windows")) {
+            ext = ".dll";
+         } else if (os.contains("Mac OS")) {
+            ext = ".dylib";
+         }
+
+         // Find the full path to libjvm.so (jvm.dll and libjvm.dylib on Windows and OSX).
+         String jvmPattern = "^(lib)?jvm\\" + ext + "$";
+         Path jvmPath = VM.getVM()
+                          .getDebugger()
+                          .getCDebugger()
+                          .getLoadObjectList()
+                          .stream()
+                          .map(o -> Path.of(o.getName()))
+                          .filter(p -> p.getFileName().toString().matches(jvmPattern))
+                          .findAny()
+                          .get();
+
+         String arch = targetSysProps.getProperty("os.arch");
+         String libname = "hsdis-" + arch + ext;
+
+         List<String> libs = List.of(
+            // 1. <home>/lib/<vm>/libhsdis-<arch>.so
+            jvmPath.resolveSibling("lib" + libname).toString(),
+            // 2. <home>/lib/<vm>/hsdis-<arch>.so
+            jvmPath.resolveSibling(libname).toString(),
+            // 3. <home>/lib/hsdis-<arch>.so
+            jvmPath.getParent().resolveSibling(libname).toString(),
+            // 4. hsdis-<arch>.so  (using LD_LIBRARY_PATH)
+            libname
+         );
+
+         var itr = libs.iterator();
+         while (itr.hasNext() && (decode_function == 0L)) {
+            try {
+               decode_function = load_library(itr.next());
+            } catch (DebuggerException e) {
+               if (!itr.hasNext()) {
+                  throw e;
+               }
             }
-         } else if (os.lastIndexOf("Mac OS X", 0) != -1) {
-            path.append(sep + "lib" + sep);
-            libname += "-amd64" + ".dylib";       // x86_64 => amd64
-         } else {
-            path.append(sep + "lib" + sep + "arch" + sep);
-            libname +=  "-" + arch + ".so";
          }
-         decode_function = load_library(path.toString(), libname);
       }
    }
 
-   private static native long load_library(String installed_jrepath, String hsdis_library_name);
+   private static native long load_library(String hsdis_library_name);
 
    private native void decode(InstructionVisitor visitor, long pc, byte[] code,
                               String options, long decode_function);
diff --git a/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
index 540f13ad5b6f0..9210f78ab2a89 100644
--- a/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
+++ b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -110,42 +110,30 @@ static int getLastErrorString(char *buf, size_t len)
 /*
  * Class:     sun_jvm_hotspot_asm_Disassembler
  * Method:    load_library
- * Signature: (Ljava/lang/String;)L
+ * Signature: (Ljava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_asm_Disassembler_load_1library(JNIEnv * env,
                                                                            jclass disclass,
-                                                                           jstring jrepath_s,
                                                                            jstring libname_s) {
   uintptr_t func = 0;
   const char *error_message = NULL;
-  const char *jrepath = NULL;
   const char *libname = NULL;
-  char buffer[JVM_MAXPATHLEN];
 
 #ifdef _WINDOWS
+  char buffer[JVM_MAXPATHLEN];
   HINSTANCE hsdis_handle = (HINSTANCE) NULL;
 #else
   void* hsdis_handle = NULL;
 #endif
 
-  jrepath = (*env)->GetStringUTFChars(env, jrepath_s, NULL); // like $JAVA_HOME/jre/lib/sparc/
-  if (jrepath == NULL || (*env)->ExceptionOccurred(env)) {
-    return 0;
-  }
-
   libname = (*env)->GetStringUTFChars(env, libname_s, NULL);
   if (libname == NULL || (*env)->ExceptionOccurred(env)) {
-    (*env)->ReleaseStringUTFChars(env, jrepath_s, jrepath);
     return 0;
   }
 
   /* Load the hsdis library */
 #ifdef _WINDOWS
   hsdis_handle = LoadLibrary(libname);
-  if (hsdis_handle == NULL) {
-    snprintf(buffer, sizeof(buffer), "%s%s", jrepath, libname);
-    hsdis_handle = LoadLibrary(buffer);
-  }
   if (hsdis_handle != NULL) {
     func = (uintptr_t)GetProcAddress(hsdis_handle, "decode_instructions_virtual");
   }
@@ -155,10 +143,6 @@ JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_asm_Disassembler_load_1library(JNIE
   }
 #else
   hsdis_handle = dlopen(libname, RTLD_LAZY | RTLD_GLOBAL);
-  if (hsdis_handle == NULL) {
-    snprintf(buffer, sizeof(buffer), "%s%s", jrepath, libname);
-    hsdis_handle = dlopen(buffer, RTLD_LAZY | RTLD_GLOBAL);
-  }
   if (hsdis_handle != NULL) {
     func = (uintptr_t)dlsym(hsdis_handle, "decode_instructions_virtual");
   }
@@ -168,7 +152,6 @@ JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_asm_Disassembler_load_1library(JNIE
 #endif
 
   (*env)->ReleaseStringUTFChars(env, libname_s, libname);
-  (*env)->ReleaseStringUTFChars(env, jrepath_s, jrepath);
 
   if (func == 0) {
     /* Couldn't find entry point.  error_message should contain some

From 52d3feec412f4bafdf16c248c4b31014a8d9d72f Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Wed, 6 Jan 2021 01:40:34 +0000
Subject: [PATCH 033/129] 8258813: [TESTBUG] Fix incorrect Vector API test
 output message

Reviewed-by: psandoz, njian
---
 .../incubator/vector/AbstractVectorTest.java  |   4 +-
 .../vector/Byte128VectorLoadStoreTests.java   |  54 +--
 .../incubator/vector/Byte128VectorTests.java  | 450 +++++++++---------
 .../vector/Byte256VectorLoadStoreTests.java   |  54 +--
 .../incubator/vector/Byte256VectorTests.java  | 450 +++++++++---------
 .../vector/Byte512VectorLoadStoreTests.java   |  54 +--
 .../incubator/vector/Byte512VectorTests.java  | 450 +++++++++---------
 .../vector/Byte64VectorLoadStoreTests.java    |  54 +--
 .../incubator/vector/Byte64VectorTests.java   | 450 +++++++++---------
 .../vector/ByteMaxVectorLoadStoreTests.java   |  54 +--
 .../incubator/vector/ByteMaxVectorTests.java  | 450 +++++++++---------
 .../vector/Double128VectorLoadStoreTests.java |  60 +--
 .../vector/Double128VectorTests.java          | 404 ++++++++--------
 .../vector/Double256VectorLoadStoreTests.java |  60 +--
 .../vector/Double256VectorTests.java          | 404 ++++++++--------
 .../vector/Double512VectorLoadStoreTests.java |  60 +--
 .../vector/Double512VectorTests.java          | 404 ++++++++--------
 .../vector/Double64VectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/Double64VectorTests.java | 404 ++++++++--------
 .../vector/DoubleMaxVectorLoadStoreTests.java |  60 +--
 .../vector/DoubleMaxVectorTests.java          | 404 ++++++++--------
 .../vector/Float128VectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/Float128VectorTests.java | 410 ++++++++--------
 .../vector/Float256VectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/Float256VectorTests.java | 410 ++++++++--------
 .../vector/Float512VectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/Float512VectorTests.java | 410 ++++++++--------
 .../vector/Float64VectorLoadStoreTests.java   |  60 +--
 .../incubator/vector/Float64VectorTests.java  | 410 ++++++++--------
 .../vector/FloatMaxVectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/FloatMaxVectorTests.java | 410 ++++++++--------
 .../vector/Int128VectorLoadStoreTests.java    |  60 +--
 .../incubator/vector/Int128VectorTests.java   | 446 ++++++++---------
 .../vector/Int256VectorLoadStoreTests.java    |  60 +--
 .../incubator/vector/Int256VectorTests.java   | 446 ++++++++---------
 .../vector/Int512VectorLoadStoreTests.java    |  60 +--
 .../incubator/vector/Int512VectorTests.java   | 446 ++++++++---------
 .../vector/Int64VectorLoadStoreTests.java     |  60 +--
 .../incubator/vector/Int64VectorTests.java    | 446 ++++++++---------
 .../vector/IntMaxVectorLoadStoreTests.java    |  60 +--
 .../incubator/vector/IntMaxVectorTests.java   | 446 ++++++++---------
 .../vector/Long128VectorLoadStoreTests.java   |  60 +--
 .../incubator/vector/Long128VectorTests.java  | 422 ++++++++--------
 .../vector/Long256VectorLoadStoreTests.java   |  60 +--
 .../incubator/vector/Long256VectorTests.java  | 422 ++++++++--------
 .../vector/Long512VectorLoadStoreTests.java   |  60 +--
 .../incubator/vector/Long512VectorTests.java  | 422 ++++++++--------
 .../vector/Long64VectorLoadStoreTests.java    |  60 +--
 .../incubator/vector/Long64VectorTests.java   | 422 ++++++++--------
 .../vector/LongMaxVectorLoadStoreTests.java   |  60 +--
 .../incubator/vector/LongMaxVectorTests.java  | 422 ++++++++--------
 .../vector/Short128VectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/Short128VectorTests.java | 446 ++++++++---------
 .../vector/Short256VectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/Short256VectorTests.java | 446 ++++++++---------
 .../vector/Short512VectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/Short512VectorTests.java | 446 ++++++++---------
 .../vector/Short64VectorLoadStoreTests.java   |  60 +--
 .../incubator/vector/Short64VectorTests.java  | 446 ++++++++---------
 .../vector/ShortMaxVectorLoadStoreTests.java  |  60 +--
 .../incubator/vector/ShortMaxVectorTests.java | 446 ++++++++---------
 .../incubator/vector/VectorReshapeTests.java  |   4 +-
 .../Unit-Binary-Broadcast-Long-op.template    |   2 +-
 ...t-Binary-Broadcast-Masked-Long-op.template |   2 +-
 .../Unit-Binary-Broadcast-Masked-op.template  |   2 +-
 .../Unit-Binary-Broadcast-op-math.template    |   2 +-
 .../Unit-Binary-Broadcast-op.template         |   2 +-
 .../templates/Unit-Binary-Masked-op.template  |   2 +-
 .../templates/Unit-Binary-op-math.template    |   2 +-
 .../vector/templates/Unit-Binary-op.template  |   2 +-
 .../vector/templates/Unit-Blend-op.template   |   2 +-
 .../templates/Unit-BoolReduction-op.template  |   2 +-
 .../vector/templates/Unit-Broadcast.template  |   2 +-
 .../templates/Unit-Gather-Masked-op.template  |   2 +-
 .../vector/templates/Unit-Gather-op.template  |   2 +-
 .../vector/templates/Unit-Get-op.template     |   2 +-
 .../vector/templates/Unit-Masked-op.template  |   2 +-
 .../templates/Unit-Miscellaneous.template     |  32 +-
 .../vector/templates/Unit-Rearrange.template  |   4 +-
 .../Unit-Reduction-Masked-Max-op.template     |   2 +-
 .../Unit-Reduction-Masked-Min-op.template     |   2 +-
 .../Unit-Reduction-Masked-op.template         |   2 +-
 .../templates/Unit-Reduction-Max-op.template  |   2 +-
 .../templates/Unit-Reduction-Min-op.template  |   2 +-
 .../templates/Unit-Reduction-op.template      |   2 +-
 .../templates/Unit-Scatter-Masked-op.template |   2 +-
 .../vector/templates/Unit-Scatter-op.template |   2 +-
 .../templates/Unit-Shift-Masked-op.template   |   2 +-
 .../vector/templates/Unit-Shift-op.template   |   2 +-
 .../vector/templates/Unit-Single-op.template  |   2 +-
 .../templates/Unit-Slice-Masked-bop.template  |   2 +-
 .../vector/templates/Unit-Slice-bop.template  |   2 +-
 .../vector/templates/Unit-Slice-op.template   |   2 +-
 .../Unit-Ternary-Broadcast-Masked-op.template |   4 +-
 .../Unit-Ternary-Broadcast-op.template        |   4 +-
 ...ernary-Double-Broadcast-Masked-op.template |   2 +-
 .../Unit-Ternary-Double-Broadcast-op.template |   2 +-
 .../templates/Unit-Ternary-Masked-op.template |   2 +-
 .../vector/templates/Unit-Ternary-op.template |   2 +-
 .../templates/Unit-Unary-Masked-op.template   |   2 +-
 .../templates/Unit-Unary-op-math.template     |   2 +-
 .../vector/templates/Unit-Unary-op.template   |   2 +-
 .../Unit-Unslice-Masked-bop.template          |   2 +-
 .../templates/Unit-Unslice-bop.template       |   2 +-
 .../vector/templates/Unit-Unslice-op.template |   2 +-
 .../vector/templates/Unit-With-Op.template    |   2 +-
 .../vector/templates/Unit-header.template     | 186 ++++----
 .../templates/X-LoadStoreTest.java.template   |  60 +--
 108 files changed, 7178 insertions(+), 7860 deletions(-)

diff --git a/test/jdk/jdk/incubator/vector/AbstractVectorTest.java b/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
index c09ff33758601..cf1c8eff20a1b 100644
--- a/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
+++ b/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -251,7 +251,7 @@ interface FBooleanBinOp {
         boolean apply(boolean a, boolean b);
     }
 
-    static void assertArraysEquals(boolean[] a, boolean[] b, boolean[] r, FBooleanBinOp f) {
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBooleanBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
index 52108fd34cb5c..39a053e657d36 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,36 +57,14 @@ public class Byte128VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (128 / 8));
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -390,7 +368,7 @@ static void loadStoreArray(IntFunction<byte[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -461,7 +439,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteMaskProviderForIOOBE")
@@ -545,7 +523,7 @@ static void loadStoreMask(IntFunction<byte[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -569,7 +547,7 @@ static void loadStoreByteBuffer(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -656,7 +634,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -671,7 +649,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -787,7 +765,7 @@ static void loadStoreByteArray(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -868,7 +846,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -956,7 +934,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -967,7 +945,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
index e2f25b76e0cf2..a7d006daec318 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         byte apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         byte[] apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         byte apply(byte[] a);
     }
 
-    static void assertReductionArraysEquals(byte[] a, byte[] b, byte c,
+    static void assertReductionArraysEquals(byte[] r, byte rc, byte[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         byte apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(byte[] a, byte[] b, byte c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(byte[] r, byte rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(byte[] a);
     }
 
-    static void assertReductionLongArraysEquals(byte[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, byte[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(byte[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(byte[] a, byte[] b, byte element, int index) {
+    static void assertInsertArraysEquals(byte[] r, byte[] a, byte element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[]a, byte[]r) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         byte apply(byte[] a, int b);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FBinArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         byte[] apply(byte[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         byte[] apply(byte[] r, byte[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         byte[] apply(byte[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         byte[] apply(byte[] a, byte[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
     }
 
 
-    static void assertArraysEquals(byte[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -802,7 +802,7 @@ static void assertArraysEquals(byte[] a, int[] r, int offs) {
     }
 
 
-    static void assertArraysEquals(byte[] a, byte[] r, int offs) {
+    static void assertArraysEquals(byte[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -813,7 +813,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -824,7 +824,7 @@ static void assertArraysEquals(byte[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1288,7 +1288,7 @@ static void ADDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::ADD);
+        assertArraysEquals(r, a, b, Byte128VectorTests::ADD);
     }
     static byte add(byte a, byte b) {
         return (byte)(a + b);
@@ -1306,7 +1306,7 @@ static void addByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::add);
+        assertArraysEquals(r, a, b, Byte128VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1326,7 +1326,7 @@ static void ADDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1344,7 +1344,7 @@ static void addByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::add);
     }
     static byte SUB(byte a, byte b) {
         return (byte)(a - b);
@@ -1364,7 +1364,7 @@ static void SUBByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::SUB);
+        assertArraysEquals(r, a, b, Byte128VectorTests::SUB);
     }
     static byte sub(byte a, byte b) {
         return (byte)(a - b);
@@ -1382,7 +1382,7 @@ static void subByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::sub);
+        assertArraysEquals(r, a, b, Byte128VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1402,7 +1402,7 @@ static void SUBByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1420,7 +1420,7 @@ static void subByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::sub);
     }
     static byte MUL(byte a, byte b) {
         return (byte)(a * b);
@@ -1440,7 +1440,7 @@ static void MULByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::MUL);
+        assertArraysEquals(r, a, b, Byte128VectorTests::MUL);
     }
     static byte mul(byte a, byte b) {
         return (byte)(a * b);
@@ -1458,7 +1458,7 @@ static void mulByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::mul);
+        assertArraysEquals(r, a, b, Byte128VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1478,7 +1478,7 @@ static void MULByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1496,7 +1496,7 @@ static void mulByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::mul);
     }
 
 
@@ -1521,7 +1521,7 @@ static void DIVByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::DIV);
+        assertArraysEquals(r, a, b, Byte128VectorTests::DIV);
     }
     static byte div(byte a, byte b) {
         return (byte)(a / b);
@@ -1543,7 +1543,7 @@ static void divByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::div);
+        assertArraysEquals(r, a, b, Byte128VectorTests::div);
     }
 
 
@@ -1567,7 +1567,7 @@ static void DIVByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1589,7 +1589,7 @@ static void divByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1610,7 +1610,7 @@ static void FIRST_NONZEROByte128VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Byte128VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1630,7 +1630,7 @@ static void FIRST_NONZEROByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -1651,7 +1651,7 @@ static void ANDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::AND);
+        assertArraysEquals(r, a, b, Byte128VectorTests::AND);
     }
     static byte and(byte a, byte b) {
         return (byte)(a & b);
@@ -1669,7 +1669,7 @@ static void andByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::and);
+        assertArraysEquals(r, a, b, Byte128VectorTests::and);
     }
 
 
@@ -1691,7 +1691,7 @@ static void ANDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::AND);
     }
 
 
@@ -1713,7 +1713,7 @@ static void AND_NOTByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Byte128VectorTests::AND_NOT);
     }
 
 
@@ -1735,7 +1735,7 @@ static void AND_NOTByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::AND_NOT);
     }
 
 
@@ -1757,7 +1757,7 @@ static void ORByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::OR);
+        assertArraysEquals(r, a, b, Byte128VectorTests::OR);
     }
     static byte or(byte a, byte b) {
         return (byte)(a | b);
@@ -1775,7 +1775,7 @@ static void orByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::or);
+        assertArraysEquals(r, a, b, Byte128VectorTests::or);
     }
 
 
@@ -1797,7 +1797,7 @@ static void ORByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::OR);
     }
 
 
@@ -1819,7 +1819,7 @@ static void XORByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::XOR);
+        assertArraysEquals(r, a, b, Byte128VectorTests::XOR);
     }
 
 
@@ -1841,7 +1841,7 @@ static void XORByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::XOR);
     }
 
 
@@ -1856,7 +1856,7 @@ static void addByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1873,7 +1873,7 @@ static void addByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1887,7 +1887,7 @@ static void subByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1904,7 +1904,7 @@ static void subByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1918,7 +1918,7 @@ static void mulByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1935,7 +1935,7 @@ static void mulByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::mul);
     }
 
 
@@ -1954,7 +1954,7 @@ static void divByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::div);
     }
 
 
@@ -1975,7 +1975,7 @@ static void divByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::div);
     }
 
 
@@ -1991,7 +1991,7 @@ static void ORByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2005,7 +2005,7 @@ static void orByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::or);
     }
 
 
@@ -2024,7 +2024,7 @@ static void ORByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::OR);
     }
 
 
@@ -2040,7 +2040,7 @@ static void ANDByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2054,7 +2054,7 @@ static void andByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::and);
     }
 
 
@@ -2073,7 +2073,7 @@ static void ANDByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::AND);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ORByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Byte128VectorTests::OR);
     }
 
 
@@ -2108,7 +2108,7 @@ static void ORByte128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte128VectorTests::OR);
     }
 
 
@@ -2123,7 +2123,7 @@ static void ADDByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Byte128VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -2140,7 +2140,7 @@ static void ADDByte128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte128VectorTests::ADD);
     }
 
 
@@ -2163,7 +2163,7 @@ static void LSHLByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Byte128VectorTests::LSHL);
     }
 
 
@@ -2185,7 +2185,7 @@ static void LSHLByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::LSHL);
     }
 
 
@@ -2211,7 +2211,7 @@ static void ASHRByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Byte128VectorTests::ASHR);
     }
 
 
@@ -2233,7 +2233,7 @@ static void ASHRByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::ASHR);
     }
 
 
@@ -2259,7 +2259,7 @@ static void LSHRByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Byte128VectorTests::LSHR);
     }
 
 
@@ -2281,7 +2281,7 @@ static void LSHRByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::LSHR);
     }
 
 
@@ -2306,7 +2306,7 @@ static void LSHLByte128VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Byte128VectorTests::LSHL_unary);
     }
 
 
@@ -2327,7 +2327,7 @@ static void LSHLByte128VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::LSHL_unary);
     }
 
 
@@ -2352,7 +2352,7 @@ static void LSHRByte128VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte128VectorTests::LSHR_unary);
     }
 
 
@@ -2373,7 +2373,7 @@ static void LSHRByte128VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::LSHR_unary);
     }
 
 
@@ -2398,7 +2398,7 @@ static void ASHRByte128VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte128VectorTests::ASHR_unary);
     }
 
 
@@ -2419,7 +2419,7 @@ static void ASHRByte128VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::ASHR_unary);
     }
 
 
@@ -2442,7 +2442,7 @@ static void MINByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::MIN);
+        assertArraysEquals(r, a, b, Byte128VectorTests::MIN);
     }
     static byte min(byte a, byte b) {
         return (byte)(Math.min(a, b));
@@ -2460,7 +2460,7 @@ static void minByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::min);
+        assertArraysEquals(r, a, b, Byte128VectorTests::min);
     }
     static byte MAX(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2480,7 +2480,7 @@ static void MAXByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::MAX);
+        assertArraysEquals(r, a, b, Byte128VectorTests::MAX);
     }
     static byte max(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2498,7 +2498,7 @@ static void maxByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::max);
+        assertArraysEquals(r, a, b, Byte128VectorTests::max);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2512,7 +2512,7 @@ static void MINByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2526,7 +2526,7 @@ static void minByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2540,7 +2540,7 @@ static void MAXByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2554,7 +2554,7 @@ static void maxByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::max);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
@@ -2597,7 +2597,7 @@ static void ANDReduceByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte128VectorTests::ANDReduce, Byte128VectorTests::ANDReduceAll);
     }
 
@@ -2645,7 +2645,7 @@ static void ANDReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::ANDReduceMasked, Byte128VectorTests::ANDReduceAllMasked);
     }
 
@@ -2690,7 +2690,7 @@ static void ORReduceByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte128VectorTests::ORReduce, Byte128VectorTests::ORReduceAll);
     }
 
@@ -2738,7 +2738,7 @@ static void ORReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::ORReduceMasked, Byte128VectorTests::ORReduceAllMasked);
     }
 
@@ -2783,7 +2783,7 @@ static void XORReduceByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte128VectorTests::XORReduce, Byte128VectorTests::XORReduceAll);
     }
 
@@ -2831,7 +2831,7 @@ static void XORReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::XORReduceMasked, Byte128VectorTests::XORReduceAllMasked);
     }
 
@@ -2873,7 +2873,7 @@ static void ADDReduceByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte128VectorTests::ADDReduce, Byte128VectorTests::ADDReduceAll);
     }
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -2917,7 +2917,7 @@ static void ADDReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::ADDReduceMasked, Byte128VectorTests::ADDReduceAllMasked);
     }
     static byte MULReduce(byte[] a, int idx) {
@@ -2958,7 +2958,7 @@ static void MULReduceByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte128VectorTests::MULReduce, Byte128VectorTests::MULReduceAll);
     }
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3002,7 +3002,7 @@ static void MULReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::MULReduceMasked, Byte128VectorTests::MULReduceAllMasked);
     }
     static byte MINReduce(byte[] a, int idx) {
@@ -3043,7 +3043,7 @@ static void MINReduceByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte128VectorTests::MINReduce, Byte128VectorTests::MINReduceAll);
     }
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3088,7 +3088,7 @@ static void MINReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::MINReduceMasked, Byte128VectorTests::MINReduceAllMasked);
     }
     static byte MAXReduce(byte[] a, int idx) {
@@ -3129,7 +3129,7 @@ static void MAXReduceByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte128VectorTests::MAXReduce, Byte128VectorTests::MAXReduceAll);
     }
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3174,7 +3174,7 @@ static void MAXReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::MAXReduceMasked, Byte128VectorTests::MAXReduceAllMasked);
     }
 
@@ -3200,7 +3200,7 @@ static void anyTrueByte128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte128VectorTests::anyTrue);
     }
 
 
@@ -3226,7 +3226,7 @@ static void allTrueByte128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte128VectorTests::allTrue);
     }
 
 
@@ -3242,7 +3242,7 @@ static void withByte128VectorTests(IntFunction<byte []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (byte)4, 0);
+        assertInsertArraysEquals(r, a, (byte)4, 0);
     }
     static boolean testIS_DEFAULT(byte a) {
         return bits(a)==0;
@@ -3791,7 +3791,7 @@ static void blendByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
@@ -3808,7 +3808,7 @@ static void RearrangeByte128VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
@@ -3826,7 +3826,7 @@ static void RearrangeByte128VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "byteUnaryOpProvider")
     static void getByte128VectorTests(IntFunction<byte[]> fa) {
@@ -3981,7 +3981,7 @@ static void getByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::get);
+        assertArraysEquals(r, a, Byte128VectorTests::get);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -3995,7 +3995,7 @@ static void BroadcastByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4042,7 +4042,7 @@ static void sliceUnaryByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Byte128VectorTests::sliceUnary);
     }
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4071,7 +4071,7 @@ static void sliceBinaryByte128VectorTestsBinary(IntFunction<byte[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Byte128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Byte128VectorTests::sliceBinary);
     }
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4104,7 +4104,7 @@ static void sliceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<by
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Byte128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Byte128VectorTests::slice);
     }
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4131,7 +4131,7 @@ static void unsliceUnaryByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Byte128VectorTests::unsliceUnary);
     }
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4170,7 +4170,7 @@ static void unsliceBinaryByte128VectorTestsBinary(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Byte128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Byte128VectorTests::unsliceBinary);
     }
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4226,7 +4226,7 @@ static void unsliceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Byte128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Byte128VectorTests::unslice);
     }
 
 
@@ -4275,7 +4275,7 @@ static void BITWISE_BLENDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, Byte128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4291,7 +4291,7 @@ static void bitwiseBlendByte128VectorTests(IntFunction<byte[]> fa, IntFunction<b
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Byte128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
     }
 
 
@@ -4314,7 +4314,7 @@ static void BITWISE_BLENDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4332,7 +4332,7 @@ static void BITWISE_BLENDByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4347,7 +4347,7 @@ static void BITWISE_BLENDByte128VectorTestsAltBroadcastSmokeTest(IntFunction<byt
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4361,7 +4361,7 @@ static void bitwiseBlendByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]>
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4376,7 +4376,7 @@ static void bitwiseBlendByte128VectorTestsAltBroadcastSmokeTest(IntFunction<byte
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
     }
 
 
@@ -4396,7 +4396,7 @@ static void BITWISE_BLENDByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
@@ -4415,7 +4415,7 @@ static void BITWISE_BLENDByte128VectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4433,7 +4433,7 @@ static void BITWISE_BLENDByte128VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte128VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4447,7 +4447,7 @@ static void bitwiseBlendByte128VectorTestsDoubleBroadcastSmokeTest(IntFunction<b
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
     }
 
 
@@ -4466,7 +4466,7 @@ static void BITWISE_BLENDByte128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4490,7 +4490,7 @@ static void NEGByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::NEG);
+        assertArraysEquals(r, a, Byte128VectorTests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4505,7 +4505,7 @@ static void negByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::neg);
+        assertArraysEquals(r, a, Byte128VectorTests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4523,7 +4523,7 @@ static void NEGMaskedByte128VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Byte128VectorTests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -4546,7 +4546,7 @@ static void ABSByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::ABS);
+        assertArraysEquals(r, a, Byte128VectorTests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4561,7 +4561,7 @@ static void absByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::abs);
+        assertArraysEquals(r, a, Byte128VectorTests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4579,7 +4579,7 @@ static void ABSMaskedByte128VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Byte128VectorTests::ABS);
     }
 
 
@@ -4605,7 +4605,7 @@ static void NOTByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::NOT);
+        assertArraysEquals(r, a, Byte128VectorTests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4620,7 +4620,7 @@ static void notByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::not);
+        assertArraysEquals(r, a, Byte128VectorTests::not);
     }
 
 
@@ -4640,7 +4640,7 @@ static void NOTMaskedByte128VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Byte128VectorTests::NOT);
     }
 
 
@@ -4663,7 +4663,7 @@ static void ZOMOByte128VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte128VectorTests::ZOMO);
+        assertArraysEquals(r, a, Byte128VectorTests::ZOMO);
     }
 
 
@@ -4683,7 +4683,7 @@ static void ZOMOMaskedByte128VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Byte128VectorTests::ZOMO);
     }
 
 
@@ -4711,7 +4711,7 @@ static void gatherByte128VectorTests(IntFunction<byte[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::gather);
+        assertArraysEquals(r, a, b, Byte128VectorTests::gather);
     }
     static byte[] gatherMasked(byte a[], int ix, boolean[] mask, int[] b, int iy) {
         byte[] res = new byte[SPECIES.length()];
@@ -4739,7 +4739,7 @@ static void gatherMaskedByte128VectorTests(IntFunction<byte[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::gatherMasked);
     }
 
     static byte[] scatter(byte a[], int ix, int[] b, int iy) {
@@ -4764,7 +4764,7 @@ static void scatterByte128VectorTests(IntFunction<byte[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Byte128VectorTests::scatter);
+        assertArraysEquals(r, a, b, Byte128VectorTests::scatter);
     }
 
     static byte[] scatterMasked(byte r[], byte a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4802,7 +4802,7 @@ static void scatterMaskedByte128VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte128VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Byte128VectorTests::scatterMasked);
     }
 
 
@@ -4844,8 +4844,8 @@ static void toIntArrayByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4855,8 +4855,8 @@ static void toLongArrayByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4866,8 +4866,8 @@ static void toDoubleArrayByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4907,7 +4907,7 @@ static void reinterpretAsBytesByte128VectorTestsSmokeTest(IntFunction<byte[]> fa
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
             av.reinterpretAsBytes().intoArray(r, i);
         }
-        assertArraysEquals(a, r, 0);
+        assertArraysEquals(r, a, 0);
     }
 
     static long ADDReduceLong(byte[] a, int idx) {
@@ -4944,7 +4944,7 @@ static void ADDReduceLongByte128VectorTests(IntFunction<byte[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Byte128VectorTests::ADDReduceLong, Byte128VectorTests::ADDReduceAllLong);
     }
 
@@ -4985,7 +4985,7 @@ static void ADDReduceLongByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Byte128VectorTests::ADDReduceLongMasked, Byte128VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4997,7 +4997,7 @@ static void BroadcastLongByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -5015,7 +5015,7 @@ static void blendByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte128VectorTests::blend);
     }
 
 
@@ -5032,7 +5032,7 @@ static void SelectFromByte128VectorTests(IntFunction<byte[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
@@ -5051,7 +5051,7 @@ static void SelectFromByte128VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5128,7 +5128,7 @@ static void maskEqByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Byte128VectorTests::beq);
+        assertArraysEquals(r, a, b, Byte128VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
index 84d7dc6f853a4..c7acbc97f0b94 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,36 +57,14 @@ public class Byte256VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (256 / 8));
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -390,7 +368,7 @@ static void loadStoreArray(IntFunction<byte[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -461,7 +439,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteMaskProviderForIOOBE")
@@ -545,7 +523,7 @@ static void loadStoreMask(IntFunction<byte[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -569,7 +547,7 @@ static void loadStoreByteBuffer(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -656,7 +634,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -671,7 +649,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -787,7 +765,7 @@ static void loadStoreByteArray(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -868,7 +846,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -956,7 +934,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -967,7 +945,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
index 0d7dabb6517d6..7b68b9a4fefdf 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         byte apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         byte[] apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         byte apply(byte[] a);
     }
 
-    static void assertReductionArraysEquals(byte[] a, byte[] b, byte c,
+    static void assertReductionArraysEquals(byte[] r, byte rc, byte[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         byte apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(byte[] a, byte[] b, byte c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(byte[] r, byte rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(byte[] a);
     }
 
-    static void assertReductionLongArraysEquals(byte[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, byte[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(byte[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(byte[] a, byte[] b, byte element, int index) {
+    static void assertInsertArraysEquals(byte[] r, byte[] a, byte element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[]a, byte[]r) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         byte apply(byte[] a, int b);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FBinArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         byte[] apply(byte[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         byte[] apply(byte[] r, byte[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         byte[] apply(byte[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         byte[] apply(byte[] a, byte[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
     }
 
 
-    static void assertArraysEquals(byte[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -802,7 +802,7 @@ static void assertArraysEquals(byte[] a, int[] r, int offs) {
     }
 
 
-    static void assertArraysEquals(byte[] a, byte[] r, int offs) {
+    static void assertArraysEquals(byte[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -813,7 +813,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -824,7 +824,7 @@ static void assertArraysEquals(byte[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1288,7 +1288,7 @@ static void ADDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::ADD);
+        assertArraysEquals(r, a, b, Byte256VectorTests::ADD);
     }
     static byte add(byte a, byte b) {
         return (byte)(a + b);
@@ -1306,7 +1306,7 @@ static void addByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::add);
+        assertArraysEquals(r, a, b, Byte256VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1326,7 +1326,7 @@ static void ADDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1344,7 +1344,7 @@ static void addByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::add);
     }
     static byte SUB(byte a, byte b) {
         return (byte)(a - b);
@@ -1364,7 +1364,7 @@ static void SUBByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::SUB);
+        assertArraysEquals(r, a, b, Byte256VectorTests::SUB);
     }
     static byte sub(byte a, byte b) {
         return (byte)(a - b);
@@ -1382,7 +1382,7 @@ static void subByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::sub);
+        assertArraysEquals(r, a, b, Byte256VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1402,7 +1402,7 @@ static void SUBByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1420,7 +1420,7 @@ static void subByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::sub);
     }
     static byte MUL(byte a, byte b) {
         return (byte)(a * b);
@@ -1440,7 +1440,7 @@ static void MULByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::MUL);
+        assertArraysEquals(r, a, b, Byte256VectorTests::MUL);
     }
     static byte mul(byte a, byte b) {
         return (byte)(a * b);
@@ -1458,7 +1458,7 @@ static void mulByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::mul);
+        assertArraysEquals(r, a, b, Byte256VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1478,7 +1478,7 @@ static void MULByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1496,7 +1496,7 @@ static void mulByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::mul);
     }
 
 
@@ -1521,7 +1521,7 @@ static void DIVByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::DIV);
+        assertArraysEquals(r, a, b, Byte256VectorTests::DIV);
     }
     static byte div(byte a, byte b) {
         return (byte)(a / b);
@@ -1543,7 +1543,7 @@ static void divByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::div);
+        assertArraysEquals(r, a, b, Byte256VectorTests::div);
     }
 
 
@@ -1567,7 +1567,7 @@ static void DIVByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1589,7 +1589,7 @@ static void divByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1610,7 +1610,7 @@ static void FIRST_NONZEROByte256VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Byte256VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1630,7 +1630,7 @@ static void FIRST_NONZEROByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -1651,7 +1651,7 @@ static void ANDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::AND);
+        assertArraysEquals(r, a, b, Byte256VectorTests::AND);
     }
     static byte and(byte a, byte b) {
         return (byte)(a & b);
@@ -1669,7 +1669,7 @@ static void andByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::and);
+        assertArraysEquals(r, a, b, Byte256VectorTests::and);
     }
 
 
@@ -1691,7 +1691,7 @@ static void ANDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::AND);
     }
 
 
@@ -1713,7 +1713,7 @@ static void AND_NOTByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Byte256VectorTests::AND_NOT);
     }
 
 
@@ -1735,7 +1735,7 @@ static void AND_NOTByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::AND_NOT);
     }
 
 
@@ -1757,7 +1757,7 @@ static void ORByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::OR);
+        assertArraysEquals(r, a, b, Byte256VectorTests::OR);
     }
     static byte or(byte a, byte b) {
         return (byte)(a | b);
@@ -1775,7 +1775,7 @@ static void orByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::or);
+        assertArraysEquals(r, a, b, Byte256VectorTests::or);
     }
 
 
@@ -1797,7 +1797,7 @@ static void ORByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::OR);
     }
 
 
@@ -1819,7 +1819,7 @@ static void XORByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::XOR);
+        assertArraysEquals(r, a, b, Byte256VectorTests::XOR);
     }
 
 
@@ -1841,7 +1841,7 @@ static void XORByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::XOR);
     }
 
 
@@ -1856,7 +1856,7 @@ static void addByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1873,7 +1873,7 @@ static void addByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1887,7 +1887,7 @@ static void subByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1904,7 +1904,7 @@ static void subByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1918,7 +1918,7 @@ static void mulByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1935,7 +1935,7 @@ static void mulByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::mul);
     }
 
 
@@ -1954,7 +1954,7 @@ static void divByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::div);
     }
 
 
@@ -1975,7 +1975,7 @@ static void divByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::div);
     }
 
 
@@ -1991,7 +1991,7 @@ static void ORByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2005,7 +2005,7 @@ static void orByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::or);
     }
 
 
@@ -2024,7 +2024,7 @@ static void ORByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::OR);
     }
 
 
@@ -2040,7 +2040,7 @@ static void ANDByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2054,7 +2054,7 @@ static void andByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::and);
     }
 
 
@@ -2073,7 +2073,7 @@ static void ANDByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::AND);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ORByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Byte256VectorTests::OR);
     }
 
 
@@ -2108,7 +2108,7 @@ static void ORByte256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte256VectorTests::OR);
     }
 
 
@@ -2123,7 +2123,7 @@ static void ADDByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Byte256VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -2140,7 +2140,7 @@ static void ADDByte256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte256VectorTests::ADD);
     }
 
 
@@ -2163,7 +2163,7 @@ static void LSHLByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Byte256VectorTests::LSHL);
     }
 
 
@@ -2185,7 +2185,7 @@ static void LSHLByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::LSHL);
     }
 
 
@@ -2211,7 +2211,7 @@ static void ASHRByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Byte256VectorTests::ASHR);
     }
 
 
@@ -2233,7 +2233,7 @@ static void ASHRByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::ASHR);
     }
 
 
@@ -2259,7 +2259,7 @@ static void LSHRByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Byte256VectorTests::LSHR);
     }
 
 
@@ -2281,7 +2281,7 @@ static void LSHRByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::LSHR);
     }
 
 
@@ -2306,7 +2306,7 @@ static void LSHLByte256VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Byte256VectorTests::LSHL_unary);
     }
 
 
@@ -2327,7 +2327,7 @@ static void LSHLByte256VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::LSHL_unary);
     }
 
 
@@ -2352,7 +2352,7 @@ static void LSHRByte256VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte256VectorTests::LSHR_unary);
     }
 
 
@@ -2373,7 +2373,7 @@ static void LSHRByte256VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::LSHR_unary);
     }
 
 
@@ -2398,7 +2398,7 @@ static void ASHRByte256VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte256VectorTests::ASHR_unary);
     }
 
 
@@ -2419,7 +2419,7 @@ static void ASHRByte256VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::ASHR_unary);
     }
 
 
@@ -2442,7 +2442,7 @@ static void MINByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::MIN);
+        assertArraysEquals(r, a, b, Byte256VectorTests::MIN);
     }
     static byte min(byte a, byte b) {
         return (byte)(Math.min(a, b));
@@ -2460,7 +2460,7 @@ static void minByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::min);
+        assertArraysEquals(r, a, b, Byte256VectorTests::min);
     }
     static byte MAX(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2480,7 +2480,7 @@ static void MAXByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::MAX);
+        assertArraysEquals(r, a, b, Byte256VectorTests::MAX);
     }
     static byte max(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2498,7 +2498,7 @@ static void maxByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::max);
+        assertArraysEquals(r, a, b, Byte256VectorTests::max);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2512,7 +2512,7 @@ static void MINByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2526,7 +2526,7 @@ static void minByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2540,7 +2540,7 @@ static void MAXByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2554,7 +2554,7 @@ static void maxByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::max);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
@@ -2597,7 +2597,7 @@ static void ANDReduceByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte256VectorTests::ANDReduce, Byte256VectorTests::ANDReduceAll);
     }
 
@@ -2645,7 +2645,7 @@ static void ANDReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::ANDReduceMasked, Byte256VectorTests::ANDReduceAllMasked);
     }
 
@@ -2690,7 +2690,7 @@ static void ORReduceByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte256VectorTests::ORReduce, Byte256VectorTests::ORReduceAll);
     }
 
@@ -2738,7 +2738,7 @@ static void ORReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::ORReduceMasked, Byte256VectorTests::ORReduceAllMasked);
     }
 
@@ -2783,7 +2783,7 @@ static void XORReduceByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte256VectorTests::XORReduce, Byte256VectorTests::XORReduceAll);
     }
 
@@ -2831,7 +2831,7 @@ static void XORReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::XORReduceMasked, Byte256VectorTests::XORReduceAllMasked);
     }
 
@@ -2873,7 +2873,7 @@ static void ADDReduceByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte256VectorTests::ADDReduce, Byte256VectorTests::ADDReduceAll);
     }
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -2917,7 +2917,7 @@ static void ADDReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::ADDReduceMasked, Byte256VectorTests::ADDReduceAllMasked);
     }
     static byte MULReduce(byte[] a, int idx) {
@@ -2958,7 +2958,7 @@ static void MULReduceByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte256VectorTests::MULReduce, Byte256VectorTests::MULReduceAll);
     }
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3002,7 +3002,7 @@ static void MULReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::MULReduceMasked, Byte256VectorTests::MULReduceAllMasked);
     }
     static byte MINReduce(byte[] a, int idx) {
@@ -3043,7 +3043,7 @@ static void MINReduceByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte256VectorTests::MINReduce, Byte256VectorTests::MINReduceAll);
     }
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3088,7 +3088,7 @@ static void MINReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::MINReduceMasked, Byte256VectorTests::MINReduceAllMasked);
     }
     static byte MAXReduce(byte[] a, int idx) {
@@ -3129,7 +3129,7 @@ static void MAXReduceByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte256VectorTests::MAXReduce, Byte256VectorTests::MAXReduceAll);
     }
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3174,7 +3174,7 @@ static void MAXReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::MAXReduceMasked, Byte256VectorTests::MAXReduceAllMasked);
     }
 
@@ -3200,7 +3200,7 @@ static void anyTrueByte256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte256VectorTests::anyTrue);
     }
 
 
@@ -3226,7 +3226,7 @@ static void allTrueByte256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte256VectorTests::allTrue);
     }
 
 
@@ -3242,7 +3242,7 @@ static void withByte256VectorTests(IntFunction<byte []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (byte)4, 0);
+        assertInsertArraysEquals(r, a, (byte)4, 0);
     }
     static boolean testIS_DEFAULT(byte a) {
         return bits(a)==0;
@@ -3791,7 +3791,7 @@ static void blendByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
@@ -3808,7 +3808,7 @@ static void RearrangeByte256VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
@@ -3826,7 +3826,7 @@ static void RearrangeByte256VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "byteUnaryOpProvider")
     static void getByte256VectorTests(IntFunction<byte[]> fa) {
@@ -3981,7 +3981,7 @@ static void getByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::get);
+        assertArraysEquals(r, a, Byte256VectorTests::get);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -3995,7 +3995,7 @@ static void BroadcastByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4042,7 +4042,7 @@ static void sliceUnaryByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Byte256VectorTests::sliceUnary);
     }
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4071,7 +4071,7 @@ static void sliceBinaryByte256VectorTestsBinary(IntFunction<byte[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Byte256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Byte256VectorTests::sliceBinary);
     }
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4104,7 +4104,7 @@ static void sliceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<by
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Byte256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Byte256VectorTests::slice);
     }
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4131,7 +4131,7 @@ static void unsliceUnaryByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Byte256VectorTests::unsliceUnary);
     }
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4170,7 +4170,7 @@ static void unsliceBinaryByte256VectorTestsBinary(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Byte256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Byte256VectorTests::unsliceBinary);
     }
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4226,7 +4226,7 @@ static void unsliceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Byte256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Byte256VectorTests::unslice);
     }
 
 
@@ -4275,7 +4275,7 @@ static void BITWISE_BLENDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, Byte256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4291,7 +4291,7 @@ static void bitwiseBlendByte256VectorTests(IntFunction<byte[]> fa, IntFunction<b
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Byte256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
     }
 
 
@@ -4314,7 +4314,7 @@ static void BITWISE_BLENDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4332,7 +4332,7 @@ static void BITWISE_BLENDByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4347,7 +4347,7 @@ static void BITWISE_BLENDByte256VectorTestsAltBroadcastSmokeTest(IntFunction<byt
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4361,7 +4361,7 @@ static void bitwiseBlendByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]>
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4376,7 +4376,7 @@ static void bitwiseBlendByte256VectorTestsAltBroadcastSmokeTest(IntFunction<byte
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
     }
 
 
@@ -4396,7 +4396,7 @@ static void BITWISE_BLENDByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
@@ -4415,7 +4415,7 @@ static void BITWISE_BLENDByte256VectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4433,7 +4433,7 @@ static void BITWISE_BLENDByte256VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte256VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4447,7 +4447,7 @@ static void bitwiseBlendByte256VectorTestsDoubleBroadcastSmokeTest(IntFunction<b
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
     }
 
 
@@ -4466,7 +4466,7 @@ static void BITWISE_BLENDByte256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4490,7 +4490,7 @@ static void NEGByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::NEG);
+        assertArraysEquals(r, a, Byte256VectorTests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4505,7 +4505,7 @@ static void negByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::neg);
+        assertArraysEquals(r, a, Byte256VectorTests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4523,7 +4523,7 @@ static void NEGMaskedByte256VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Byte256VectorTests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -4546,7 +4546,7 @@ static void ABSByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::ABS);
+        assertArraysEquals(r, a, Byte256VectorTests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4561,7 +4561,7 @@ static void absByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::abs);
+        assertArraysEquals(r, a, Byte256VectorTests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4579,7 +4579,7 @@ static void ABSMaskedByte256VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Byte256VectorTests::ABS);
     }
 
 
@@ -4605,7 +4605,7 @@ static void NOTByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::NOT);
+        assertArraysEquals(r, a, Byte256VectorTests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4620,7 +4620,7 @@ static void notByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::not);
+        assertArraysEquals(r, a, Byte256VectorTests::not);
     }
 
 
@@ -4640,7 +4640,7 @@ static void NOTMaskedByte256VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Byte256VectorTests::NOT);
     }
 
 
@@ -4663,7 +4663,7 @@ static void ZOMOByte256VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte256VectorTests::ZOMO);
+        assertArraysEquals(r, a, Byte256VectorTests::ZOMO);
     }
 
 
@@ -4683,7 +4683,7 @@ static void ZOMOMaskedByte256VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Byte256VectorTests::ZOMO);
     }
 
 
@@ -4711,7 +4711,7 @@ static void gatherByte256VectorTests(IntFunction<byte[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::gather);
+        assertArraysEquals(r, a, b, Byte256VectorTests::gather);
     }
     static byte[] gatherMasked(byte a[], int ix, boolean[] mask, int[] b, int iy) {
         byte[] res = new byte[SPECIES.length()];
@@ -4739,7 +4739,7 @@ static void gatherMaskedByte256VectorTests(IntFunction<byte[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::gatherMasked);
     }
 
     static byte[] scatter(byte a[], int ix, int[] b, int iy) {
@@ -4764,7 +4764,7 @@ static void scatterByte256VectorTests(IntFunction<byte[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Byte256VectorTests::scatter);
+        assertArraysEquals(r, a, b, Byte256VectorTests::scatter);
     }
 
     static byte[] scatterMasked(byte r[], byte a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4802,7 +4802,7 @@ static void scatterMaskedByte256VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte256VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Byte256VectorTests::scatterMasked);
     }
 
 
@@ -4844,8 +4844,8 @@ static void toIntArrayByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4855,8 +4855,8 @@ static void toLongArrayByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4866,8 +4866,8 @@ static void toDoubleArrayByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4907,7 +4907,7 @@ static void reinterpretAsBytesByte256VectorTestsSmokeTest(IntFunction<byte[]> fa
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
             av.reinterpretAsBytes().intoArray(r, i);
         }
-        assertArraysEquals(a, r, 0);
+        assertArraysEquals(r, a, 0);
     }
 
     static long ADDReduceLong(byte[] a, int idx) {
@@ -4944,7 +4944,7 @@ static void ADDReduceLongByte256VectorTests(IntFunction<byte[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Byte256VectorTests::ADDReduceLong, Byte256VectorTests::ADDReduceAllLong);
     }
 
@@ -4985,7 +4985,7 @@ static void ADDReduceLongByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Byte256VectorTests::ADDReduceLongMasked, Byte256VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4997,7 +4997,7 @@ static void BroadcastLongByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -5015,7 +5015,7 @@ static void blendByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte256VectorTests::blend);
     }
 
 
@@ -5032,7 +5032,7 @@ static void SelectFromByte256VectorTests(IntFunction<byte[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
@@ -5051,7 +5051,7 @@ static void SelectFromByte256VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5128,7 +5128,7 @@ static void maskEqByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Byte256VectorTests::beq);
+        assertArraysEquals(r, a, b, Byte256VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
index fc73193c180d5..7068d8c7d8380 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,36 +57,14 @@ public class Byte512VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (512 / 8));
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -390,7 +368,7 @@ static void loadStoreArray(IntFunction<byte[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -461,7 +439,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteMaskProviderForIOOBE")
@@ -545,7 +523,7 @@ static void loadStoreMask(IntFunction<byte[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -569,7 +547,7 @@ static void loadStoreByteBuffer(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -656,7 +634,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -671,7 +649,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -787,7 +765,7 @@ static void loadStoreByteArray(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -868,7 +846,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -956,7 +934,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -967,7 +945,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
index c0177d1164471..61e4aa5008ddd 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         byte apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         byte[] apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         byte apply(byte[] a);
     }
 
-    static void assertReductionArraysEquals(byte[] a, byte[] b, byte c,
+    static void assertReductionArraysEquals(byte[] r, byte rc, byte[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         byte apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(byte[] a, byte[] b, byte c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(byte[] r, byte rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(byte[] a);
     }
 
-    static void assertReductionLongArraysEquals(byte[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, byte[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(byte[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(byte[] a, byte[] b, byte element, int index) {
+    static void assertInsertArraysEquals(byte[] r, byte[] a, byte element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[]a, byte[]r) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         byte apply(byte[] a, int b);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FBinArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         byte[] apply(byte[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         byte[] apply(byte[] r, byte[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         byte[] apply(byte[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         byte[] apply(byte[] a, byte[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
     }
 
 
-    static void assertArraysEquals(byte[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -802,7 +802,7 @@ static void assertArraysEquals(byte[] a, int[] r, int offs) {
     }
 
 
-    static void assertArraysEquals(byte[] a, byte[] r, int offs) {
+    static void assertArraysEquals(byte[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -813,7 +813,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -824,7 +824,7 @@ static void assertArraysEquals(byte[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1288,7 +1288,7 @@ static void ADDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::ADD);
+        assertArraysEquals(r, a, b, Byte512VectorTests::ADD);
     }
     static byte add(byte a, byte b) {
         return (byte)(a + b);
@@ -1306,7 +1306,7 @@ static void addByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::add);
+        assertArraysEquals(r, a, b, Byte512VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1326,7 +1326,7 @@ static void ADDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1344,7 +1344,7 @@ static void addByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::add);
     }
     static byte SUB(byte a, byte b) {
         return (byte)(a - b);
@@ -1364,7 +1364,7 @@ static void SUBByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::SUB);
+        assertArraysEquals(r, a, b, Byte512VectorTests::SUB);
     }
     static byte sub(byte a, byte b) {
         return (byte)(a - b);
@@ -1382,7 +1382,7 @@ static void subByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::sub);
+        assertArraysEquals(r, a, b, Byte512VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1402,7 +1402,7 @@ static void SUBByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1420,7 +1420,7 @@ static void subByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::sub);
     }
     static byte MUL(byte a, byte b) {
         return (byte)(a * b);
@@ -1440,7 +1440,7 @@ static void MULByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::MUL);
+        assertArraysEquals(r, a, b, Byte512VectorTests::MUL);
     }
     static byte mul(byte a, byte b) {
         return (byte)(a * b);
@@ -1458,7 +1458,7 @@ static void mulByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::mul);
+        assertArraysEquals(r, a, b, Byte512VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1478,7 +1478,7 @@ static void MULByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1496,7 +1496,7 @@ static void mulByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::mul);
     }
 
 
@@ -1521,7 +1521,7 @@ static void DIVByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::DIV);
+        assertArraysEquals(r, a, b, Byte512VectorTests::DIV);
     }
     static byte div(byte a, byte b) {
         return (byte)(a / b);
@@ -1543,7 +1543,7 @@ static void divByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::div);
+        assertArraysEquals(r, a, b, Byte512VectorTests::div);
     }
 
 
@@ -1567,7 +1567,7 @@ static void DIVByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1589,7 +1589,7 @@ static void divByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1610,7 +1610,7 @@ static void FIRST_NONZEROByte512VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Byte512VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1630,7 +1630,7 @@ static void FIRST_NONZEROByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -1651,7 +1651,7 @@ static void ANDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::AND);
+        assertArraysEquals(r, a, b, Byte512VectorTests::AND);
     }
     static byte and(byte a, byte b) {
         return (byte)(a & b);
@@ -1669,7 +1669,7 @@ static void andByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::and);
+        assertArraysEquals(r, a, b, Byte512VectorTests::and);
     }
 
 
@@ -1691,7 +1691,7 @@ static void ANDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::AND);
     }
 
 
@@ -1713,7 +1713,7 @@ static void AND_NOTByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Byte512VectorTests::AND_NOT);
     }
 
 
@@ -1735,7 +1735,7 @@ static void AND_NOTByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::AND_NOT);
     }
 
 
@@ -1757,7 +1757,7 @@ static void ORByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::OR);
+        assertArraysEquals(r, a, b, Byte512VectorTests::OR);
     }
     static byte or(byte a, byte b) {
         return (byte)(a | b);
@@ -1775,7 +1775,7 @@ static void orByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::or);
+        assertArraysEquals(r, a, b, Byte512VectorTests::or);
     }
 
 
@@ -1797,7 +1797,7 @@ static void ORByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::OR);
     }
 
 
@@ -1819,7 +1819,7 @@ static void XORByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::XOR);
+        assertArraysEquals(r, a, b, Byte512VectorTests::XOR);
     }
 
 
@@ -1841,7 +1841,7 @@ static void XORByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::XOR);
     }
 
 
@@ -1856,7 +1856,7 @@ static void addByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1873,7 +1873,7 @@ static void addByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1887,7 +1887,7 @@ static void subByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1904,7 +1904,7 @@ static void subByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1918,7 +1918,7 @@ static void mulByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1935,7 +1935,7 @@ static void mulByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::mul);
     }
 
 
@@ -1954,7 +1954,7 @@ static void divByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::div);
     }
 
 
@@ -1975,7 +1975,7 @@ static void divByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::div);
     }
 
 
@@ -1991,7 +1991,7 @@ static void ORByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2005,7 +2005,7 @@ static void orByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::or);
     }
 
 
@@ -2024,7 +2024,7 @@ static void ORByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::OR);
     }
 
 
@@ -2040,7 +2040,7 @@ static void ANDByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2054,7 +2054,7 @@ static void andByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::and);
     }
 
 
@@ -2073,7 +2073,7 @@ static void ANDByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::AND);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ORByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Byte512VectorTests::OR);
     }
 
 
@@ -2108,7 +2108,7 @@ static void ORByte512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte512VectorTests::OR);
     }
 
 
@@ -2123,7 +2123,7 @@ static void ADDByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Byte512VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -2140,7 +2140,7 @@ static void ADDByte512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte512VectorTests::ADD);
     }
 
 
@@ -2163,7 +2163,7 @@ static void LSHLByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Byte512VectorTests::LSHL);
     }
 
 
@@ -2185,7 +2185,7 @@ static void LSHLByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::LSHL);
     }
 
 
@@ -2211,7 +2211,7 @@ static void ASHRByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Byte512VectorTests::ASHR);
     }
 
 
@@ -2233,7 +2233,7 @@ static void ASHRByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::ASHR);
     }
 
 
@@ -2259,7 +2259,7 @@ static void LSHRByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Byte512VectorTests::LSHR);
     }
 
 
@@ -2281,7 +2281,7 @@ static void LSHRByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::LSHR);
     }
 
 
@@ -2306,7 +2306,7 @@ static void LSHLByte512VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Byte512VectorTests::LSHL_unary);
     }
 
 
@@ -2327,7 +2327,7 @@ static void LSHLByte512VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::LSHL_unary);
     }
 
 
@@ -2352,7 +2352,7 @@ static void LSHRByte512VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte512VectorTests::LSHR_unary);
     }
 
 
@@ -2373,7 +2373,7 @@ static void LSHRByte512VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::LSHR_unary);
     }
 
 
@@ -2398,7 +2398,7 @@ static void ASHRByte512VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte512VectorTests::ASHR_unary);
     }
 
 
@@ -2419,7 +2419,7 @@ static void ASHRByte512VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::ASHR_unary);
     }
 
 
@@ -2442,7 +2442,7 @@ static void MINByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::MIN);
+        assertArraysEquals(r, a, b, Byte512VectorTests::MIN);
     }
     static byte min(byte a, byte b) {
         return (byte)(Math.min(a, b));
@@ -2460,7 +2460,7 @@ static void minByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::min);
+        assertArraysEquals(r, a, b, Byte512VectorTests::min);
     }
     static byte MAX(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2480,7 +2480,7 @@ static void MAXByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::MAX);
+        assertArraysEquals(r, a, b, Byte512VectorTests::MAX);
     }
     static byte max(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2498,7 +2498,7 @@ static void maxByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::max);
+        assertArraysEquals(r, a, b, Byte512VectorTests::max);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2512,7 +2512,7 @@ static void MINByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2526,7 +2526,7 @@ static void minByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2540,7 +2540,7 @@ static void MAXByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2554,7 +2554,7 @@ static void maxByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::max);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
@@ -2597,7 +2597,7 @@ static void ANDReduceByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte512VectorTests::ANDReduce, Byte512VectorTests::ANDReduceAll);
     }
 
@@ -2645,7 +2645,7 @@ static void ANDReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::ANDReduceMasked, Byte512VectorTests::ANDReduceAllMasked);
     }
 
@@ -2690,7 +2690,7 @@ static void ORReduceByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte512VectorTests::ORReduce, Byte512VectorTests::ORReduceAll);
     }
 
@@ -2738,7 +2738,7 @@ static void ORReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::ORReduceMasked, Byte512VectorTests::ORReduceAllMasked);
     }
 
@@ -2783,7 +2783,7 @@ static void XORReduceByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte512VectorTests::XORReduce, Byte512VectorTests::XORReduceAll);
     }
 
@@ -2831,7 +2831,7 @@ static void XORReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::XORReduceMasked, Byte512VectorTests::XORReduceAllMasked);
     }
 
@@ -2873,7 +2873,7 @@ static void ADDReduceByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte512VectorTests::ADDReduce, Byte512VectorTests::ADDReduceAll);
     }
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -2917,7 +2917,7 @@ static void ADDReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::ADDReduceMasked, Byte512VectorTests::ADDReduceAllMasked);
     }
     static byte MULReduce(byte[] a, int idx) {
@@ -2958,7 +2958,7 @@ static void MULReduceByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte512VectorTests::MULReduce, Byte512VectorTests::MULReduceAll);
     }
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3002,7 +3002,7 @@ static void MULReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::MULReduceMasked, Byte512VectorTests::MULReduceAllMasked);
     }
     static byte MINReduce(byte[] a, int idx) {
@@ -3043,7 +3043,7 @@ static void MINReduceByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte512VectorTests::MINReduce, Byte512VectorTests::MINReduceAll);
     }
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3088,7 +3088,7 @@ static void MINReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::MINReduceMasked, Byte512VectorTests::MINReduceAllMasked);
     }
     static byte MAXReduce(byte[] a, int idx) {
@@ -3129,7 +3129,7 @@ static void MAXReduceByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte512VectorTests::MAXReduce, Byte512VectorTests::MAXReduceAll);
     }
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3174,7 +3174,7 @@ static void MAXReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::MAXReduceMasked, Byte512VectorTests::MAXReduceAllMasked);
     }
 
@@ -3200,7 +3200,7 @@ static void anyTrueByte512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte512VectorTests::anyTrue);
     }
 
 
@@ -3226,7 +3226,7 @@ static void allTrueByte512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte512VectorTests::allTrue);
     }
 
 
@@ -3242,7 +3242,7 @@ static void withByte512VectorTests(IntFunction<byte []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (byte)4, 0);
+        assertInsertArraysEquals(r, a, (byte)4, 0);
     }
     static boolean testIS_DEFAULT(byte a) {
         return bits(a)==0;
@@ -3791,7 +3791,7 @@ static void blendByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
@@ -3808,7 +3808,7 @@ static void RearrangeByte512VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
@@ -3826,7 +3826,7 @@ static void RearrangeByte512VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "byteUnaryOpProvider")
     static void getByte512VectorTests(IntFunction<byte[]> fa) {
@@ -3981,7 +3981,7 @@ static void getByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::get);
+        assertArraysEquals(r, a, Byte512VectorTests::get);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -3995,7 +3995,7 @@ static void BroadcastByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4042,7 +4042,7 @@ static void sliceUnaryByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Byte512VectorTests::sliceUnary);
     }
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4071,7 +4071,7 @@ static void sliceBinaryByte512VectorTestsBinary(IntFunction<byte[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Byte512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Byte512VectorTests::sliceBinary);
     }
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4104,7 +4104,7 @@ static void sliceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<by
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Byte512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Byte512VectorTests::slice);
     }
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4131,7 +4131,7 @@ static void unsliceUnaryByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Byte512VectorTests::unsliceUnary);
     }
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4170,7 +4170,7 @@ static void unsliceBinaryByte512VectorTestsBinary(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Byte512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Byte512VectorTests::unsliceBinary);
     }
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4226,7 +4226,7 @@ static void unsliceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Byte512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Byte512VectorTests::unslice);
     }
 
 
@@ -4275,7 +4275,7 @@ static void BITWISE_BLENDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, Byte512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4291,7 +4291,7 @@ static void bitwiseBlendByte512VectorTests(IntFunction<byte[]> fa, IntFunction<b
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Byte512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
     }
 
 
@@ -4314,7 +4314,7 @@ static void BITWISE_BLENDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4332,7 +4332,7 @@ static void BITWISE_BLENDByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4347,7 +4347,7 @@ static void BITWISE_BLENDByte512VectorTestsAltBroadcastSmokeTest(IntFunction<byt
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4361,7 +4361,7 @@ static void bitwiseBlendByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]>
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4376,7 +4376,7 @@ static void bitwiseBlendByte512VectorTestsAltBroadcastSmokeTest(IntFunction<byte
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
     }
 
 
@@ -4396,7 +4396,7 @@ static void BITWISE_BLENDByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
@@ -4415,7 +4415,7 @@ static void BITWISE_BLENDByte512VectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4433,7 +4433,7 @@ static void BITWISE_BLENDByte512VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte512VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4447,7 +4447,7 @@ static void bitwiseBlendByte512VectorTestsDoubleBroadcastSmokeTest(IntFunction<b
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
     }
 
 
@@ -4466,7 +4466,7 @@ static void BITWISE_BLENDByte512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4490,7 +4490,7 @@ static void NEGByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::NEG);
+        assertArraysEquals(r, a, Byte512VectorTests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4505,7 +4505,7 @@ static void negByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::neg);
+        assertArraysEquals(r, a, Byte512VectorTests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4523,7 +4523,7 @@ static void NEGMaskedByte512VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Byte512VectorTests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -4546,7 +4546,7 @@ static void ABSByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::ABS);
+        assertArraysEquals(r, a, Byte512VectorTests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4561,7 +4561,7 @@ static void absByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::abs);
+        assertArraysEquals(r, a, Byte512VectorTests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4579,7 +4579,7 @@ static void ABSMaskedByte512VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Byte512VectorTests::ABS);
     }
 
 
@@ -4605,7 +4605,7 @@ static void NOTByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::NOT);
+        assertArraysEquals(r, a, Byte512VectorTests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4620,7 +4620,7 @@ static void notByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::not);
+        assertArraysEquals(r, a, Byte512VectorTests::not);
     }
 
 
@@ -4640,7 +4640,7 @@ static void NOTMaskedByte512VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Byte512VectorTests::NOT);
     }
 
 
@@ -4663,7 +4663,7 @@ static void ZOMOByte512VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte512VectorTests::ZOMO);
+        assertArraysEquals(r, a, Byte512VectorTests::ZOMO);
     }
 
 
@@ -4683,7 +4683,7 @@ static void ZOMOMaskedByte512VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Byte512VectorTests::ZOMO);
     }
 
 
@@ -4711,7 +4711,7 @@ static void gatherByte512VectorTests(IntFunction<byte[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::gather);
+        assertArraysEquals(r, a, b, Byte512VectorTests::gather);
     }
     static byte[] gatherMasked(byte a[], int ix, boolean[] mask, int[] b, int iy) {
         byte[] res = new byte[SPECIES.length()];
@@ -4739,7 +4739,7 @@ static void gatherMaskedByte512VectorTests(IntFunction<byte[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::gatherMasked);
     }
 
     static byte[] scatter(byte a[], int ix, int[] b, int iy) {
@@ -4764,7 +4764,7 @@ static void scatterByte512VectorTests(IntFunction<byte[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Byte512VectorTests::scatter);
+        assertArraysEquals(r, a, b, Byte512VectorTests::scatter);
     }
 
     static byte[] scatterMasked(byte r[], byte a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4802,7 +4802,7 @@ static void scatterMaskedByte512VectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte512VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Byte512VectorTests::scatterMasked);
     }
 
 
@@ -4844,8 +4844,8 @@ static void toIntArrayByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4855,8 +4855,8 @@ static void toLongArrayByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4866,8 +4866,8 @@ static void toDoubleArrayByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4907,7 +4907,7 @@ static void reinterpretAsBytesByte512VectorTestsSmokeTest(IntFunction<byte[]> fa
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
             av.reinterpretAsBytes().intoArray(r, i);
         }
-        assertArraysEquals(a, r, 0);
+        assertArraysEquals(r, a, 0);
     }
 
     static long ADDReduceLong(byte[] a, int idx) {
@@ -4944,7 +4944,7 @@ static void ADDReduceLongByte512VectorTests(IntFunction<byte[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Byte512VectorTests::ADDReduceLong, Byte512VectorTests::ADDReduceAllLong);
     }
 
@@ -4985,7 +4985,7 @@ static void ADDReduceLongByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Byte512VectorTests::ADDReduceLongMasked, Byte512VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4997,7 +4997,7 @@ static void BroadcastLongByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -5015,7 +5015,7 @@ static void blendByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte512VectorTests::blend);
     }
 
 
@@ -5032,7 +5032,7 @@ static void SelectFromByte512VectorTests(IntFunction<byte[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
@@ -5051,7 +5051,7 @@ static void SelectFromByte512VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5128,7 +5128,7 @@ static void maskEqByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Byte512VectorTests::beq);
+        assertArraysEquals(r, a, b, Byte512VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
index 6805cb2ba2675..48e280b358550 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,36 +57,14 @@ public class Byte64VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (64 / 8));
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -390,7 +368,7 @@ static void loadStoreArray(IntFunction<byte[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -461,7 +439,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteMaskProviderForIOOBE")
@@ -545,7 +523,7 @@ static void loadStoreMask(IntFunction<byte[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -569,7 +547,7 @@ static void loadStoreByteBuffer(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -656,7 +634,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -671,7 +649,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -787,7 +765,7 @@ static void loadStoreByteArray(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -868,7 +846,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -956,7 +934,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -967,7 +945,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
index aae22e79ae309..affeea486e412 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         byte apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         byte[] apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         byte apply(byte[] a);
     }
 
-    static void assertReductionArraysEquals(byte[] a, byte[] b, byte c,
+    static void assertReductionArraysEquals(byte[] r, byte rc, byte[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         byte apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(byte[] a, byte[] b, byte c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(byte[] r, byte rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(byte[] a);
     }
 
-    static void assertReductionLongArraysEquals(byte[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, byte[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(byte[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(byte[] a, byte[] b, byte element, int index) {
+    static void assertInsertArraysEquals(byte[] r, byte[] a, byte element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[]a, byte[]r) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         byte apply(byte[] a, int b);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FBinArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         byte[] apply(byte[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         byte[] apply(byte[] r, byte[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         byte[] apply(byte[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         byte[] apply(byte[] a, byte[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
     }
 
 
-    static void assertArraysEquals(byte[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -802,7 +802,7 @@ static void assertArraysEquals(byte[] a, int[] r, int offs) {
     }
 
 
-    static void assertArraysEquals(byte[] a, byte[] r, int offs) {
+    static void assertArraysEquals(byte[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -813,7 +813,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -824,7 +824,7 @@ static void assertArraysEquals(byte[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1288,7 +1288,7 @@ static void ADDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::ADD);
+        assertArraysEquals(r, a, b, Byte64VectorTests::ADD);
     }
     static byte add(byte a, byte b) {
         return (byte)(a + b);
@@ -1306,7 +1306,7 @@ static void addByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::add);
+        assertArraysEquals(r, a, b, Byte64VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1326,7 +1326,7 @@ static void ADDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1344,7 +1344,7 @@ static void addByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::add);
     }
     static byte SUB(byte a, byte b) {
         return (byte)(a - b);
@@ -1364,7 +1364,7 @@ static void SUBByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::SUB);
+        assertArraysEquals(r, a, b, Byte64VectorTests::SUB);
     }
     static byte sub(byte a, byte b) {
         return (byte)(a - b);
@@ -1382,7 +1382,7 @@ static void subByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::sub);
+        assertArraysEquals(r, a, b, Byte64VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1402,7 +1402,7 @@ static void SUBByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1420,7 +1420,7 @@ static void subByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::sub);
     }
     static byte MUL(byte a, byte b) {
         return (byte)(a * b);
@@ -1440,7 +1440,7 @@ static void MULByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::MUL);
+        assertArraysEquals(r, a, b, Byte64VectorTests::MUL);
     }
     static byte mul(byte a, byte b) {
         return (byte)(a * b);
@@ -1458,7 +1458,7 @@ static void mulByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::mul);
+        assertArraysEquals(r, a, b, Byte64VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1478,7 +1478,7 @@ static void MULByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1496,7 +1496,7 @@ static void mulByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::mul);
     }
 
 
@@ -1521,7 +1521,7 @@ static void DIVByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::DIV);
+        assertArraysEquals(r, a, b, Byte64VectorTests::DIV);
     }
     static byte div(byte a, byte b) {
         return (byte)(a / b);
@@ -1543,7 +1543,7 @@ static void divByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::div);
+        assertArraysEquals(r, a, b, Byte64VectorTests::div);
     }
 
 
@@ -1567,7 +1567,7 @@ static void DIVByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1589,7 +1589,7 @@ static void divByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1610,7 +1610,7 @@ static void FIRST_NONZEROByte64VectorTests(IntFunction<byte[]> fa, IntFunction<b
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Byte64VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1630,7 +1630,7 @@ static void FIRST_NONZEROByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -1651,7 +1651,7 @@ static void ANDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::AND);
+        assertArraysEquals(r, a, b, Byte64VectorTests::AND);
     }
     static byte and(byte a, byte b) {
         return (byte)(a & b);
@@ -1669,7 +1669,7 @@ static void andByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::and);
+        assertArraysEquals(r, a, b, Byte64VectorTests::and);
     }
 
 
@@ -1691,7 +1691,7 @@ static void ANDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::AND);
     }
 
 
@@ -1713,7 +1713,7 @@ static void AND_NOTByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Byte64VectorTests::AND_NOT);
     }
 
 
@@ -1735,7 +1735,7 @@ static void AND_NOTByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<b
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::AND_NOT);
     }
 
 
@@ -1757,7 +1757,7 @@ static void ORByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::OR);
+        assertArraysEquals(r, a, b, Byte64VectorTests::OR);
     }
     static byte or(byte a, byte b) {
         return (byte)(a | b);
@@ -1775,7 +1775,7 @@ static void orByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::or);
+        assertArraysEquals(r, a, b, Byte64VectorTests::or);
     }
 
 
@@ -1797,7 +1797,7 @@ static void ORByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::OR);
     }
 
 
@@ -1819,7 +1819,7 @@ static void XORByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::XOR);
+        assertArraysEquals(r, a, b, Byte64VectorTests::XOR);
     }
 
 
@@ -1841,7 +1841,7 @@ static void XORByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::XOR);
     }
 
 
@@ -1856,7 +1856,7 @@ static void addByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1873,7 +1873,7 @@ static void addByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1887,7 +1887,7 @@ static void subByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1904,7 +1904,7 @@ static void subByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1918,7 +1918,7 @@ static void mulByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1935,7 +1935,7 @@ static void mulByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::mul);
     }
 
 
@@ -1954,7 +1954,7 @@ static void divByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::div);
     }
 
 
@@ -1975,7 +1975,7 @@ static void divByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::div);
     }
 
 
@@ -1991,7 +1991,7 @@ static void ORByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFun
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2005,7 +2005,7 @@ static void orByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFun
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::or);
     }
 
 
@@ -2024,7 +2024,7 @@ static void ORByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::OR);
     }
 
 
@@ -2040,7 +2040,7 @@ static void ANDByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2054,7 +2054,7 @@ static void andByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::and);
     }
 
 
@@ -2073,7 +2073,7 @@ static void ANDByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Byte64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::AND);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ORByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, In
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Byte64VectorTests::OR);
     }
 
 
@@ -2108,7 +2108,7 @@ static void ORByte64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte64VectorTests::OR);
     }
 
 
@@ -2123,7 +2123,7 @@ static void ADDByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, I
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Byte64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Byte64VectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -2140,7 +2140,7 @@ static void ADDByte64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]>
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte64VectorTests::ADD);
     }
 
 
@@ -2163,7 +2163,7 @@ static void LSHLByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Byte64VectorTests::LSHL);
     }
 
 
@@ -2185,7 +2185,7 @@ static void LSHLByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::LSHL);
     }
 
 
@@ -2211,7 +2211,7 @@ static void ASHRByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Byte64VectorTests::ASHR);
     }
 
 
@@ -2233,7 +2233,7 @@ static void ASHRByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::ASHR);
     }
 
 
@@ -2259,7 +2259,7 @@ static void LSHRByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Byte64VectorTests::LSHR);
     }
 
 
@@ -2281,7 +2281,7 @@ static void LSHRByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::LSHR);
     }
 
 
@@ -2306,7 +2306,7 @@ static void LSHLByte64VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Byte64VectorTests::LSHL_unary);
     }
 
 
@@ -2327,7 +2327,7 @@ static void LSHLByte64VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::LSHL_unary);
     }
 
 
@@ -2352,7 +2352,7 @@ static void LSHRByte64VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte64VectorTests::LSHR_unary);
     }
 
 
@@ -2373,7 +2373,7 @@ static void LSHRByte64VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::LSHR_unary);
     }
 
 
@@ -2398,7 +2398,7 @@ static void ASHRByte64VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Byte64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Byte64VectorTests::ASHR_unary);
     }
 
 
@@ -2419,7 +2419,7 @@ static void ASHRByte64VectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Byte64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::ASHR_unary);
     }
 
 
@@ -2442,7 +2442,7 @@ static void MINByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::MIN);
+        assertArraysEquals(r, a, b, Byte64VectorTests::MIN);
     }
     static byte min(byte a, byte b) {
         return (byte)(Math.min(a, b));
@@ -2460,7 +2460,7 @@ static void minByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::min);
+        assertArraysEquals(r, a, b, Byte64VectorTests::min);
     }
     static byte MAX(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2480,7 +2480,7 @@ static void MAXByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::MAX);
+        assertArraysEquals(r, a, b, Byte64VectorTests::MAX);
     }
     static byte max(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2498,7 +2498,7 @@ static void maxByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::max);
+        assertArraysEquals(r, a, b, Byte64VectorTests::max);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2512,7 +2512,7 @@ static void MINByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2526,7 +2526,7 @@ static void minByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2540,7 +2540,7 @@ static void MAXByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2554,7 +2554,7 @@ static void maxByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Byte64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::max);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
@@ -2597,7 +2597,7 @@ static void ANDReduceByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte64VectorTests::ANDReduce, Byte64VectorTests::ANDReduceAll);
     }
 
@@ -2645,7 +2645,7 @@ static void ANDReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::ANDReduceMasked, Byte64VectorTests::ANDReduceAllMasked);
     }
 
@@ -2690,7 +2690,7 @@ static void ORReduceByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte64VectorTests::ORReduce, Byte64VectorTests::ORReduceAll);
     }
 
@@ -2738,7 +2738,7 @@ static void ORReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::ORReduceMasked, Byte64VectorTests::ORReduceAllMasked);
     }
 
@@ -2783,7 +2783,7 @@ static void XORReduceByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte64VectorTests::XORReduce, Byte64VectorTests::XORReduceAll);
     }
 
@@ -2831,7 +2831,7 @@ static void XORReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::XORReduceMasked, Byte64VectorTests::XORReduceAllMasked);
     }
 
@@ -2873,7 +2873,7 @@ static void ADDReduceByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte64VectorTests::ADDReduce, Byte64VectorTests::ADDReduceAll);
     }
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -2917,7 +2917,7 @@ static void ADDReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::ADDReduceMasked, Byte64VectorTests::ADDReduceAllMasked);
     }
     static byte MULReduce(byte[] a, int idx) {
@@ -2958,7 +2958,7 @@ static void MULReduceByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte64VectorTests::MULReduce, Byte64VectorTests::MULReduceAll);
     }
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3002,7 +3002,7 @@ static void MULReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::MULReduceMasked, Byte64VectorTests::MULReduceAllMasked);
     }
     static byte MINReduce(byte[] a, int idx) {
@@ -3043,7 +3043,7 @@ static void MINReduceByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte64VectorTests::MINReduce, Byte64VectorTests::MINReduceAll);
     }
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3088,7 +3088,7 @@ static void MINReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::MINReduceMasked, Byte64VectorTests::MINReduceAllMasked);
     }
     static byte MAXReduce(byte[] a, int idx) {
@@ -3129,7 +3129,7 @@ static void MAXReduceByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Byte64VectorTests::MAXReduce, Byte64VectorTests::MAXReduceAll);
     }
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3174,7 +3174,7 @@ static void MAXReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::MAXReduceMasked, Byte64VectorTests::MAXReduceAllMasked);
     }
 
@@ -3200,7 +3200,7 @@ static void anyTrueByte64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte64VectorTests::anyTrue);
     }
 
 
@@ -3226,7 +3226,7 @@ static void allTrueByte64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Byte64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Byte64VectorTests::allTrue);
     }
 
 
@@ -3242,7 +3242,7 @@ static void withByte64VectorTests(IntFunction<byte []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (byte)4, 0);
+        assertInsertArraysEquals(r, a, (byte)4, 0);
     }
     static boolean testIS_DEFAULT(byte a) {
         return bits(a)==0;
@@ -3791,7 +3791,7 @@ static void blendByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
@@ -3808,7 +3808,7 @@ static void RearrangeByte64VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
@@ -3826,7 +3826,7 @@ static void RearrangeByte64VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "byteUnaryOpProvider")
     static void getByte64VectorTests(IntFunction<byte[]> fa) {
@@ -3981,7 +3981,7 @@ static void getByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::get);
+        assertArraysEquals(r, a, Byte64VectorTests::get);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -3995,7 +3995,7 @@ static void BroadcastByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4042,7 +4042,7 @@ static void sliceUnaryByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Byte64VectorTests::sliceUnary);
     }
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4071,7 +4071,7 @@ static void sliceBinaryByte64VectorTestsBinary(IntFunction<byte[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Byte64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Byte64VectorTests::sliceBinary);
     }
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4104,7 +4104,7 @@ static void sliceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Byte64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Byte64VectorTests::slice);
     }
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4131,7 +4131,7 @@ static void unsliceUnaryByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Byte64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Byte64VectorTests::unsliceUnary);
     }
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4170,7 +4170,7 @@ static void unsliceBinaryByte64VectorTestsBinary(IntFunction<byte[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Byte64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Byte64VectorTests::unsliceBinary);
     }
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4226,7 +4226,7 @@ static void unsliceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<b
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Byte64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Byte64VectorTests::unslice);
     }
 
 
@@ -4275,7 +4275,7 @@ static void BITWISE_BLENDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<b
             }
         }
 
-        assertArraysEquals(a, b, c, r, Byte64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4291,7 +4291,7 @@ static void bitwiseBlendByte64VectorTests(IntFunction<byte[]> fa, IntFunction<by
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Byte64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
     }
 
 
@@ -4314,7 +4314,7 @@ static void BITWISE_BLENDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4332,7 +4332,7 @@ static void BITWISE_BLENDByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]>
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4347,7 +4347,7 @@ static void BITWISE_BLENDByte64VectorTestsAltBroadcastSmokeTest(IntFunction<byte
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4361,7 +4361,7 @@ static void bitwiseBlendByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]>
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Byte64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4376,7 +4376,7 @@ static void bitwiseBlendByte64VectorTestsAltBroadcastSmokeTest(IntFunction<byte[
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Byte64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
     }
 
 
@@ -4396,7 +4396,7 @@ static void BITWISE_BLENDByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<b
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
@@ -4415,7 +4415,7 @@ static void BITWISE_BLENDByte64VectorTestsAltBroadcastMaskedSmokeTest(IntFunctio
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4433,7 +4433,7 @@ static void BITWISE_BLENDByte64VectorTestsDoubleBroadcastSmokeTest(IntFunction<b
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByte64VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4447,7 +4447,7 @@ static void bitwiseBlendByte64VectorTestsDoubleBroadcastSmokeTest(IntFunction<by
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Byte64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
     }
 
 
@@ -4466,7 +4466,7 @@ static void BITWISE_BLENDByte64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunc
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4490,7 +4490,7 @@ static void NEGByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::NEG);
+        assertArraysEquals(r, a, Byte64VectorTests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4505,7 +4505,7 @@ static void negByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::neg);
+        assertArraysEquals(r, a, Byte64VectorTests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4523,7 +4523,7 @@ static void NEGMaskedByte64VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Byte64VectorTests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -4546,7 +4546,7 @@ static void ABSByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::ABS);
+        assertArraysEquals(r, a, Byte64VectorTests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4561,7 +4561,7 @@ static void absByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::abs);
+        assertArraysEquals(r, a, Byte64VectorTests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4579,7 +4579,7 @@ static void ABSMaskedByte64VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Byte64VectorTests::ABS);
     }
 
 
@@ -4605,7 +4605,7 @@ static void NOTByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::NOT);
+        assertArraysEquals(r, a, Byte64VectorTests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4620,7 +4620,7 @@ static void notByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::not);
+        assertArraysEquals(r, a, Byte64VectorTests::not);
     }
 
 
@@ -4640,7 +4640,7 @@ static void NOTMaskedByte64VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Byte64VectorTests::NOT);
     }
 
 
@@ -4663,7 +4663,7 @@ static void ZOMOByte64VectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Byte64VectorTests::ZOMO);
+        assertArraysEquals(r, a, Byte64VectorTests::ZOMO);
     }
 
 
@@ -4683,7 +4683,7 @@ static void ZOMOMaskedByte64VectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Byte64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Byte64VectorTests::ZOMO);
     }
 
 
@@ -4711,7 +4711,7 @@ static void gatherByte64VectorTests(IntFunction<byte[]> fa, BiFunction<Integer,I
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::gather);
+        assertArraysEquals(r, a, b, Byte64VectorTests::gather);
     }
     static byte[] gatherMasked(byte a[], int ix, boolean[] mask, int[] b, int iy) {
         byte[] res = new byte[SPECIES.length()];
@@ -4739,7 +4739,7 @@ static void gatherMaskedByte64VectorTests(IntFunction<byte[]> fa, BiFunction<Int
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::gatherMasked);
     }
 
     static byte[] scatter(byte a[], int ix, int[] b, int iy) {
@@ -4764,7 +4764,7 @@ static void scatterByte64VectorTests(IntFunction<byte[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Byte64VectorTests::scatter);
+        assertArraysEquals(r, a, b, Byte64VectorTests::scatter);
     }
 
     static byte[] scatterMasked(byte r[], byte a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4802,7 +4802,7 @@ static void scatterMaskedByte64VectorTests(IntFunction<byte[]> fa, IntFunction<b
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Byte64VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Byte64VectorTests::scatterMasked);
     }
 
 
@@ -4844,8 +4844,8 @@ static void toIntArrayByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4855,8 +4855,8 @@ static void toLongArrayByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4866,8 +4866,8 @@ static void toDoubleArrayByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4907,7 +4907,7 @@ static void reinterpretAsBytesByte64VectorTestsSmokeTest(IntFunction<byte[]> fa)
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
             av.reinterpretAsBytes().intoArray(r, i);
         }
-        assertArraysEquals(a, r, 0);
+        assertArraysEquals(r, a, 0);
     }
 
     static long ADDReduceLong(byte[] a, int idx) {
@@ -4944,7 +4944,7 @@ static void ADDReduceLongByte64VectorTests(IntFunction<byte[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Byte64VectorTests::ADDReduceLong, Byte64VectorTests::ADDReduceAllLong);
     }
 
@@ -4985,7 +4985,7 @@ static void ADDReduceLongByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunc
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Byte64VectorTests::ADDReduceLongMasked, Byte64VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4997,7 +4997,7 @@ static void BroadcastLongByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -5015,7 +5015,7 @@ static void blendByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa,
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Byte64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Byte64VectorTests::blend);
     }
 
 
@@ -5032,7 +5032,7 @@ static void SelectFromByte64VectorTests(IntFunction<byte[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
@@ -5051,7 +5051,7 @@ static void SelectFromByte64VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5128,7 +5128,7 @@ static void maskEqByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunct
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Byte64VectorTests::beq);
+        assertArraysEquals(r, a, b, Byte64VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
index 50cc6e3c08c05..e642f4d780c69 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,36 +66,14 @@ static VectorShape getMaxBit() {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (Max / 8));
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -399,7 +377,7 @@ static void loadStoreArray(IntFunction<byte[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -470,7 +448,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -481,7 +459,7 @@ static void loadStoreMaskArray(IntFunction<byte[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteMaskProviderForIOOBE")
@@ -554,7 +532,7 @@ static void loadStoreMask(IntFunction<byte[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -578,7 +556,7 @@ static void loadStoreByteBuffer(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -665,7 +643,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -680,7 +658,7 @@ static void loadStoreByteBufferMask(IntFunction<byte[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -796,7 +774,7 @@ static void loadStoreByteArray(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "byteByteProviderForIOOBE")
@@ -877,7 +855,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -888,7 +866,7 @@ static void loadStoreByteArrayMask(IntFunction<byte[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "byteByteMaskProviderForIOOBE")
@@ -965,7 +943,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -976,7 +954,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
index c1c216f8db501..d6dd82af7ae04 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ interface FUnOp {
         byte apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -88,7 +88,7 @@ interface FUnArrayOp {
         byte[] apply(byte a);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -98,13 +98,13 @@ static void assertArraysEquals(byte[] a, byte[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -123,17 +123,17 @@ interface FReductionAllOp {
         byte apply(byte[] a);
     }
 
-    static void assertReductionArraysEquals(byte[] a, byte[] b, byte c,
+    static void assertReductionArraysEquals(byte[] r, byte rc, byte[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -145,17 +145,17 @@ interface FReductionAllMaskedOp {
         byte apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(byte[] a, byte[] b, byte c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(byte[] r, byte rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -167,17 +167,17 @@ interface FReductionAllOpLong {
         long apply(byte[] a);
     }
 
-    static void assertReductionLongArraysEquals(byte[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, byte[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -189,17 +189,17 @@ interface FReductionAllMaskedOpLong {
         long apply(byte[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(byte[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, byte[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -207,37 +207,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(byte[] a, byte[] b, byte element, int index) {
+    static void assertInsertArraysEquals(byte[] r, byte[] a, byte element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -251,7 +251,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -265,7 +265,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(byte[] r, byte[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -285,7 +285,7 @@ static void assertRearrangeArraysEquals(byte[] a, byte[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(byte[] r, byte[] a, byte[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -305,7 +305,7 @@ static void assertSelectFromArraysEquals(byte[] a, byte[] r, byte[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[]a, byte[]r) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -334,7 +334,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -345,7 +345,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -357,7 +357,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -369,11 +369,11 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -384,11 +384,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -402,11 +402,11 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -420,7 +420,7 @@ static void assertBroadcastLongArraysEquals(byte[] a, byte[] b, byte[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -434,11 +434,11 @@ static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(byte[] a, byte[] b, byte[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -464,7 +464,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -475,11 +475,11 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -491,7 +491,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -504,7 +504,7 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -517,12 +517,12 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -538,12 +538,12 @@ static void assertBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -559,7 +559,7 @@ static void assertAltBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -574,12 +574,12 @@ static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(byte[] a, byte[] b, byte[] c, byte[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -602,7 +602,7 @@ interface FBinArrayOp {
         byte apply(byte[] a, int b);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, FBinArrayOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -617,7 +617,7 @@ interface FGatherScatterOp {
         byte[] apply(byte[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -644,7 +644,7 @@ interface FScatterMaskedOp {
         byte[] apply(byte[] r, byte[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -654,7 +654,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -665,7 +665,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -675,7 +675,7 @@ static void assertArraysEquals(byte[] a, int[] b, byte[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -692,7 +692,7 @@ interface FLaneOp {
         byte[] apply(byte[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(byte[] r, byte[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -702,7 +702,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -712,7 +712,7 @@ interface FLaneBop {
         byte[] apply(byte[] a, byte[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -722,7 +722,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -733,7 +733,7 @@ interface FLaneMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -743,7 +743,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, boolean
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -754,7 +754,7 @@ interface FLanePartBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -764,7 +764,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -776,7 +776,7 @@ interface FLanePartMaskedBop {
         byte[] apply(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(byte[] r, byte[] a, byte[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -786,7 +786,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -795,7 +795,7 @@ static void assertArraysEquals(byte[] a, byte[] b, byte[] r, int origin, int par
     }
 
 
-    static void assertArraysEquals(byte[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -807,7 +807,7 @@ static void assertArraysEquals(byte[] a, int[] r, int offs) {
     }
 
 
-    static void assertArraysEquals(byte[] a, byte[] r, int offs) {
+    static void assertArraysEquals(byte[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -818,7 +818,7 @@ static void assertArraysEquals(byte[] a, byte[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -829,7 +829,7 @@ static void assertArraysEquals(byte[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(byte[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, byte[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1293,7 +1293,7 @@ static void ADDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::ADD);
     }
     static byte add(byte a, byte b) {
         return (byte)(a + b);
@@ -1311,7 +1311,7 @@ static void addByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::add);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1331,7 +1331,7 @@ static void ADDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1349,7 +1349,7 @@ static void addByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::add);
     }
     static byte SUB(byte a, byte b) {
         return (byte)(a - b);
@@ -1369,7 +1369,7 @@ static void SUBByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::SUB);
     }
     static byte sub(byte a, byte b) {
         return (byte)(a - b);
@@ -1387,7 +1387,7 @@ static void subByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1407,7 +1407,7 @@ static void SUBByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1425,7 +1425,7 @@ static void subByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::sub);
     }
     static byte MUL(byte a, byte b) {
         return (byte)(a * b);
@@ -1445,7 +1445,7 @@ static void MULByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::MUL);
     }
     static byte mul(byte a, byte b) {
         return (byte)(a * b);
@@ -1463,7 +1463,7 @@ static void mulByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1483,7 +1483,7 @@ static void MULByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1501,7 +1501,7 @@ static void mulByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::mul);
     }
 
 
@@ -1526,7 +1526,7 @@ static void DIVByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::DIV);
     }
     static byte div(byte a, byte b) {
         return (byte)(a / b);
@@ -1548,7 +1548,7 @@ static void divByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::div);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::div);
     }
 
 
@@ -1572,7 +1572,7 @@ static void DIVByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1594,7 +1594,7 @@ static void divByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1615,7 +1615,7 @@ static void FIRST_NONZEROByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1635,7 +1635,7 @@ static void FIRST_NONZEROByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -1656,7 +1656,7 @@ static void ANDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::AND);
     }
     static byte and(byte a, byte b) {
         return (byte)(a & b);
@@ -1674,7 +1674,7 @@ static void andByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::and);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::and);
     }
 
 
@@ -1696,7 +1696,7 @@ static void ANDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::AND);
     }
 
 
@@ -1718,7 +1718,7 @@ static void AND_NOTByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::AND_NOT);
     }
 
 
@@ -1740,7 +1740,7 @@ static void AND_NOTByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::AND_NOT);
     }
 
 
@@ -1762,7 +1762,7 @@ static void ORByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::OR);
     }
     static byte or(byte a, byte b) {
         return (byte)(a | b);
@@ -1780,7 +1780,7 @@ static void orByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::or);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::or);
     }
 
 
@@ -1802,7 +1802,7 @@ static void ORByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::OR);
     }
 
 
@@ -1824,7 +1824,7 @@ static void XORByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::XOR);
     }
 
 
@@ -1846,7 +1846,7 @@ static void XORByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::XOR);
     }
 
 
@@ -1861,7 +1861,7 @@ static void addByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1878,7 +1878,7 @@ static void addByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ByteMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1892,7 +1892,7 @@ static void subByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1909,7 +1909,7 @@ static void subByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ByteMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -1923,7 +1923,7 @@ static void mulByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -1940,7 +1940,7 @@ static void mulByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ByteMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::mul);
     }
 
 
@@ -1959,7 +1959,7 @@ static void divByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::div);
     }
 
 
@@ -1980,7 +1980,7 @@ static void divByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ByteMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::div);
     }
 
 
@@ -1996,7 +1996,7 @@ static void ORByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2010,7 +2010,7 @@ static void orByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::or);
     }
 
 
@@ -2029,7 +2029,7 @@ static void ORByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ByteMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::OR);
     }
 
 
@@ -2045,7 +2045,7 @@ static void ANDByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2059,7 +2059,7 @@ static void andByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::and);
     }
 
 
@@ -2078,7 +2078,7 @@ static void ANDByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ByteMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::AND);
     }
 
 
@@ -2094,7 +2094,7 @@ static void ORByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, ByteMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ByteMaxVectorTests::OR);
     }
 
 
@@ -2113,7 +2113,7 @@ static void ORByteMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, ByteMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteMaxVectorTests::OR);
     }
 
 
@@ -2128,7 +2128,7 @@ static void ADDByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, ByteMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ByteMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -2145,7 +2145,7 @@ static void ADDByteMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, ByteMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteMaxVectorTests::ADD);
     }
 
 
@@ -2168,7 +2168,7 @@ static void LSHLByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::LSHL);
     }
 
 
@@ -2190,7 +2190,7 @@ static void LSHLByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHL);
     }
 
 
@@ -2216,7 +2216,7 @@ static void ASHRByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::ASHR);
     }
 
 
@@ -2238,7 +2238,7 @@ static void ASHRByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::ASHR);
     }
 
 
@@ -2264,7 +2264,7 @@ static void LSHRByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::LSHR);
     }
 
 
@@ -2286,7 +2286,7 @@ static void LSHRByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byt
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHR);
     }
 
 
@@ -2311,7 +2311,7 @@ static void LSHLByteMaxVectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, ByteMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2332,7 +2332,7 @@ static void LSHLByteMaxVectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, ByteMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2357,7 +2357,7 @@ static void LSHRByteMaxVectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, ByteMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2378,7 +2378,7 @@ static void LSHRByteMaxVectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, ByteMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2403,7 +2403,7 @@ static void ASHRByteMaxVectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, ByteMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::ASHR_unary);
     }
 
 
@@ -2424,7 +2424,7 @@ static void ASHRByteMaxVectorTestsShift(IntFunction<byte[]> fa, IntFunction<byte
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, ByteMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::ASHR_unary);
     }
 
 
@@ -2447,7 +2447,7 @@ static void MINByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::MIN);
     }
     static byte min(byte a, byte b) {
         return (byte)(Math.min(a, b));
@@ -2465,7 +2465,7 @@ static void minByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::min);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::min);
     }
     static byte MAX(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2485,7 +2485,7 @@ static void MAXByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::MAX);
     }
     static byte max(byte a, byte b) {
         return (byte)(Math.max(a, b));
@@ -2503,7 +2503,7 @@ static void maxByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::max);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::max);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2517,7 +2517,7 @@ static void MINByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2531,7 +2531,7 @@ static void minByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2545,7 +2545,7 @@ static void MAXByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
@@ -2559,7 +2559,7 @@ static void maxByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ByteMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::max);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
@@ -2602,7 +2602,7 @@ static void ANDReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ByteMaxVectorTests::ANDReduce, ByteMaxVectorTests::ANDReduceAll);
     }
 
@@ -2650,7 +2650,7 @@ static void ANDReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::ANDReduceMasked, ByteMaxVectorTests::ANDReduceAllMasked);
     }
 
@@ -2695,7 +2695,7 @@ static void ORReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ByteMaxVectorTests::ORReduce, ByteMaxVectorTests::ORReduceAll);
     }
 
@@ -2743,7 +2743,7 @@ static void ORReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::ORReduceMasked, ByteMaxVectorTests::ORReduceAllMasked);
     }
 
@@ -2788,7 +2788,7 @@ static void XORReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ByteMaxVectorTests::XORReduce, ByteMaxVectorTests::XORReduceAll);
     }
 
@@ -2836,7 +2836,7 @@ static void XORReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::XORReduceMasked, ByteMaxVectorTests::XORReduceAllMasked);
     }
 
@@ -2878,7 +2878,7 @@ static void ADDReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ByteMaxVectorTests::ADDReduce, ByteMaxVectorTests::ADDReduceAll);
     }
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -2922,7 +2922,7 @@ static void ADDReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::ADDReduceMasked, ByteMaxVectorTests::ADDReduceAllMasked);
     }
     static byte MULReduce(byte[] a, int idx) {
@@ -2963,7 +2963,7 @@ static void MULReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ByteMaxVectorTests::MULReduce, ByteMaxVectorTests::MULReduceAll);
     }
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3007,7 +3007,7 @@ static void MULReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::MULReduceMasked, ByteMaxVectorTests::MULReduceAllMasked);
     }
     static byte MINReduce(byte[] a, int idx) {
@@ -3048,7 +3048,7 @@ static void MINReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ByteMaxVectorTests::MINReduce, ByteMaxVectorTests::MINReduceAll);
     }
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3093,7 +3093,7 @@ static void MINReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::MINReduceMasked, ByteMaxVectorTests::MINReduceAllMasked);
     }
     static byte MAXReduce(byte[] a, int idx) {
@@ -3134,7 +3134,7 @@ static void MAXReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ByteMaxVectorTests::MAXReduce, ByteMaxVectorTests::MAXReduceAll);
     }
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
@@ -3179,7 +3179,7 @@ static void MAXReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::MAXReduceMasked, ByteMaxVectorTests::MAXReduceAllMasked);
     }
 
@@ -3205,7 +3205,7 @@ static void anyTrueByteMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, ByteMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteMaxVectorTests::anyTrue);
     }
 
 
@@ -3231,7 +3231,7 @@ static void allTrueByteMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, ByteMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteMaxVectorTests::allTrue);
     }
 
 
@@ -3247,7 +3247,7 @@ static void withByteMaxVectorTests(IntFunction<byte []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (byte)4, 0);
+        assertInsertArraysEquals(r, a, (byte)4, 0);
     }
     static boolean testIS_DEFAULT(byte a) {
         return bits(a)==0;
@@ -3796,7 +3796,7 @@ static void blendByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
@@ -3813,7 +3813,7 @@ static void RearrangeByteMaxVectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
@@ -3831,7 +3831,7 @@ static void RearrangeByteMaxVectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "byteUnaryOpProvider")
     static void getByteMaxVectorTests(IntFunction<byte[]> fa) {
@@ -3986,7 +3986,7 @@ static void getByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::get);
+        assertArraysEquals(r, a, ByteMaxVectorTests::get);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4000,7 +4000,7 @@ static void BroadcastByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4047,7 +4047,7 @@ static void sliceUnaryByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, ByteMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ByteMaxVectorTests::sliceUnary);
     }
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4076,7 +4076,7 @@ static void sliceBinaryByteMaxVectorTestsBinary(IntFunction<byte[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, ByteMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ByteMaxVectorTests::sliceBinary);
     }
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4109,7 +4109,7 @@ static void sliceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<by
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, ByteMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ByteMaxVectorTests::slice);
     }
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4136,7 +4136,7 @@ static void unsliceUnaryByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, ByteMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ByteMaxVectorTests::unsliceUnary);
     }
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4175,7 +4175,7 @@ static void unsliceBinaryByteMaxVectorTestsBinary(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, ByteMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ByteMaxVectorTests::unsliceBinary);
     }
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
         byte[] res = new byte[SPECIES.length()];
@@ -4231,7 +4231,7 @@ static void unsliceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, ByteMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ByteMaxVectorTests::unslice);
     }
 
 
@@ -4280,7 +4280,7 @@ static void BITWISE_BLENDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, ByteMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4296,7 +4296,7 @@ static void bitwiseBlendByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<b
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, ByteMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4319,7 +4319,7 @@ static void BITWISE_BLENDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4337,7 +4337,7 @@ static void BITWISE_BLENDByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, ByteMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4352,7 +4352,7 @@ static void BITWISE_BLENDByteMaxVectorTestsAltBroadcastSmokeTest(IntFunction<byt
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, ByteMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4366,7 +4366,7 @@ static void bitwiseBlendByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]>
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, ByteMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
@@ -4381,7 +4381,7 @@ static void bitwiseBlendByteMaxVectorTestsAltBroadcastSmokeTest(IntFunction<byte
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, ByteMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4401,7 +4401,7 @@ static void BITWISE_BLENDByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
@@ -4420,7 +4420,7 @@ static void BITWISE_BLENDByteMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4438,7 +4438,7 @@ static void BITWISE_BLENDByteMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, ByteMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "byteTernaryOpProvider")
     static void bitwiseBlendByteMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
@@ -4452,7 +4452,7 @@ static void bitwiseBlendByteMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<b
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, ByteMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4471,7 +4471,7 @@ static void BITWISE_BLENDByteMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4495,7 +4495,7 @@ static void NEGByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::NEG);
+        assertArraysEquals(r, a, ByteMaxVectorTests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4510,7 +4510,7 @@ static void negByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::neg);
+        assertArraysEquals(r, a, ByteMaxVectorTests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4528,7 +4528,7 @@ static void NEGMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ByteMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, ByteMaxVectorTests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -4551,7 +4551,7 @@ static void ABSByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::ABS);
+        assertArraysEquals(r, a, ByteMaxVectorTests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4566,7 +4566,7 @@ static void absByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::abs);
+        assertArraysEquals(r, a, ByteMaxVectorTests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
@@ -4584,7 +4584,7 @@ static void ABSMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ByteMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, ByteMaxVectorTests::ABS);
     }
 
 
@@ -4610,7 +4610,7 @@ static void NOTByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::NOT);
+        assertArraysEquals(r, a, ByteMaxVectorTests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
@@ -4625,7 +4625,7 @@ static void notByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::not);
+        assertArraysEquals(r, a, ByteMaxVectorTests::not);
     }
 
 
@@ -4645,7 +4645,7 @@ static void NOTMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ByteMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, ByteMaxVectorTests::NOT);
     }
 
 
@@ -4668,7 +4668,7 @@ static void ZOMOByteMaxVectorTests(IntFunction<byte[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ByteMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, ByteMaxVectorTests::ZOMO);
     }
 
 
@@ -4688,7 +4688,7 @@ static void ZOMOMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ByteMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ByteMaxVectorTests::ZOMO);
     }
 
 
@@ -4716,7 +4716,7 @@ static void gatherByteMaxVectorTests(IntFunction<byte[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::gather);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::gather);
     }
     static byte[] gatherMasked(byte a[], int ix, boolean[] mask, int[] b, int iy) {
         byte[] res = new byte[SPECIES.length()];
@@ -4744,7 +4744,7 @@ static void gatherMaskedByteMaxVectorTests(IntFunction<byte[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::gatherMasked);
     }
 
     static byte[] scatter(byte a[], int ix, int[] b, int iy) {
@@ -4769,7 +4769,7 @@ static void scatterByteMaxVectorTests(IntFunction<byte[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::scatter);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::scatter);
     }
 
     static byte[] scatterMasked(byte r[], byte a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4807,7 +4807,7 @@ static void scatterMaskedByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ByteMaxVectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::scatterMasked);
     }
 
 
@@ -4849,8 +4849,8 @@ static void toIntArrayByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4860,8 +4860,8 @@ static void toLongArrayByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4871,8 +4871,8 @@ static void toDoubleArrayByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4912,7 +4912,7 @@ static void reinterpretAsBytesByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa
             ByteVector av = ByteVector.fromArray(SPECIES, a, i);
             av.reinterpretAsBytes().intoArray(r, i);
         }
-        assertArraysEquals(a, r, 0);
+        assertArraysEquals(r, a, 0);
     }
 
     static long ADDReduceLong(byte[] a, int idx) {
@@ -4949,7 +4949,7 @@ static void ADDReduceLongByteMaxVectorTests(IntFunction<byte[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 ByteMaxVectorTests::ADDReduceLong, ByteMaxVectorTests::ADDReduceAllLong);
     }
 
@@ -4990,7 +4990,7 @@ static void ADDReduceLongByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 ByteMaxVectorTests::ADDReduceLongMasked, ByteMaxVectorTests::ADDReduceAllLongMasked);
     }
 
@@ -5002,7 +5002,7 @@ static void BroadcastLongByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ByteVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
@@ -5020,7 +5020,7 @@ static void blendByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, ByteMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteMaxVectorTests::blend);
     }
 
 
@@ -5037,7 +5037,7 @@ static void SelectFromByteMaxVectorTests(IntFunction<byte[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
@@ -5056,7 +5056,7 @@ static void SelectFromByteMaxVectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5133,7 +5133,7 @@ static void maskEqByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, ByteMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java
index f1f09b98eccb2..3e5d6f07c4e17 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Double128VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (128 / 8));
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(double[] a, double[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<double[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new double[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<double[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorTests.java b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
index 1f22bd2fb6153..b1faaf7ced180 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         double apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         double[] apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         double apply(double[] a);
     }
 
-    static void assertReductionArraysEquals(double[] a, double[] b, double c,
+    static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         double apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(double[] a, double[] b, double c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(double[] r, double rc, double[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(double[] a);
     }
 
-    static void assertReductionLongArraysEquals(double[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, double[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(double[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, double[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(double[] a, double[] b, double element, int index) {
+    static void assertInsertArraysEquals(double[] r, double[] a, double element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boo
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertBroadcastArraysEquals(double[]a, double[]r) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBin
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, bool
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, F
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, b
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(double actual, double expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf,
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, F
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         double apply(double[] a, int b);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FBinArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         double[] apply(double[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         double[] apply(double[] r, double[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         }
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         double[] apply(double[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         double[] apply(double[] a, double[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, F
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         double[] apply(double[] a, double[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, b
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         double[] apply(double[] a, double[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         double[] apply(double[] a, double[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(double[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(double[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1396,7 +1396,7 @@ static void ADDDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::ADD);
+        assertArraysEquals(r, a, b, Double128VectorTests::ADD);
     }
     static double add(double a, double b) {
         return (double)(a + b);
@@ -1414,7 +1414,7 @@ static void addDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::add);
+        assertArraysEquals(r, a, b, Double128VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1434,7 +1434,7 @@ static void ADDDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1452,7 +1452,7 @@ static void addDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::add);
     }
     static double SUB(double a, double b) {
         return (double)(a - b);
@@ -1472,7 +1472,7 @@ static void SUBDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::SUB);
+        assertArraysEquals(r, a, b, Double128VectorTests::SUB);
     }
     static double sub(double a, double b) {
         return (double)(a - b);
@@ -1490,7 +1490,7 @@ static void subDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::sub);
+        assertArraysEquals(r, a, b, Double128VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1510,7 +1510,7 @@ static void SUBDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1528,7 +1528,7 @@ static void subDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::sub);
     }
     static double MUL(double a, double b) {
         return (double)(a * b);
@@ -1548,7 +1548,7 @@ static void MULDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::MUL);
+        assertArraysEquals(r, a, b, Double128VectorTests::MUL);
     }
     static double mul(double a, double b) {
         return (double)(a * b);
@@ -1566,7 +1566,7 @@ static void mulDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::mul);
+        assertArraysEquals(r, a, b, Double128VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1586,7 +1586,7 @@ static void MULDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1604,7 +1604,7 @@ static void mulDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1625,7 +1625,7 @@ static void DIVDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::DIV);
+        assertArraysEquals(r, a, b, Double128VectorTests::DIV);
     }
     static double div(double a, double b) {
         return (double)(a / b);
@@ -1643,7 +1643,7 @@ static void divDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::div);
+        assertArraysEquals(r, a, b, Double128VectorTests::div);
     }
 
 
@@ -1665,7 +1665,7 @@ static void DIVDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1683,7 +1683,7 @@ static void divDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::div);
     }
 
 
@@ -1706,7 +1706,7 @@ static void FIRST_NONZERODouble128VectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Double128VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1726,7 +1726,7 @@ static void FIRST_NONZERODouble128VectorTestsMasked(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1748,7 +1748,7 @@ static void addDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1765,7 +1765,7 @@ static void addDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1779,7 +1779,7 @@ static void subDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1796,7 +1796,7 @@ static void subDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1810,7 +1810,7 @@ static void mulDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1827,7 +1827,7 @@ static void mulDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::mul);
     }
 
 
@@ -1842,7 +1842,7 @@ static void divDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::div);
     }
 
 
@@ -1861,7 +1861,7 @@ static void divDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::div);
     }
 
 
@@ -1884,7 +1884,7 @@ static void ADDDouble128VectorTestsBroadcastLongSmokeTest(IntFunction<double[]>
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Double128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Double128VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void ADDDouble128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double128VectorTests::ADD);
     }
 
 
@@ -1957,7 +1957,7 @@ static void MINDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::MIN);
+        assertArraysEquals(r, a, b, Double128VectorTests::MIN);
     }
     static double min(double a, double b) {
         return (double)(Math.min(a, b));
@@ -1975,7 +1975,7 @@ static void minDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::min);
+        assertArraysEquals(r, a, b, Double128VectorTests::min);
     }
     static double MAX(double a, double b) {
         return (double)(Math.max(a, b));
@@ -1995,7 +1995,7 @@ static void MAXDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::MAX);
+        assertArraysEquals(r, a, b, Double128VectorTests::MAX);
     }
     static double max(double a, double b) {
         return (double)(Math.max(a, b));
@@ -2013,7 +2013,7 @@ static void maxDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::max);
+        assertArraysEquals(r, a, b, Double128VectorTests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2027,7 +2027,7 @@ static void MINDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void minDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2055,7 +2055,7 @@ static void MAXDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2069,7 +2069,7 @@ static void maxDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::max);
     }
 
 
@@ -2121,7 +2121,7 @@ static void ADDReduceDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double128VectorTests::ADDReduce, Double128VectorTests::ADDReduceAll);
     }
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2165,7 +2165,7 @@ static void ADDReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double128VectorTests::ADDReduceMasked, Double128VectorTests::ADDReduceAllMasked);
     }
     static double MULReduce(double[] a, int idx) {
@@ -2206,7 +2206,7 @@ static void MULReduceDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double128VectorTests::MULReduce, Double128VectorTests::MULReduceAll);
     }
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2250,7 +2250,7 @@ static void MULReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double128VectorTests::MULReduceMasked, Double128VectorTests::MULReduceAllMasked);
     }
     static double MINReduce(double[] a, int idx) {
@@ -2291,7 +2291,7 @@ static void MINReduceDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double128VectorTests::MINReduce, Double128VectorTests::MINReduceAll);
     }
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2336,7 +2336,7 @@ static void MINReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double128VectorTests::MINReduceMasked, Double128VectorTests::MINReduceAllMasked);
     }
     static double MAXReduce(double[] a, int idx) {
@@ -2377,7 +2377,7 @@ static void MAXReduceDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double128VectorTests::MAXReduce, Double128VectorTests::MAXReduceAll);
     }
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2422,7 +2422,7 @@ static void MAXReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double128VectorTests::MAXReduceMasked, Double128VectorTests::MAXReduceAllMasked);
     }
 
@@ -2442,7 +2442,7 @@ static void withDouble128VectorTests(IntFunction<double []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (double)4, 0);
+        assertInsertArraysEquals(r, a, (double)4, 0);
     }
     static boolean testIS_DEFAULT(double a) {
         return bits(a)==0;
@@ -3108,7 +3108,7 @@ static void blendDouble128VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
@@ -3125,7 +3125,7 @@ static void RearrangeDouble128VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
@@ -3143,7 +3143,7 @@ static void RearrangeDouble128VectorTestsMaskedSmokeTest(IntFunction<double[]> f
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "doubleUnaryOpProvider")
     static void getDouble128VectorTests(IntFunction<double[]> fa) {
@@ -3298,7 +3298,7 @@ static void getDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double128VectorTests::get);
+        assertArraysEquals(r, a, Double128VectorTests::get);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -3312,7 +3312,7 @@ static void BroadcastDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3359,7 +3359,7 @@ static void sliceUnaryDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Double128VectorTests::sliceUnary);
     }
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3388,7 +3388,7 @@ static void sliceBinaryDouble128VectorTestsBinary(IntFunction<double[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Double128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Double128VectorTests::sliceBinary);
     }
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3421,7 +3421,7 @@ static void sliceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Double128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Double128VectorTests::slice);
     }
     static double[] unsliceUnary(double[] a, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3448,7 +3448,7 @@ static void unsliceUnaryDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Double128VectorTests::unsliceUnary);
     }
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3487,7 +3487,7 @@ static void unsliceBinaryDouble128VectorTestsBinary(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Double128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Double128VectorTests::unsliceBinary);
     }
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3543,7 +3543,7 @@ static void unsliceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Double128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Double128VectorTests::unslice);
     }
 
     static double SIN(double a) {
@@ -3566,7 +3566,7 @@ static void SINDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::SIN, Double128VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::SIN, Double128VectorTests::strictSIN);
     }
 
 
@@ -3590,7 +3590,7 @@ static void EXPDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::EXP, Double128VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::EXP, Double128VectorTests::strictEXP);
     }
 
 
@@ -3614,7 +3614,7 @@ static void LOG1PDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::LOG1P, Double128VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::LOG1P, Double128VectorTests::strictLOG1P);
     }
 
 
@@ -3638,7 +3638,7 @@ static void LOGDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::LOG, Double128VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::LOG, Double128VectorTests::strictLOG);
     }
 
 
@@ -3662,7 +3662,7 @@ static void LOG10Double128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::LOG10, Double128VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::LOG10, Double128VectorTests::strictLOG10);
     }
 
 
@@ -3686,7 +3686,7 @@ static void EXPM1Double128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::EXPM1, Double128VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::EXPM1, Double128VectorTests::strictEXPM1);
     }
 
 
@@ -3710,7 +3710,7 @@ static void COSDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::COS, Double128VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::COS, Double128VectorTests::strictCOS);
     }
 
 
@@ -3734,7 +3734,7 @@ static void TANDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::TAN, Double128VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::TAN, Double128VectorTests::strictTAN);
     }
 
 
@@ -3758,7 +3758,7 @@ static void SINHDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::SINH, Double128VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::SINH, Double128VectorTests::strictSINH);
     }
 
 
@@ -3782,7 +3782,7 @@ static void COSHDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::COSH, Double128VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::COSH, Double128VectorTests::strictCOSH);
     }
 
 
@@ -3806,7 +3806,7 @@ static void TANHDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::TANH, Double128VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::TANH, Double128VectorTests::strictTANH);
     }
 
 
@@ -3830,7 +3830,7 @@ static void ASINDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::ASIN, Double128VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::ASIN, Double128VectorTests::strictASIN);
     }
 
 
@@ -3854,7 +3854,7 @@ static void ACOSDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::ACOS, Double128VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::ACOS, Double128VectorTests::strictACOS);
     }
 
 
@@ -3878,7 +3878,7 @@ static void ATANDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::ATAN, Double128VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::ATAN, Double128VectorTests::strictATAN);
     }
 
 
@@ -3902,7 +3902,7 @@ static void CBRTDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double128VectorTests::CBRT, Double128VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::CBRT, Double128VectorTests::strictCBRT);
     }
 
 
@@ -3928,7 +3928,7 @@ static void HYPOTDouble128VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double128VectorTests::HYPOT, Double128VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::HYPOT, Double128VectorTests::strictHYPOT);
     }
 
 
@@ -3955,7 +3955,7 @@ static void POWDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double128VectorTests::POW, Double128VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::POW, Double128VectorTests::strictPOW);
     }
 
     static double pow(double a, double b) {
@@ -3980,7 +3980,7 @@ static void powDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double128VectorTests::pow, Double128VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::pow, Double128VectorTests::strictpow);
     }
 
 
@@ -4007,7 +4007,7 @@ static void ATAN2Double128VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double128VectorTests::ATAN2, Double128VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::ATAN2, Double128VectorTests::strictATAN2);
     }
 
 
@@ -4023,7 +4023,7 @@ static void POWDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double128VectorTests::POW, Double128VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::POW, Double128VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -4037,7 +4037,7 @@ static void powDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double128VectorTests::pow, Double128VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::pow, Double128VectorTests::strictpow);
     }
 
 
@@ -4073,7 +4073,7 @@ static void FMADouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, c, r, Double128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Double128VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4096,7 +4096,7 @@ static void fmaDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Double128VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Double128VectorTests::fma);
     }
 
 
@@ -4126,7 +4126,7 @@ static void FMADouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Double128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
     }
 
 
@@ -4145,7 +4145,7 @@ static void FMADouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Double128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Double128VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
@@ -4160,7 +4160,7 @@ static void FMADouble128VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> f
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Double128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Double128VectorTests::FMA);
     }
 
 
@@ -4180,7 +4180,7 @@ static void FMADouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Double128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
@@ -4199,7 +4199,7 @@ static void FMADouble128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<doubl
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Double128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
     }
 
 
@@ -4224,7 +4224,7 @@ static void FMADouble128VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double128VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble128VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4245,7 +4245,7 @@ static void fmaDouble128VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double128VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double128VectorTests::fma);
     }
 
 
@@ -4271,7 +4271,7 @@ static void FMADouble128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<do
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Double128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
     }
 
 
@@ -4297,7 +4297,7 @@ static void NEGDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double128VectorTests::NEG);
+        assertArraysEquals(r, a, Double128VectorTests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4312,7 +4312,7 @@ static void negDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double128VectorTests::neg);
+        assertArraysEquals(r, a, Double128VectorTests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void NEGMaskedDouble128VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Double128VectorTests::NEG);
     }
 
     static double ABS(double a) {
@@ -4353,7 +4353,7 @@ static void ABSDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double128VectorTests::ABS);
+        assertArraysEquals(r, a, Double128VectorTests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4368,7 +4368,7 @@ static void absDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double128VectorTests::abs);
+        assertArraysEquals(r, a, Double128VectorTests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4386,7 +4386,7 @@ static void ABSMaskedDouble128VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Double128VectorTests::ABS);
     }
 
 
@@ -4418,7 +4418,7 @@ static void SQRTDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double128VectorTests::SQRT);
+        assertArraysEquals(r, a, Double128VectorTests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4433,7 +4433,7 @@ static void sqrtDouble128VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double128VectorTests::sqrt);
+        assertArraysEquals(r, a, Double128VectorTests::sqrt);
     }
 
 
@@ -4453,7 +4453,7 @@ static void SQRTMaskedDouble128VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double128VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Double128VectorTests::SQRT);
     }
 
     static double[] gather(double a[], int ix, int[] b, int iy) {
@@ -4478,7 +4478,7 @@ static void gatherDouble128VectorTests(IntFunction<double[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::gather);
+        assertArraysEquals(r, a, b, Double128VectorTests::gather);
     }
     static double[] gatherMasked(double a[], int ix, boolean[] mask, int[] b, int iy) {
         double[] res = new double[SPECIES.length()];
@@ -4506,7 +4506,7 @@ static void gatherMaskedDouble128VectorTests(IntFunction<double[]> fa, BiFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::gatherMasked);
     }
 
     static double[] scatter(double a[], int ix, int[] b, int iy) {
@@ -4531,7 +4531,7 @@ static void scatterDouble128VectorTests(IntFunction<double[]> fa, BiFunction<Int
             }
         }
 
-        assertArraysEquals(a, b, r, Double128VectorTests::scatter);
+        assertArraysEquals(r, a, b, Double128VectorTests::scatter);
     }
 
     static double[] scatterMasked(double r[], double a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4569,7 +4569,7 @@ static void scatterMaskedDouble128VectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double128VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Double128VectorTests::scatterMasked);
     }
 
 
@@ -4611,8 +4611,8 @@ static void toIntArrayDouble128VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4622,8 +4622,8 @@ static void toLongArrayDouble128VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4690,7 +4690,7 @@ static void ADDReduceLongDouble128VectorTests(IntFunction<double[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Double128VectorTests::ADDReduceLong, Double128VectorTests::ADDReduceAllLong);
     }
 
@@ -4731,7 +4731,7 @@ static void ADDReduceLongDouble128VectorTestsMasked(IntFunction<double[]> fa, In
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Double128VectorTests::ADDReduceLongMasked, Double128VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4743,7 +4743,7 @@ static void BroadcastLongDouble128VectorTestsSmokeTest(IntFunction<double[]> fa)
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -4761,7 +4761,7 @@ static void blendDouble128VectorTestsBroadcastLongSmokeTest(IntFunction<double[]
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double128VectorTests::blend);
     }
 
 
@@ -4778,7 +4778,7 @@ static void SelectFromDouble128VectorTests(IntFunction<double[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
@@ -4797,7 +4797,7 @@ static void SelectFromDouble128VectorTestsMaskedSmokeTest(IntFunction<double[]>
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4874,7 +4874,7 @@ static void maskEqDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFu
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Double128VectorTests::beq);
+        assertArraysEquals(r, a, b, Double128VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java
index 0491aa04da973..84da6e4648eeb 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Double256VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (256 / 8));
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(double[] a, double[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<double[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new double[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<double[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorTests.java b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
index 8833300666b05..1e1a1a851f5d3 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         double apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         double[] apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         double apply(double[] a);
     }
 
-    static void assertReductionArraysEquals(double[] a, double[] b, double c,
+    static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         double apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(double[] a, double[] b, double c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(double[] r, double rc, double[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(double[] a);
     }
 
-    static void assertReductionLongArraysEquals(double[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, double[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(double[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, double[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(double[] a, double[] b, double element, int index) {
+    static void assertInsertArraysEquals(double[] r, double[] a, double element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boo
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertBroadcastArraysEquals(double[]a, double[]r) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBin
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, bool
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, F
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, b
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(double actual, double expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf,
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, F
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         double apply(double[] a, int b);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FBinArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         double[] apply(double[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         double[] apply(double[] r, double[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         }
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         double[] apply(double[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         double[] apply(double[] a, double[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, F
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         double[] apply(double[] a, double[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, b
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         double[] apply(double[] a, double[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         double[] apply(double[] a, double[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(double[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(double[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1396,7 +1396,7 @@ static void ADDDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::ADD);
+        assertArraysEquals(r, a, b, Double256VectorTests::ADD);
     }
     static double add(double a, double b) {
         return (double)(a + b);
@@ -1414,7 +1414,7 @@ static void addDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::add);
+        assertArraysEquals(r, a, b, Double256VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1434,7 +1434,7 @@ static void ADDDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1452,7 +1452,7 @@ static void addDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::add);
     }
     static double SUB(double a, double b) {
         return (double)(a - b);
@@ -1472,7 +1472,7 @@ static void SUBDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::SUB);
+        assertArraysEquals(r, a, b, Double256VectorTests::SUB);
     }
     static double sub(double a, double b) {
         return (double)(a - b);
@@ -1490,7 +1490,7 @@ static void subDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::sub);
+        assertArraysEquals(r, a, b, Double256VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1510,7 +1510,7 @@ static void SUBDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1528,7 +1528,7 @@ static void subDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::sub);
     }
     static double MUL(double a, double b) {
         return (double)(a * b);
@@ -1548,7 +1548,7 @@ static void MULDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::MUL);
+        assertArraysEquals(r, a, b, Double256VectorTests::MUL);
     }
     static double mul(double a, double b) {
         return (double)(a * b);
@@ -1566,7 +1566,7 @@ static void mulDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::mul);
+        assertArraysEquals(r, a, b, Double256VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1586,7 +1586,7 @@ static void MULDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1604,7 +1604,7 @@ static void mulDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1625,7 +1625,7 @@ static void DIVDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::DIV);
+        assertArraysEquals(r, a, b, Double256VectorTests::DIV);
     }
     static double div(double a, double b) {
         return (double)(a / b);
@@ -1643,7 +1643,7 @@ static void divDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::div);
+        assertArraysEquals(r, a, b, Double256VectorTests::div);
     }
 
 
@@ -1665,7 +1665,7 @@ static void DIVDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1683,7 +1683,7 @@ static void divDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::div);
     }
 
 
@@ -1706,7 +1706,7 @@ static void FIRST_NONZERODouble256VectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Double256VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1726,7 +1726,7 @@ static void FIRST_NONZERODouble256VectorTestsMasked(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1748,7 +1748,7 @@ static void addDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1765,7 +1765,7 @@ static void addDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1779,7 +1779,7 @@ static void subDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1796,7 +1796,7 @@ static void subDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1810,7 +1810,7 @@ static void mulDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1827,7 +1827,7 @@ static void mulDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::mul);
     }
 
 
@@ -1842,7 +1842,7 @@ static void divDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::div);
     }
 
 
@@ -1861,7 +1861,7 @@ static void divDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::div);
     }
 
 
@@ -1884,7 +1884,7 @@ static void ADDDouble256VectorTestsBroadcastLongSmokeTest(IntFunction<double[]>
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Double256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Double256VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void ADDDouble256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double256VectorTests::ADD);
     }
 
 
@@ -1957,7 +1957,7 @@ static void MINDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::MIN);
+        assertArraysEquals(r, a, b, Double256VectorTests::MIN);
     }
     static double min(double a, double b) {
         return (double)(Math.min(a, b));
@@ -1975,7 +1975,7 @@ static void minDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::min);
+        assertArraysEquals(r, a, b, Double256VectorTests::min);
     }
     static double MAX(double a, double b) {
         return (double)(Math.max(a, b));
@@ -1995,7 +1995,7 @@ static void MAXDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::MAX);
+        assertArraysEquals(r, a, b, Double256VectorTests::MAX);
     }
     static double max(double a, double b) {
         return (double)(Math.max(a, b));
@@ -2013,7 +2013,7 @@ static void maxDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::max);
+        assertArraysEquals(r, a, b, Double256VectorTests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2027,7 +2027,7 @@ static void MINDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void minDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2055,7 +2055,7 @@ static void MAXDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2069,7 +2069,7 @@ static void maxDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::max);
     }
 
 
@@ -2121,7 +2121,7 @@ static void ADDReduceDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double256VectorTests::ADDReduce, Double256VectorTests::ADDReduceAll);
     }
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2165,7 +2165,7 @@ static void ADDReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double256VectorTests::ADDReduceMasked, Double256VectorTests::ADDReduceAllMasked);
     }
     static double MULReduce(double[] a, int idx) {
@@ -2206,7 +2206,7 @@ static void MULReduceDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double256VectorTests::MULReduce, Double256VectorTests::MULReduceAll);
     }
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2250,7 +2250,7 @@ static void MULReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double256VectorTests::MULReduceMasked, Double256VectorTests::MULReduceAllMasked);
     }
     static double MINReduce(double[] a, int idx) {
@@ -2291,7 +2291,7 @@ static void MINReduceDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double256VectorTests::MINReduce, Double256VectorTests::MINReduceAll);
     }
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2336,7 +2336,7 @@ static void MINReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double256VectorTests::MINReduceMasked, Double256VectorTests::MINReduceAllMasked);
     }
     static double MAXReduce(double[] a, int idx) {
@@ -2377,7 +2377,7 @@ static void MAXReduceDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double256VectorTests::MAXReduce, Double256VectorTests::MAXReduceAll);
     }
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2422,7 +2422,7 @@ static void MAXReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double256VectorTests::MAXReduceMasked, Double256VectorTests::MAXReduceAllMasked);
     }
 
@@ -2442,7 +2442,7 @@ static void withDouble256VectorTests(IntFunction<double []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (double)4, 0);
+        assertInsertArraysEquals(r, a, (double)4, 0);
     }
     static boolean testIS_DEFAULT(double a) {
         return bits(a)==0;
@@ -3108,7 +3108,7 @@ static void blendDouble256VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
@@ -3125,7 +3125,7 @@ static void RearrangeDouble256VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
@@ -3143,7 +3143,7 @@ static void RearrangeDouble256VectorTestsMaskedSmokeTest(IntFunction<double[]> f
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "doubleUnaryOpProvider")
     static void getDouble256VectorTests(IntFunction<double[]> fa) {
@@ -3298,7 +3298,7 @@ static void getDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double256VectorTests::get);
+        assertArraysEquals(r, a, Double256VectorTests::get);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -3312,7 +3312,7 @@ static void BroadcastDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3359,7 +3359,7 @@ static void sliceUnaryDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Double256VectorTests::sliceUnary);
     }
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3388,7 +3388,7 @@ static void sliceBinaryDouble256VectorTestsBinary(IntFunction<double[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Double256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Double256VectorTests::sliceBinary);
     }
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3421,7 +3421,7 @@ static void sliceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Double256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Double256VectorTests::slice);
     }
     static double[] unsliceUnary(double[] a, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3448,7 +3448,7 @@ static void unsliceUnaryDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Double256VectorTests::unsliceUnary);
     }
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3487,7 +3487,7 @@ static void unsliceBinaryDouble256VectorTestsBinary(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Double256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Double256VectorTests::unsliceBinary);
     }
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3543,7 +3543,7 @@ static void unsliceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Double256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Double256VectorTests::unslice);
     }
 
     static double SIN(double a) {
@@ -3566,7 +3566,7 @@ static void SINDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::SIN, Double256VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::SIN, Double256VectorTests::strictSIN);
     }
 
 
@@ -3590,7 +3590,7 @@ static void EXPDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::EXP, Double256VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::EXP, Double256VectorTests::strictEXP);
     }
 
 
@@ -3614,7 +3614,7 @@ static void LOG1PDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::LOG1P, Double256VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::LOG1P, Double256VectorTests::strictLOG1P);
     }
 
 
@@ -3638,7 +3638,7 @@ static void LOGDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::LOG, Double256VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::LOG, Double256VectorTests::strictLOG);
     }
 
 
@@ -3662,7 +3662,7 @@ static void LOG10Double256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::LOG10, Double256VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::LOG10, Double256VectorTests::strictLOG10);
     }
 
 
@@ -3686,7 +3686,7 @@ static void EXPM1Double256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::EXPM1, Double256VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::EXPM1, Double256VectorTests::strictEXPM1);
     }
 
 
@@ -3710,7 +3710,7 @@ static void COSDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::COS, Double256VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::COS, Double256VectorTests::strictCOS);
     }
 
 
@@ -3734,7 +3734,7 @@ static void TANDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::TAN, Double256VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::TAN, Double256VectorTests::strictTAN);
     }
 
 
@@ -3758,7 +3758,7 @@ static void SINHDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::SINH, Double256VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::SINH, Double256VectorTests::strictSINH);
     }
 
 
@@ -3782,7 +3782,7 @@ static void COSHDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::COSH, Double256VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::COSH, Double256VectorTests::strictCOSH);
     }
 
 
@@ -3806,7 +3806,7 @@ static void TANHDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::TANH, Double256VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::TANH, Double256VectorTests::strictTANH);
     }
 
 
@@ -3830,7 +3830,7 @@ static void ASINDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::ASIN, Double256VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::ASIN, Double256VectorTests::strictASIN);
     }
 
 
@@ -3854,7 +3854,7 @@ static void ACOSDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::ACOS, Double256VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::ACOS, Double256VectorTests::strictACOS);
     }
 
 
@@ -3878,7 +3878,7 @@ static void ATANDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::ATAN, Double256VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::ATAN, Double256VectorTests::strictATAN);
     }
 
 
@@ -3902,7 +3902,7 @@ static void CBRTDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double256VectorTests::CBRT, Double256VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::CBRT, Double256VectorTests::strictCBRT);
     }
 
 
@@ -3928,7 +3928,7 @@ static void HYPOTDouble256VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double256VectorTests::HYPOT, Double256VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::HYPOT, Double256VectorTests::strictHYPOT);
     }
 
 
@@ -3955,7 +3955,7 @@ static void POWDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double256VectorTests::POW, Double256VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::POW, Double256VectorTests::strictPOW);
     }
 
     static double pow(double a, double b) {
@@ -3980,7 +3980,7 @@ static void powDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double256VectorTests::pow, Double256VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::pow, Double256VectorTests::strictpow);
     }
 
 
@@ -4007,7 +4007,7 @@ static void ATAN2Double256VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double256VectorTests::ATAN2, Double256VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::ATAN2, Double256VectorTests::strictATAN2);
     }
 
 
@@ -4023,7 +4023,7 @@ static void POWDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double256VectorTests::POW, Double256VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::POW, Double256VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -4037,7 +4037,7 @@ static void powDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double256VectorTests::pow, Double256VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::pow, Double256VectorTests::strictpow);
     }
 
 
@@ -4073,7 +4073,7 @@ static void FMADouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, c, r, Double256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Double256VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4096,7 +4096,7 @@ static void fmaDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Double256VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Double256VectorTests::fma);
     }
 
 
@@ -4126,7 +4126,7 @@ static void FMADouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Double256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
     }
 
 
@@ -4145,7 +4145,7 @@ static void FMADouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Double256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Double256VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
@@ -4160,7 +4160,7 @@ static void FMADouble256VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> f
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Double256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Double256VectorTests::FMA);
     }
 
 
@@ -4180,7 +4180,7 @@ static void FMADouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Double256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
@@ -4199,7 +4199,7 @@ static void FMADouble256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<doubl
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Double256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
     }
 
 
@@ -4224,7 +4224,7 @@ static void FMADouble256VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double256VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble256VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4245,7 +4245,7 @@ static void fmaDouble256VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double256VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double256VectorTests::fma);
     }
 
 
@@ -4271,7 +4271,7 @@ static void FMADouble256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<do
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Double256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
     }
 
 
@@ -4297,7 +4297,7 @@ static void NEGDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double256VectorTests::NEG);
+        assertArraysEquals(r, a, Double256VectorTests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4312,7 +4312,7 @@ static void negDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double256VectorTests::neg);
+        assertArraysEquals(r, a, Double256VectorTests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void NEGMaskedDouble256VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Double256VectorTests::NEG);
     }
 
     static double ABS(double a) {
@@ -4353,7 +4353,7 @@ static void ABSDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double256VectorTests::ABS);
+        assertArraysEquals(r, a, Double256VectorTests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4368,7 +4368,7 @@ static void absDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double256VectorTests::abs);
+        assertArraysEquals(r, a, Double256VectorTests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4386,7 +4386,7 @@ static void ABSMaskedDouble256VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Double256VectorTests::ABS);
     }
 
 
@@ -4418,7 +4418,7 @@ static void SQRTDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double256VectorTests::SQRT);
+        assertArraysEquals(r, a, Double256VectorTests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4433,7 +4433,7 @@ static void sqrtDouble256VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double256VectorTests::sqrt);
+        assertArraysEquals(r, a, Double256VectorTests::sqrt);
     }
 
 
@@ -4453,7 +4453,7 @@ static void SQRTMaskedDouble256VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double256VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Double256VectorTests::SQRT);
     }
 
     static double[] gather(double a[], int ix, int[] b, int iy) {
@@ -4478,7 +4478,7 @@ static void gatherDouble256VectorTests(IntFunction<double[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::gather);
+        assertArraysEquals(r, a, b, Double256VectorTests::gather);
     }
     static double[] gatherMasked(double a[], int ix, boolean[] mask, int[] b, int iy) {
         double[] res = new double[SPECIES.length()];
@@ -4506,7 +4506,7 @@ static void gatherMaskedDouble256VectorTests(IntFunction<double[]> fa, BiFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::gatherMasked);
     }
 
     static double[] scatter(double a[], int ix, int[] b, int iy) {
@@ -4531,7 +4531,7 @@ static void scatterDouble256VectorTests(IntFunction<double[]> fa, BiFunction<Int
             }
         }
 
-        assertArraysEquals(a, b, r, Double256VectorTests::scatter);
+        assertArraysEquals(r, a, b, Double256VectorTests::scatter);
     }
 
     static double[] scatterMasked(double r[], double a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4569,7 +4569,7 @@ static void scatterMaskedDouble256VectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double256VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Double256VectorTests::scatterMasked);
     }
 
 
@@ -4611,8 +4611,8 @@ static void toIntArrayDouble256VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4622,8 +4622,8 @@ static void toLongArrayDouble256VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4690,7 +4690,7 @@ static void ADDReduceLongDouble256VectorTests(IntFunction<double[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Double256VectorTests::ADDReduceLong, Double256VectorTests::ADDReduceAllLong);
     }
 
@@ -4731,7 +4731,7 @@ static void ADDReduceLongDouble256VectorTestsMasked(IntFunction<double[]> fa, In
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Double256VectorTests::ADDReduceLongMasked, Double256VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4743,7 +4743,7 @@ static void BroadcastLongDouble256VectorTestsSmokeTest(IntFunction<double[]> fa)
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -4761,7 +4761,7 @@ static void blendDouble256VectorTestsBroadcastLongSmokeTest(IntFunction<double[]
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double256VectorTests::blend);
     }
 
 
@@ -4778,7 +4778,7 @@ static void SelectFromDouble256VectorTests(IntFunction<double[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
@@ -4797,7 +4797,7 @@ static void SelectFromDouble256VectorTestsMaskedSmokeTest(IntFunction<double[]>
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4874,7 +4874,7 @@ static void maskEqDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFu
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Double256VectorTests::beq);
+        assertArraysEquals(r, a, b, Double256VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java
index 50a74c78d2e86..f2b75b847e0f8 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Double512VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (512 / 8));
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(double[] a, double[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<double[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new double[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<double[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorTests.java b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
index 280582e050f7a..86975ef14ee8e 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         double apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         double[] apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         double apply(double[] a);
     }
 
-    static void assertReductionArraysEquals(double[] a, double[] b, double c,
+    static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         double apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(double[] a, double[] b, double c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(double[] r, double rc, double[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(double[] a);
     }
 
-    static void assertReductionLongArraysEquals(double[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, double[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(double[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, double[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(double[] a, double[] b, double element, int index) {
+    static void assertInsertArraysEquals(double[] r, double[] a, double element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boo
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertBroadcastArraysEquals(double[]a, double[]r) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBin
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, bool
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, F
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, b
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(double actual, double expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf,
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, F
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         double apply(double[] a, int b);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FBinArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         double[] apply(double[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         double[] apply(double[] r, double[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         }
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         double[] apply(double[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         double[] apply(double[] a, double[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, F
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         double[] apply(double[] a, double[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, b
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         double[] apply(double[] a, double[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         double[] apply(double[] a, double[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(double[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(double[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1396,7 +1396,7 @@ static void ADDDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::ADD);
+        assertArraysEquals(r, a, b, Double512VectorTests::ADD);
     }
     static double add(double a, double b) {
         return (double)(a + b);
@@ -1414,7 +1414,7 @@ static void addDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::add);
+        assertArraysEquals(r, a, b, Double512VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1434,7 +1434,7 @@ static void ADDDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1452,7 +1452,7 @@ static void addDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::add);
     }
     static double SUB(double a, double b) {
         return (double)(a - b);
@@ -1472,7 +1472,7 @@ static void SUBDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::SUB);
+        assertArraysEquals(r, a, b, Double512VectorTests::SUB);
     }
     static double sub(double a, double b) {
         return (double)(a - b);
@@ -1490,7 +1490,7 @@ static void subDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::sub);
+        assertArraysEquals(r, a, b, Double512VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1510,7 +1510,7 @@ static void SUBDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1528,7 +1528,7 @@ static void subDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::sub);
     }
     static double MUL(double a, double b) {
         return (double)(a * b);
@@ -1548,7 +1548,7 @@ static void MULDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::MUL);
+        assertArraysEquals(r, a, b, Double512VectorTests::MUL);
     }
     static double mul(double a, double b) {
         return (double)(a * b);
@@ -1566,7 +1566,7 @@ static void mulDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::mul);
+        assertArraysEquals(r, a, b, Double512VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1586,7 +1586,7 @@ static void MULDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1604,7 +1604,7 @@ static void mulDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1625,7 +1625,7 @@ static void DIVDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::DIV);
+        assertArraysEquals(r, a, b, Double512VectorTests::DIV);
     }
     static double div(double a, double b) {
         return (double)(a / b);
@@ -1643,7 +1643,7 @@ static void divDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::div);
+        assertArraysEquals(r, a, b, Double512VectorTests::div);
     }
 
 
@@ -1665,7 +1665,7 @@ static void DIVDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1683,7 +1683,7 @@ static void divDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::div);
     }
 
 
@@ -1706,7 +1706,7 @@ static void FIRST_NONZERODouble512VectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Double512VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1726,7 +1726,7 @@ static void FIRST_NONZERODouble512VectorTestsMasked(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1748,7 +1748,7 @@ static void addDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1765,7 +1765,7 @@ static void addDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1779,7 +1779,7 @@ static void subDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1796,7 +1796,7 @@ static void subDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1810,7 +1810,7 @@ static void mulDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1827,7 +1827,7 @@ static void mulDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::mul);
     }
 
 
@@ -1842,7 +1842,7 @@ static void divDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::div);
     }
 
 
@@ -1861,7 +1861,7 @@ static void divDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::div);
     }
 
 
@@ -1884,7 +1884,7 @@ static void ADDDouble512VectorTestsBroadcastLongSmokeTest(IntFunction<double[]>
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Double512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Double512VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void ADDDouble512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double512VectorTests::ADD);
     }
 
 
@@ -1957,7 +1957,7 @@ static void MINDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::MIN);
+        assertArraysEquals(r, a, b, Double512VectorTests::MIN);
     }
     static double min(double a, double b) {
         return (double)(Math.min(a, b));
@@ -1975,7 +1975,7 @@ static void minDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::min);
+        assertArraysEquals(r, a, b, Double512VectorTests::min);
     }
     static double MAX(double a, double b) {
         return (double)(Math.max(a, b));
@@ -1995,7 +1995,7 @@ static void MAXDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::MAX);
+        assertArraysEquals(r, a, b, Double512VectorTests::MAX);
     }
     static double max(double a, double b) {
         return (double)(Math.max(a, b));
@@ -2013,7 +2013,7 @@ static void maxDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::max);
+        assertArraysEquals(r, a, b, Double512VectorTests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2027,7 +2027,7 @@ static void MINDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void minDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2055,7 +2055,7 @@ static void MAXDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2069,7 +2069,7 @@ static void maxDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::max);
     }
 
 
@@ -2121,7 +2121,7 @@ static void ADDReduceDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double512VectorTests::ADDReduce, Double512VectorTests::ADDReduceAll);
     }
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2165,7 +2165,7 @@ static void ADDReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double512VectorTests::ADDReduceMasked, Double512VectorTests::ADDReduceAllMasked);
     }
     static double MULReduce(double[] a, int idx) {
@@ -2206,7 +2206,7 @@ static void MULReduceDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double512VectorTests::MULReduce, Double512VectorTests::MULReduceAll);
     }
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2250,7 +2250,7 @@ static void MULReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double512VectorTests::MULReduceMasked, Double512VectorTests::MULReduceAllMasked);
     }
     static double MINReduce(double[] a, int idx) {
@@ -2291,7 +2291,7 @@ static void MINReduceDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double512VectorTests::MINReduce, Double512VectorTests::MINReduceAll);
     }
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2336,7 +2336,7 @@ static void MINReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double512VectorTests::MINReduceMasked, Double512VectorTests::MINReduceAllMasked);
     }
     static double MAXReduce(double[] a, int idx) {
@@ -2377,7 +2377,7 @@ static void MAXReduceDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double512VectorTests::MAXReduce, Double512VectorTests::MAXReduceAll);
     }
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2422,7 +2422,7 @@ static void MAXReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double512VectorTests::MAXReduceMasked, Double512VectorTests::MAXReduceAllMasked);
     }
 
@@ -2442,7 +2442,7 @@ static void withDouble512VectorTests(IntFunction<double []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (double)4, 0);
+        assertInsertArraysEquals(r, a, (double)4, 0);
     }
     static boolean testIS_DEFAULT(double a) {
         return bits(a)==0;
@@ -3108,7 +3108,7 @@ static void blendDouble512VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
@@ -3125,7 +3125,7 @@ static void RearrangeDouble512VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
@@ -3143,7 +3143,7 @@ static void RearrangeDouble512VectorTestsMaskedSmokeTest(IntFunction<double[]> f
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "doubleUnaryOpProvider")
     static void getDouble512VectorTests(IntFunction<double[]> fa) {
@@ -3298,7 +3298,7 @@ static void getDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double512VectorTests::get);
+        assertArraysEquals(r, a, Double512VectorTests::get);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -3312,7 +3312,7 @@ static void BroadcastDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3359,7 +3359,7 @@ static void sliceUnaryDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Double512VectorTests::sliceUnary);
     }
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3388,7 +3388,7 @@ static void sliceBinaryDouble512VectorTestsBinary(IntFunction<double[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Double512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Double512VectorTests::sliceBinary);
     }
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3421,7 +3421,7 @@ static void sliceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Double512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Double512VectorTests::slice);
     }
     static double[] unsliceUnary(double[] a, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3448,7 +3448,7 @@ static void unsliceUnaryDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Double512VectorTests::unsliceUnary);
     }
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3487,7 +3487,7 @@ static void unsliceBinaryDouble512VectorTestsBinary(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Double512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Double512VectorTests::unsliceBinary);
     }
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3543,7 +3543,7 @@ static void unsliceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Double512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Double512VectorTests::unslice);
     }
 
     static double SIN(double a) {
@@ -3566,7 +3566,7 @@ static void SINDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::SIN, Double512VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::SIN, Double512VectorTests::strictSIN);
     }
 
 
@@ -3590,7 +3590,7 @@ static void EXPDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::EXP, Double512VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::EXP, Double512VectorTests::strictEXP);
     }
 
 
@@ -3614,7 +3614,7 @@ static void LOG1PDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::LOG1P, Double512VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::LOG1P, Double512VectorTests::strictLOG1P);
     }
 
 
@@ -3638,7 +3638,7 @@ static void LOGDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::LOG, Double512VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::LOG, Double512VectorTests::strictLOG);
     }
 
 
@@ -3662,7 +3662,7 @@ static void LOG10Double512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::LOG10, Double512VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::LOG10, Double512VectorTests::strictLOG10);
     }
 
 
@@ -3686,7 +3686,7 @@ static void EXPM1Double512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::EXPM1, Double512VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::EXPM1, Double512VectorTests::strictEXPM1);
     }
 
 
@@ -3710,7 +3710,7 @@ static void COSDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::COS, Double512VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::COS, Double512VectorTests::strictCOS);
     }
 
 
@@ -3734,7 +3734,7 @@ static void TANDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::TAN, Double512VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::TAN, Double512VectorTests::strictTAN);
     }
 
 
@@ -3758,7 +3758,7 @@ static void SINHDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::SINH, Double512VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::SINH, Double512VectorTests::strictSINH);
     }
 
 
@@ -3782,7 +3782,7 @@ static void COSHDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::COSH, Double512VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::COSH, Double512VectorTests::strictCOSH);
     }
 
 
@@ -3806,7 +3806,7 @@ static void TANHDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::TANH, Double512VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::TANH, Double512VectorTests::strictTANH);
     }
 
 
@@ -3830,7 +3830,7 @@ static void ASINDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::ASIN, Double512VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::ASIN, Double512VectorTests::strictASIN);
     }
 
 
@@ -3854,7 +3854,7 @@ static void ACOSDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::ACOS, Double512VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::ACOS, Double512VectorTests::strictACOS);
     }
 
 
@@ -3878,7 +3878,7 @@ static void ATANDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::ATAN, Double512VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::ATAN, Double512VectorTests::strictATAN);
     }
 
 
@@ -3902,7 +3902,7 @@ static void CBRTDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double512VectorTests::CBRT, Double512VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::CBRT, Double512VectorTests::strictCBRT);
     }
 
 
@@ -3928,7 +3928,7 @@ static void HYPOTDouble512VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double512VectorTests::HYPOT, Double512VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::HYPOT, Double512VectorTests::strictHYPOT);
     }
 
 
@@ -3955,7 +3955,7 @@ static void POWDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double512VectorTests::POW, Double512VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::POW, Double512VectorTests::strictPOW);
     }
 
     static double pow(double a, double b) {
@@ -3980,7 +3980,7 @@ static void powDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double512VectorTests::pow, Double512VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::pow, Double512VectorTests::strictpow);
     }
 
 
@@ -4007,7 +4007,7 @@ static void ATAN2Double512VectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double512VectorTests::ATAN2, Double512VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::ATAN2, Double512VectorTests::strictATAN2);
     }
 
 
@@ -4023,7 +4023,7 @@ static void POWDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double512VectorTests::POW, Double512VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::POW, Double512VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -4037,7 +4037,7 @@ static void powDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double512VectorTests::pow, Double512VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::pow, Double512VectorTests::strictpow);
     }
 
 
@@ -4073,7 +4073,7 @@ static void FMADouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, c, r, Double512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Double512VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4096,7 +4096,7 @@ static void fmaDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Double512VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Double512VectorTests::fma);
     }
 
 
@@ -4126,7 +4126,7 @@ static void FMADouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Double512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
     }
 
 
@@ -4145,7 +4145,7 @@ static void FMADouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Double512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Double512VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
@@ -4160,7 +4160,7 @@ static void FMADouble512VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> f
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Double512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Double512VectorTests::FMA);
     }
 
 
@@ -4180,7 +4180,7 @@ static void FMADouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Double512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
@@ -4199,7 +4199,7 @@ static void FMADouble512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<doubl
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Double512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
     }
 
 
@@ -4224,7 +4224,7 @@ static void FMADouble512VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double512VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble512VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4245,7 +4245,7 @@ static void fmaDouble512VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double512VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double512VectorTests::fma);
     }
 
 
@@ -4271,7 +4271,7 @@ static void FMADouble512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<do
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Double512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
     }
 
 
@@ -4297,7 +4297,7 @@ static void NEGDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double512VectorTests::NEG);
+        assertArraysEquals(r, a, Double512VectorTests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4312,7 +4312,7 @@ static void negDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double512VectorTests::neg);
+        assertArraysEquals(r, a, Double512VectorTests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void NEGMaskedDouble512VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Double512VectorTests::NEG);
     }
 
     static double ABS(double a) {
@@ -4353,7 +4353,7 @@ static void ABSDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double512VectorTests::ABS);
+        assertArraysEquals(r, a, Double512VectorTests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4368,7 +4368,7 @@ static void absDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double512VectorTests::abs);
+        assertArraysEquals(r, a, Double512VectorTests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4386,7 +4386,7 @@ static void ABSMaskedDouble512VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Double512VectorTests::ABS);
     }
 
 
@@ -4418,7 +4418,7 @@ static void SQRTDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double512VectorTests::SQRT);
+        assertArraysEquals(r, a, Double512VectorTests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4433,7 +4433,7 @@ static void sqrtDouble512VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double512VectorTests::sqrt);
+        assertArraysEquals(r, a, Double512VectorTests::sqrt);
     }
 
 
@@ -4453,7 +4453,7 @@ static void SQRTMaskedDouble512VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double512VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Double512VectorTests::SQRT);
     }
 
     static double[] gather(double a[], int ix, int[] b, int iy) {
@@ -4478,7 +4478,7 @@ static void gatherDouble512VectorTests(IntFunction<double[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::gather);
+        assertArraysEquals(r, a, b, Double512VectorTests::gather);
     }
     static double[] gatherMasked(double a[], int ix, boolean[] mask, int[] b, int iy) {
         double[] res = new double[SPECIES.length()];
@@ -4506,7 +4506,7 @@ static void gatherMaskedDouble512VectorTests(IntFunction<double[]> fa, BiFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::gatherMasked);
     }
 
     static double[] scatter(double a[], int ix, int[] b, int iy) {
@@ -4531,7 +4531,7 @@ static void scatterDouble512VectorTests(IntFunction<double[]> fa, BiFunction<Int
             }
         }
 
-        assertArraysEquals(a, b, r, Double512VectorTests::scatter);
+        assertArraysEquals(r, a, b, Double512VectorTests::scatter);
     }
 
     static double[] scatterMasked(double r[], double a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4569,7 +4569,7 @@ static void scatterMaskedDouble512VectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double512VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Double512VectorTests::scatterMasked);
     }
 
 
@@ -4611,8 +4611,8 @@ static void toIntArrayDouble512VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4622,8 +4622,8 @@ static void toLongArrayDouble512VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4690,7 +4690,7 @@ static void ADDReduceLongDouble512VectorTests(IntFunction<double[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Double512VectorTests::ADDReduceLong, Double512VectorTests::ADDReduceAllLong);
     }
 
@@ -4731,7 +4731,7 @@ static void ADDReduceLongDouble512VectorTestsMasked(IntFunction<double[]> fa, In
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Double512VectorTests::ADDReduceLongMasked, Double512VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4743,7 +4743,7 @@ static void BroadcastLongDouble512VectorTestsSmokeTest(IntFunction<double[]> fa)
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -4761,7 +4761,7 @@ static void blendDouble512VectorTestsBroadcastLongSmokeTest(IntFunction<double[]
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double512VectorTests::blend);
     }
 
 
@@ -4778,7 +4778,7 @@ static void SelectFromDouble512VectorTests(IntFunction<double[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
@@ -4797,7 +4797,7 @@ static void SelectFromDouble512VectorTestsMaskedSmokeTest(IntFunction<double[]>
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4874,7 +4874,7 @@ static void maskEqDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFu
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Double512VectorTests::beq);
+        assertArraysEquals(r, a, b, Double512VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java
index 50804258349ba..2716064a7815c 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Double64VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (64 / 8));
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(double[] a, double[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<double[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new double[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<double[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorTests.java b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
index 91cb65bf84bb1..a4c21b5ff9862 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         double apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         double[] apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         double apply(double[] a);
     }
 
-    static void assertReductionArraysEquals(double[] a, double[] b, double c,
+    static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         double apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(double[] a, double[] b, double c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(double[] r, double rc, double[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(double[] a);
     }
 
-    static void assertReductionLongArraysEquals(double[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, double[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(double[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, double[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(double[] a, double[] b, double element, int index) {
+    static void assertInsertArraysEquals(double[] r, double[] a, double element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boo
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertBroadcastArraysEquals(double[]a, double[]r) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBin
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, bool
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, F
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, b
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(double actual, double expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf,
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, F
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         double apply(double[] a, int b);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FBinArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         double[] apply(double[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         double[] apply(double[] r, double[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         }
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         double[] apply(double[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         double[] apply(double[] a, double[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, F
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         double[] apply(double[] a, double[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, b
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         double[] apply(double[] a, double[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         double[] apply(double[] a, double[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(double[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(double[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1396,7 +1396,7 @@ static void ADDDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::ADD);
+        assertArraysEquals(r, a, b, Double64VectorTests::ADD);
     }
     static double add(double a, double b) {
         return (double)(a + b);
@@ -1414,7 +1414,7 @@ static void addDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::add);
+        assertArraysEquals(r, a, b, Double64VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1434,7 +1434,7 @@ static void ADDDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1452,7 +1452,7 @@ static void addDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::add);
     }
     static double SUB(double a, double b) {
         return (double)(a - b);
@@ -1472,7 +1472,7 @@ static void SUBDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::SUB);
+        assertArraysEquals(r, a, b, Double64VectorTests::SUB);
     }
     static double sub(double a, double b) {
         return (double)(a - b);
@@ -1490,7 +1490,7 @@ static void subDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::sub);
+        assertArraysEquals(r, a, b, Double64VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1510,7 +1510,7 @@ static void SUBDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1528,7 +1528,7 @@ static void subDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::sub);
     }
     static double MUL(double a, double b) {
         return (double)(a * b);
@@ -1548,7 +1548,7 @@ static void MULDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::MUL);
+        assertArraysEquals(r, a, b, Double64VectorTests::MUL);
     }
     static double mul(double a, double b) {
         return (double)(a * b);
@@ -1566,7 +1566,7 @@ static void mulDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::mul);
+        assertArraysEquals(r, a, b, Double64VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1586,7 +1586,7 @@ static void MULDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1604,7 +1604,7 @@ static void mulDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1625,7 +1625,7 @@ static void DIVDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::DIV);
+        assertArraysEquals(r, a, b, Double64VectorTests::DIV);
     }
     static double div(double a, double b) {
         return (double)(a / b);
@@ -1643,7 +1643,7 @@ static void divDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::div);
+        assertArraysEquals(r, a, b, Double64VectorTests::div);
     }
 
 
@@ -1665,7 +1665,7 @@ static void DIVDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1683,7 +1683,7 @@ static void divDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::div);
     }
 
 
@@ -1706,7 +1706,7 @@ static void FIRST_NONZERODouble64VectorTests(IntFunction<double[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Double64VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1726,7 +1726,7 @@ static void FIRST_NONZERODouble64VectorTestsMasked(IntFunction<double[]> fa, Int
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1748,7 +1748,7 @@ static void addDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1765,7 +1765,7 @@ static void addDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1779,7 +1779,7 @@ static void subDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1796,7 +1796,7 @@ static void subDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1810,7 +1810,7 @@ static void mulDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1827,7 +1827,7 @@ static void mulDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::mul);
     }
 
 
@@ -1842,7 +1842,7 @@ static void divDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::div);
     }
 
 
@@ -1861,7 +1861,7 @@ static void divDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Double64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::div);
     }
 
 
@@ -1884,7 +1884,7 @@ static void ADDDouble64VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> f
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Double64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Double64VectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void ADDDouble64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doubl
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double64VectorTests::ADD);
     }
 
 
@@ -1957,7 +1957,7 @@ static void MINDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::MIN);
+        assertArraysEquals(r, a, b, Double64VectorTests::MIN);
     }
     static double min(double a, double b) {
         return (double)(Math.min(a, b));
@@ -1975,7 +1975,7 @@ static void minDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::min);
+        assertArraysEquals(r, a, b, Double64VectorTests::min);
     }
     static double MAX(double a, double b) {
         return (double)(Math.max(a, b));
@@ -1995,7 +1995,7 @@ static void MAXDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::MAX);
+        assertArraysEquals(r, a, b, Double64VectorTests::MAX);
     }
     static double max(double a, double b) {
         return (double)(Math.max(a, b));
@@ -2013,7 +2013,7 @@ static void maxDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::max);
+        assertArraysEquals(r, a, b, Double64VectorTests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2027,7 +2027,7 @@ static void MINDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void minDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2055,7 +2055,7 @@ static void MAXDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2069,7 +2069,7 @@ static void maxDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Double64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::max);
     }
 
 
@@ -2121,7 +2121,7 @@ static void ADDReduceDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double64VectorTests::ADDReduce, Double64VectorTests::ADDReduceAll);
     }
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2165,7 +2165,7 @@ static void ADDReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunc
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double64VectorTests::ADDReduceMasked, Double64VectorTests::ADDReduceAllMasked);
     }
     static double MULReduce(double[] a, int idx) {
@@ -2206,7 +2206,7 @@ static void MULReduceDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double64VectorTests::MULReduce, Double64VectorTests::MULReduceAll);
     }
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2250,7 +2250,7 @@ static void MULReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunc
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double64VectorTests::MULReduceMasked, Double64VectorTests::MULReduceAllMasked);
     }
     static double MINReduce(double[] a, int idx) {
@@ -2291,7 +2291,7 @@ static void MINReduceDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double64VectorTests::MINReduce, Double64VectorTests::MINReduceAll);
     }
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2336,7 +2336,7 @@ static void MINReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunc
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double64VectorTests::MINReduceMasked, Double64VectorTests::MINReduceAllMasked);
     }
     static double MAXReduce(double[] a, int idx) {
@@ -2377,7 +2377,7 @@ static void MAXReduceDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Double64VectorTests::MAXReduce, Double64VectorTests::MAXReduceAll);
     }
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2422,7 +2422,7 @@ static void MAXReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunc
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Double64VectorTests::MAXReduceMasked, Double64VectorTests::MAXReduceAllMasked);
     }
 
@@ -2442,7 +2442,7 @@ static void withDouble64VectorTests(IntFunction<double []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (double)4, 0);
+        assertInsertArraysEquals(r, a, (double)4, 0);
     }
     static boolean testIS_DEFAULT(double a) {
         return bits(a)==0;
@@ -3108,7 +3108,7 @@ static void blendDouble64VectorTests(IntFunction<double[]> fa, IntFunction<doubl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
@@ -3125,7 +3125,7 @@ static void RearrangeDouble64VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
@@ -3143,7 +3143,7 @@ static void RearrangeDouble64VectorTestsMaskedSmokeTest(IntFunction<double[]> fa
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "doubleUnaryOpProvider")
     static void getDouble64VectorTests(IntFunction<double[]> fa) {
@@ -3298,7 +3298,7 @@ static void getDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double64VectorTests::get);
+        assertArraysEquals(r, a, Double64VectorTests::get);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -3312,7 +3312,7 @@ static void BroadcastDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3359,7 +3359,7 @@ static void sliceUnaryDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Double64VectorTests::sliceUnary);
     }
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3388,7 +3388,7 @@ static void sliceBinaryDouble64VectorTestsBinary(IntFunction<double[]> fa, IntFu
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Double64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Double64VectorTests::sliceBinary);
     }
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3421,7 +3421,7 @@ static void sliceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Double64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Double64VectorTests::slice);
     }
     static double[] unsliceUnary(double[] a, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3448,7 +3448,7 @@ static void unsliceUnaryDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Double64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Double64VectorTests::unsliceUnary);
     }
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3487,7 +3487,7 @@ static void unsliceBinaryDouble64VectorTestsBinary(IntFunction<double[]> fa, Int
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Double64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Double64VectorTests::unsliceBinary);
     }
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3543,7 +3543,7 @@ static void unsliceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Double64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Double64VectorTests::unslice);
     }
 
     static double SIN(double a) {
@@ -3566,7 +3566,7 @@ static void SINDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::SIN, Double64VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::SIN, Double64VectorTests::strictSIN);
     }
 
 
@@ -3590,7 +3590,7 @@ static void EXPDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::EXP, Double64VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::EXP, Double64VectorTests::strictEXP);
     }
 
 
@@ -3614,7 +3614,7 @@ static void LOG1PDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::LOG1P, Double64VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::LOG1P, Double64VectorTests::strictLOG1P);
     }
 
 
@@ -3638,7 +3638,7 @@ static void LOGDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::LOG, Double64VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::LOG, Double64VectorTests::strictLOG);
     }
 
 
@@ -3662,7 +3662,7 @@ static void LOG10Double64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::LOG10, Double64VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::LOG10, Double64VectorTests::strictLOG10);
     }
 
 
@@ -3686,7 +3686,7 @@ static void EXPM1Double64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::EXPM1, Double64VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::EXPM1, Double64VectorTests::strictEXPM1);
     }
 
 
@@ -3710,7 +3710,7 @@ static void COSDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::COS, Double64VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::COS, Double64VectorTests::strictCOS);
     }
 
 
@@ -3734,7 +3734,7 @@ static void TANDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::TAN, Double64VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::TAN, Double64VectorTests::strictTAN);
     }
 
 
@@ -3758,7 +3758,7 @@ static void SINHDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::SINH, Double64VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::SINH, Double64VectorTests::strictSINH);
     }
 
 
@@ -3782,7 +3782,7 @@ static void COSHDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::COSH, Double64VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::COSH, Double64VectorTests::strictCOSH);
     }
 
 
@@ -3806,7 +3806,7 @@ static void TANHDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::TANH, Double64VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::TANH, Double64VectorTests::strictTANH);
     }
 
 
@@ -3830,7 +3830,7 @@ static void ASINDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::ASIN, Double64VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::ASIN, Double64VectorTests::strictASIN);
     }
 
 
@@ -3854,7 +3854,7 @@ static void ACOSDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::ACOS, Double64VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::ACOS, Double64VectorTests::strictACOS);
     }
 
 
@@ -3878,7 +3878,7 @@ static void ATANDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::ATAN, Double64VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::ATAN, Double64VectorTests::strictATAN);
     }
 
 
@@ -3902,7 +3902,7 @@ static void CBRTDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Double64VectorTests::CBRT, Double64VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::CBRT, Double64VectorTests::strictCBRT);
     }
 
 
@@ -3928,7 +3928,7 @@ static void HYPOTDouble64VectorTests(IntFunction<double[]> fa, IntFunction<doubl
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double64VectorTests::HYPOT, Double64VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::HYPOT, Double64VectorTests::strictHYPOT);
     }
 
 
@@ -3955,7 +3955,7 @@ static void POWDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double64VectorTests::POW, Double64VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::POW, Double64VectorTests::strictPOW);
     }
 
     static double pow(double a, double b) {
@@ -3980,7 +3980,7 @@ static void powDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double64VectorTests::pow, Double64VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::pow, Double64VectorTests::strictpow);
     }
 
 
@@ -4007,7 +4007,7 @@ static void ATAN2Double64VectorTests(IntFunction<double[]> fa, IntFunction<doubl
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Double64VectorTests::ATAN2, Double64VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::ATAN2, Double64VectorTests::strictATAN2);
     }
 
 
@@ -4023,7 +4023,7 @@ static void POWDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double64VectorTests::POW, Double64VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::POW, Double64VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -4037,7 +4037,7 @@ static void powDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Double64VectorTests::pow, Double64VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::pow, Double64VectorTests::strictpow);
     }
 
 
@@ -4073,7 +4073,7 @@ static void FMADouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             }
         }
 
-        assertArraysEquals(a, b, c, r, Double64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Double64VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4096,7 +4096,7 @@ static void fmaDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Double64VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Double64VectorTests::fma);
     }
 
 
@@ -4126,7 +4126,7 @@ static void FMADouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<d
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Double64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
     }
 
 
@@ -4145,7 +4145,7 @@ static void FMADouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, I
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Double64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Double64VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
@@ -4160,7 +4160,7 @@ static void FMADouble64VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> fa
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Double64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Double64VectorTests::FMA);
     }
 
 
@@ -4180,7 +4180,7 @@ static void FMADouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]>
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Double64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
@@ -4199,7 +4199,7 @@ static void FMADouble64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<double
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Double64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
     }
 
 
@@ -4224,7 +4224,7 @@ static void FMADouble64VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]>
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double64VectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDouble64VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4245,7 +4245,7 @@ static void fmaDouble64VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]>
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Double64VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Double64VectorTests::fma);
     }
 
 
@@ -4271,7 +4271,7 @@ static void FMADouble64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<dou
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Double64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
     }
 
 
@@ -4297,7 +4297,7 @@ static void NEGDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double64VectorTests::NEG);
+        assertArraysEquals(r, a, Double64VectorTests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4312,7 +4312,7 @@ static void negDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double64VectorTests::neg);
+        assertArraysEquals(r, a, Double64VectorTests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void NEGMaskedDouble64VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Double64VectorTests::NEG);
     }
 
     static double ABS(double a) {
@@ -4353,7 +4353,7 @@ static void ABSDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double64VectorTests::ABS);
+        assertArraysEquals(r, a, Double64VectorTests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4368,7 +4368,7 @@ static void absDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double64VectorTests::abs);
+        assertArraysEquals(r, a, Double64VectorTests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4386,7 +4386,7 @@ static void ABSMaskedDouble64VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Double64VectorTests::ABS);
     }
 
 
@@ -4418,7 +4418,7 @@ static void SQRTDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double64VectorTests::SQRT);
+        assertArraysEquals(r, a, Double64VectorTests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4433,7 +4433,7 @@ static void sqrtDouble64VectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Double64VectorTests::sqrt);
+        assertArraysEquals(r, a, Double64VectorTests::sqrt);
     }
 
 
@@ -4453,7 +4453,7 @@ static void SQRTMaskedDouble64VectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Double64VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Double64VectorTests::SQRT);
     }
 
     static double[] gather(double a[], int ix, int[] b, int iy) {
@@ -4478,7 +4478,7 @@ static void gatherDouble64VectorTests(IntFunction<double[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::gather);
+        assertArraysEquals(r, a, b, Double64VectorTests::gather);
     }
     static double[] gatherMasked(double a[], int ix, boolean[] mask, int[] b, int iy) {
         double[] res = new double[SPECIES.length()];
@@ -4506,7 +4506,7 @@ static void gatherMaskedDouble64VectorTests(IntFunction<double[]> fa, BiFunction
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::gatherMasked);
     }
 
     static double[] scatter(double a[], int ix, int[] b, int iy) {
@@ -4531,7 +4531,7 @@ static void scatterDouble64VectorTests(IntFunction<double[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, Double64VectorTests::scatter);
+        assertArraysEquals(r, a, b, Double64VectorTests::scatter);
     }
 
     static double[] scatterMasked(double r[], double a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4569,7 +4569,7 @@ static void scatterMaskedDouble64VectorTests(IntFunction<double[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Double64VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Double64VectorTests::scatterMasked);
     }
 
 
@@ -4611,8 +4611,8 @@ static void toIntArrayDouble64VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4622,8 +4622,8 @@ static void toLongArrayDouble64VectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4690,7 +4690,7 @@ static void ADDReduceLongDouble64VectorTests(IntFunction<double[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Double64VectorTests::ADDReduceLong, Double64VectorTests::ADDReduceAllLong);
     }
 
@@ -4731,7 +4731,7 @@ static void ADDReduceLongDouble64VectorTestsMasked(IntFunction<double[]> fa, Int
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Double64VectorTests::ADDReduceLongMasked, Double64VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4743,7 +4743,7 @@ static void BroadcastLongDouble64VectorTestsSmokeTest(IntFunction<double[]> fa)
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -4761,7 +4761,7 @@ static void blendDouble64VectorTestsBroadcastLongSmokeTest(IntFunction<double[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Double64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Double64VectorTests::blend);
     }
 
 
@@ -4778,7 +4778,7 @@ static void SelectFromDouble64VectorTests(IntFunction<double[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
@@ -4797,7 +4797,7 @@ static void SelectFromDouble64VectorTestsMaskedSmokeTest(IntFunction<double[]> f
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4874,7 +4874,7 @@ static void maskEqDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Double64VectorTests::beq);
+        assertArraysEquals(r, a, b, Double64VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java
index bfe58bb29a0c5..0e0a66f2bd74c 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,47 +67,25 @@ static VectorShape getMaxBit() {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (Max / 8));
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (double) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(double[] a, double[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (double) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -410,7 +388,7 @@ static void loadStoreArray(IntFunction<double[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -481,7 +459,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new double[a.length];
@@ -492,7 +470,7 @@ static void loadStoreMaskArray(IntFunction<double[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleMaskProviderForIOOBE")
@@ -565,7 +543,7 @@ static void loadStoreMask(IntFunction<double[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -589,7 +567,7 @@ static void loadStoreByteBuffer(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -676,7 +654,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -691,7 +669,7 @@ static void loadStoreByteBufferMask(IntFunction<double[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -807,7 +785,7 @@ static void loadStoreByteArray(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "doubleByteProviderForIOOBE")
@@ -888,7 +866,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -899,7 +877,7 @@ static void loadStoreByteArrayMask(IntFunction<double[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "doubleByteMaskProviderForIOOBE")
@@ -976,7 +954,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -987,7 +965,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
index 55a69ab1416c2..dbe35d51b2219 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ interface FUnOp {
         double apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -88,7 +88,7 @@ interface FUnArrayOp {
         double[] apply(double a);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -98,13 +98,13 @@ static void assertArraysEquals(double[] a, double[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(double[] r, double[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -123,17 +123,17 @@ interface FReductionAllOp {
         double apply(double[] a);
     }
 
-    static void assertReductionArraysEquals(double[] a, double[] b, double c,
+    static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -145,17 +145,17 @@ interface FReductionAllMaskedOp {
         double apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(double[] a, double[] b, double c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(double[] r, double rc, double[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -167,17 +167,17 @@ interface FReductionAllOpLong {
         long apply(double[] a);
     }
 
-    static void assertReductionLongArraysEquals(double[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, double[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -189,17 +189,17 @@ interface FReductionAllMaskedOpLong {
         long apply(double[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(double[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, double[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -207,37 +207,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(double[] a, double[] b, double element, int index) {
+    static void assertInsertArraysEquals(double[] r, double[] a, double element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -251,7 +251,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, int
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -265,7 +265,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(double[] r, double[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -285,7 +285,7 @@ static void assertRearrangeArraysEquals(double[] a, double[] r, int[] order, boo
         }
     }
 
-    static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(double[] r, double[] a, double[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -305,7 +305,7 @@ static void assertSelectFromArraysEquals(double[] a, double[] r, double[] order,
         }
     }
 
-    static void assertBroadcastArraysEquals(double[]a, double[]r) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -334,7 +334,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -345,7 +345,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -357,7 +357,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, FBin
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -369,11 +369,11 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -384,11 +384,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -402,11 +402,11 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] r, bool
         }
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -420,7 +420,7 @@ static void assertBroadcastLongArraysEquals(double[] a, double[] b, double[] r,
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -434,11 +434,11 @@ static void assertShiftArraysEquals(double[] a, double[] b, double[] r, FBinOp f
         }
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(double[] a, double[] b, double[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -464,7 +464,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -475,11 +475,11 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, F
         }
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -491,7 +491,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] c, double[] r, b
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -504,7 +504,7 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -517,12 +517,12 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -538,12 +538,12 @@ static void assertBroadcastArraysEquals(double[] a, double[] b, double[] c, doub
         }
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -559,7 +559,7 @@ static void assertAltBroadcastArraysEquals(double[] a, double[] b, double[] c, d
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -574,12 +574,12 @@ static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(double[] a, double[] b, double[] c, double[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(double[] r, double[] a, double[] b, double[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -618,7 +618,7 @@ static boolean isWithin1Ulp(double actual, double expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -632,7 +632,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] r, FUnOp mathf,
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -646,7 +646,7 @@ static void assertArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r, F
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(double[] a, double[] b, double[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(double[] r, double[] a, double[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -676,7 +676,7 @@ interface FBinArrayOp {
         double apply(double[] a, int b);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, FBinArrayOp f) {
+    static void assertArraysEquals(double[] r, double[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -691,7 +691,7 @@ interface FGatherScatterOp {
         double[] apply(double[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -718,7 +718,7 @@ interface FScatterMaskedOp {
         double[] apply(double[] r, double[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -728,7 +728,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -739,7 +739,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         }
     }
 
-    static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -749,7 +749,7 @@ static void assertArraysEquals(double[] a, int[] b, double[] r, boolean[] mask,
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -766,7 +766,7 @@ interface FLaneOp {
         double[] apply(double[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(double[] r, double[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -776,7 +776,7 @@ static void assertArraysEquals(double[] a, double[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -786,7 +786,7 @@ interface FLaneBop {
         double[] apply(double[] a, double[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -796,7 +796,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, F
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -807,7 +807,7 @@ interface FLaneMaskedBop {
         double[] apply(double[] a, double[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -817,7 +817,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, b
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -828,7 +828,7 @@ interface FLanePartBop {
         double[] apply(double[] a, double[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -838,7 +838,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -850,7 +850,7 @@ interface FLanePartMaskedBop {
         double[] apply(double[] a, double[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(double[] r, double[] a, double[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -860,7 +860,7 @@ static void assertArraysEquals(double[] a, double[] b, double[] r, int origin, i
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -902,7 +902,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(double[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -948,7 +948,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(double[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, double[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1401,7 +1401,7 @@ static void ADDDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::ADD);
     }
     static double add(double a, double b) {
         return (double)(a + b);
@@ -1419,7 +1419,7 @@ static void addDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::add);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1439,7 +1439,7 @@ static void ADDDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1457,7 +1457,7 @@ static void addDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::add);
     }
     static double SUB(double a, double b) {
         return (double)(a - b);
@@ -1477,7 +1477,7 @@ static void SUBDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::SUB);
     }
     static double sub(double a, double b) {
         return (double)(a - b);
@@ -1495,7 +1495,7 @@ static void subDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1515,7 +1515,7 @@ static void SUBDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1533,7 +1533,7 @@ static void subDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::sub);
     }
     static double MUL(double a, double b) {
         return (double)(a * b);
@@ -1553,7 +1553,7 @@ static void MULDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::MUL);
     }
     static double mul(double a, double b) {
         return (double)(a * b);
@@ -1571,7 +1571,7 @@ static void mulDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1591,7 +1591,7 @@ static void MULDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1609,7 +1609,7 @@ static void mulDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1630,7 +1630,7 @@ static void DIVDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::DIV);
     }
     static double div(double a, double b) {
         return (double)(a / b);
@@ -1648,7 +1648,7 @@ static void divDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::div);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::div);
     }
 
 
@@ -1670,7 +1670,7 @@ static void DIVDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1688,7 +1688,7 @@ static void divDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::div);
     }
 
 
@@ -1711,7 +1711,7 @@ static void FIRST_NONZERODoubleMaxVectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1731,7 +1731,7 @@ static void FIRST_NONZERODoubleMaxVectorTestsMasked(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::FIRST_NONZERO);
     }
 
 
@@ -1753,7 +1753,7 @@ static void addDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1770,7 +1770,7 @@ static void addDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, DoubleMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1784,7 +1784,7 @@ static void subDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1801,7 +1801,7 @@ static void subDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, DoubleMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -1815,7 +1815,7 @@ static void mulDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1832,7 +1832,7 @@ static void mulDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, DoubleMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::mul);
     }
 
 
@@ -1847,7 +1847,7 @@ static void divDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::div);
     }
 
 
@@ -1866,7 +1866,7 @@ static void divDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, DoubleMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::div);
     }
 
 
@@ -1889,7 +1889,7 @@ static void ADDDoubleMaxVectorTestsBroadcastLongSmokeTest(IntFunction<double[]>
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, DoubleMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, DoubleMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -1906,7 +1906,7 @@ static void ADDDoubleMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, DoubleMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleMaxVectorTests::ADD);
     }
 
 
@@ -1962,7 +1962,7 @@ static void MINDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::MIN);
     }
     static double min(double a, double b) {
         return (double)(Math.min(a, b));
@@ -1980,7 +1980,7 @@ static void minDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::min);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::min);
     }
     static double MAX(double a, double b) {
         return (double)(Math.max(a, b));
@@ -2000,7 +2000,7 @@ static void MAXDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::MAX);
     }
     static double max(double a, double b) {
         return (double)(Math.max(a, b));
@@ -2018,7 +2018,7 @@ static void maxDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::max);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2032,7 +2032,7 @@ static void MINDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2046,7 +2046,7 @@ static void minDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2060,7 +2060,7 @@ static void MAXDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -2074,7 +2074,7 @@ static void maxDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, DoubleMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::max);
     }
 
 
@@ -2126,7 +2126,7 @@ static void ADDReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 DoubleMaxVectorTests::ADDReduce, DoubleMaxVectorTests::ADDReduceAll);
     }
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2170,7 +2170,7 @@ static void ADDReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 DoubleMaxVectorTests::ADDReduceMasked, DoubleMaxVectorTests::ADDReduceAllMasked);
     }
     static double MULReduce(double[] a, int idx) {
@@ -2211,7 +2211,7 @@ static void MULReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 DoubleMaxVectorTests::MULReduce, DoubleMaxVectorTests::MULReduceAll);
     }
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2255,7 +2255,7 @@ static void MULReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 DoubleMaxVectorTests::MULReduceMasked, DoubleMaxVectorTests::MULReduceAllMasked);
     }
     static double MINReduce(double[] a, int idx) {
@@ -2296,7 +2296,7 @@ static void MINReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 DoubleMaxVectorTests::MINReduce, DoubleMaxVectorTests::MINReduceAll);
     }
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2341,7 +2341,7 @@ static void MINReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 DoubleMaxVectorTests::MINReduceMasked, DoubleMaxVectorTests::MINReduceAllMasked);
     }
     static double MAXReduce(double[] a, int idx) {
@@ -2382,7 +2382,7 @@ static void MAXReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 DoubleMaxVectorTests::MAXReduce, DoubleMaxVectorTests::MAXReduceAll);
     }
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2427,7 +2427,7 @@ static void MAXReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFun
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 DoubleMaxVectorTests::MAXReduceMasked, DoubleMaxVectorTests::MAXReduceAllMasked);
     }
 
@@ -2447,7 +2447,7 @@ static void withDoubleMaxVectorTests(IntFunction<double []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (double)4, 0);
+        assertInsertArraysEquals(r, a, (double)4, 0);
     }
     static boolean testIS_DEFAULT(double a) {
         return bits(a)==0;
@@ -3113,7 +3113,7 @@ static void blendDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
@@ -3130,7 +3130,7 @@ static void RearrangeDoubleMaxVectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
@@ -3148,7 +3148,7 @@ static void RearrangeDoubleMaxVectorTestsMaskedSmokeTest(IntFunction<double[]> f
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "doubleUnaryOpProvider")
     static void getDoubleMaxVectorTests(IntFunction<double[]> fa) {
@@ -3303,7 +3303,7 @@ static void getDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, DoubleMaxVectorTests::get);
+        assertArraysEquals(r, a, DoubleMaxVectorTests::get);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -3317,7 +3317,7 @@ static void BroadcastDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3364,7 +3364,7 @@ static void sliceUnaryDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, DoubleMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, DoubleMaxVectorTests::sliceUnary);
     }
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3393,7 +3393,7 @@ static void sliceBinaryDoubleMaxVectorTestsBinary(IntFunction<double[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, DoubleMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, DoubleMaxVectorTests::sliceBinary);
     }
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3426,7 +3426,7 @@ static void sliceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, DoubleMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, DoubleMaxVectorTests::slice);
     }
     static double[] unsliceUnary(double[] a, int origin, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3453,7 +3453,7 @@ static void unsliceUnaryDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, DoubleMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, DoubleMaxVectorTests::unsliceUnary);
     }
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3492,7 +3492,7 @@ static void unsliceBinaryDoubleMaxVectorTestsBinary(IntFunction<double[]> fa, In
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, DoubleMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, DoubleMaxVectorTests::unsliceBinary);
     }
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
         double[] res = new double[SPECIES.length()];
@@ -3548,7 +3548,7 @@ static void unsliceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, DoubleMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, DoubleMaxVectorTests::unslice);
     }
 
     static double SIN(double a) {
@@ -3571,7 +3571,7 @@ static void SINDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::SIN, DoubleMaxVectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::SIN, DoubleMaxVectorTests::strictSIN);
     }
 
 
@@ -3595,7 +3595,7 @@ static void EXPDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::EXP, DoubleMaxVectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::EXP, DoubleMaxVectorTests::strictEXP);
     }
 
 
@@ -3619,7 +3619,7 @@ static void LOG1PDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::LOG1P, DoubleMaxVectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::LOG1P, DoubleMaxVectorTests::strictLOG1P);
     }
 
 
@@ -3643,7 +3643,7 @@ static void LOGDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::LOG, DoubleMaxVectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::LOG, DoubleMaxVectorTests::strictLOG);
     }
 
 
@@ -3667,7 +3667,7 @@ static void LOG10DoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::LOG10, DoubleMaxVectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::LOG10, DoubleMaxVectorTests::strictLOG10);
     }
 
 
@@ -3691,7 +3691,7 @@ static void EXPM1DoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::EXPM1, DoubleMaxVectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::EXPM1, DoubleMaxVectorTests::strictEXPM1);
     }
 
 
@@ -3715,7 +3715,7 @@ static void COSDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::COS, DoubleMaxVectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::COS, DoubleMaxVectorTests::strictCOS);
     }
 
 
@@ -3739,7 +3739,7 @@ static void TANDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::TAN, DoubleMaxVectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::TAN, DoubleMaxVectorTests::strictTAN);
     }
 
 
@@ -3763,7 +3763,7 @@ static void SINHDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::SINH, DoubleMaxVectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::SINH, DoubleMaxVectorTests::strictSINH);
     }
 
 
@@ -3787,7 +3787,7 @@ static void COSHDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::COSH, DoubleMaxVectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::COSH, DoubleMaxVectorTests::strictCOSH);
     }
 
 
@@ -3811,7 +3811,7 @@ static void TANHDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::TANH, DoubleMaxVectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::TANH, DoubleMaxVectorTests::strictTANH);
     }
 
 
@@ -3835,7 +3835,7 @@ static void ASINDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::ASIN, DoubleMaxVectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::ASIN, DoubleMaxVectorTests::strictASIN);
     }
 
 
@@ -3859,7 +3859,7 @@ static void ACOSDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::ACOS, DoubleMaxVectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::ACOS, DoubleMaxVectorTests::strictACOS);
     }
 
 
@@ -3883,7 +3883,7 @@ static void ATANDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::ATAN, DoubleMaxVectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::ATAN, DoubleMaxVectorTests::strictATAN);
     }
 
 
@@ -3907,7 +3907,7 @@ static void CBRTDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, DoubleMaxVectorTests::CBRT, DoubleMaxVectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::CBRT, DoubleMaxVectorTests::strictCBRT);
     }
 
 
@@ -3933,7 +3933,7 @@ static void HYPOTDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, DoubleMaxVectorTests::HYPOT, DoubleMaxVectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::HYPOT, DoubleMaxVectorTests::strictHYPOT);
     }
 
 
@@ -3960,7 +3960,7 @@ static void POWDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, DoubleMaxVectorTests::POW, DoubleMaxVectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::POW, DoubleMaxVectorTests::strictPOW);
     }
 
     static double pow(double a, double b) {
@@ -3985,7 +3985,7 @@ static void powDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, DoubleMaxVectorTests::pow, DoubleMaxVectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::pow, DoubleMaxVectorTests::strictpow);
     }
 
 
@@ -4012,7 +4012,7 @@ static void ATAN2DoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<doub
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, DoubleMaxVectorTests::ATAN2, DoubleMaxVectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::ATAN2, DoubleMaxVectorTests::strictATAN2);
     }
 
 
@@ -4028,7 +4028,7 @@ static void POWDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, DoubleMaxVectorTests::POW, DoubleMaxVectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::POW, DoubleMaxVectorTests::strictPOW);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
@@ -4042,7 +4042,7 @@ static void powDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, DoubleMaxVectorTests::pow, DoubleMaxVectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::pow, DoubleMaxVectorTests::strictpow);
     }
 
 
@@ -4078,7 +4078,7 @@ static void FMADoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             }
         }
 
-        assertArraysEquals(a, b, c, r, DoubleMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4101,7 +4101,7 @@ static void fmaDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, DoubleMaxVectorTests::fma);
+        assertArraysEquals(r, a, b, c, DoubleMaxVectorTests::fma);
     }
 
 
@@ -4131,7 +4131,7 @@ static void FMADoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, DoubleMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
     }
 
 
@@ -4150,7 +4150,7 @@ static void FMADoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa,
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, DoubleMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
@@ -4165,7 +4165,7 @@ static void FMADoubleMaxVectorTestsAltBroadcastSmokeTest(IntFunction<double[]> f
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, DoubleMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
     }
 
 
@@ -4185,7 +4185,7 @@ static void FMADoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, DoubleMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
@@ -4204,7 +4204,7 @@ static void FMADoubleMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<doubl
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, DoubleMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
     }
 
 
@@ -4229,7 +4229,7 @@ static void FMADoubleMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, DoubleMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
     }
     @Test(dataProvider = "doubleTernaryOpProvider")
     static void fmaDoubleMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
@@ -4250,7 +4250,7 @@ static void fmaDoubleMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, DoubleMaxVectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::fma);
     }
 
 
@@ -4276,7 +4276,7 @@ static void FMADoubleMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<do
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, DoubleMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
     }
 
 
@@ -4302,7 +4302,7 @@ static void NEGDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, DoubleMaxVectorTests::NEG);
+        assertArraysEquals(r, a, DoubleMaxVectorTests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4317,7 +4317,7 @@ static void negDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, DoubleMaxVectorTests::neg);
+        assertArraysEquals(r, a, DoubleMaxVectorTests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4335,7 +4335,7 @@ static void NEGMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, DoubleMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, DoubleMaxVectorTests::NEG);
     }
 
     static double ABS(double a) {
@@ -4358,7 +4358,7 @@ static void ABSDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, DoubleMaxVectorTests::ABS);
+        assertArraysEquals(r, a, DoubleMaxVectorTests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4373,7 +4373,7 @@ static void absDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, DoubleMaxVectorTests::abs);
+        assertArraysEquals(r, a, DoubleMaxVectorTests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
@@ -4391,7 +4391,7 @@ static void ABSMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, DoubleMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, DoubleMaxVectorTests::ABS);
     }
 
 
@@ -4423,7 +4423,7 @@ static void SQRTDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, DoubleMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, DoubleMaxVectorTests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
@@ -4438,7 +4438,7 @@ static void sqrtDoubleMaxVectorTests(IntFunction<double[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, DoubleMaxVectorTests::sqrt);
+        assertArraysEquals(r, a, DoubleMaxVectorTests::sqrt);
     }
 
 
@@ -4458,7 +4458,7 @@ static void SQRTMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, DoubleMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, mask, DoubleMaxVectorTests::SQRT);
     }
 
     static double[] gather(double a[], int ix, int[] b, int iy) {
@@ -4483,7 +4483,7 @@ static void gatherDoubleMaxVectorTests(IntFunction<double[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::gather);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::gather);
     }
     static double[] gatherMasked(double a[], int ix, boolean[] mask, int[] b, int iy) {
         double[] res = new double[SPECIES.length()];
@@ -4511,7 +4511,7 @@ static void gatherMaskedDoubleMaxVectorTests(IntFunction<double[]> fa, BiFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::gatherMasked);
     }
 
     static double[] scatter(double a[], int ix, int[] b, int iy) {
@@ -4536,7 +4536,7 @@ static void scatterDoubleMaxVectorTests(IntFunction<double[]> fa, BiFunction<Int
             }
         }
 
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::scatter);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::scatter);
     }
 
     static double[] scatterMasked(double r[], double a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4574,7 +4574,7 @@ static void scatterMaskedDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, DoubleMaxVectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::scatterMasked);
     }
 
 
@@ -4616,8 +4616,8 @@ static void toIntArrayDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4627,8 +4627,8 @@ static void toLongArrayDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4695,7 +4695,7 @@ static void ADDReduceLongDoubleMaxVectorTests(IntFunction<double[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 DoubleMaxVectorTests::ADDReduceLong, DoubleMaxVectorTests::ADDReduceAllLong);
     }
 
@@ -4736,7 +4736,7 @@ static void ADDReduceLongDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, In
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 DoubleMaxVectorTests::ADDReduceLongMasked, DoubleMaxVectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4748,7 +4748,7 @@ static void BroadcastLongDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa)
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             DoubleVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
@@ -4766,7 +4766,7 @@ static void blendDoubleMaxVectorTestsBroadcastLongSmokeTest(IntFunction<double[]
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, DoubleMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleMaxVectorTests::blend);
     }
 
 
@@ -4783,7 +4783,7 @@ static void SelectFromDoubleMaxVectorTests(IntFunction<double[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
@@ -4802,7 +4802,7 @@ static void SelectFromDoubleMaxVectorTestsMaskedSmokeTest(IntFunction<double[]>
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4879,7 +4879,7 @@ static void maskEqDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFu
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, DoubleMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java
index 714cc88b8814e..c8b847b3fbe67 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Float128VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (128 / 8));
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(float[] a, float[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<float[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new float[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<float[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorTests.java b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
index 2ae24435f9d22..3f2e01c0343d6 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         float apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         float[] apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         float apply(float[] a);
     }
 
-    static void assertReductionArraysEquals(float[] a, float[] b, float c,
+    static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         float apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(float[] a, float[] b, float c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(float[] r, float rc, float[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(float[] a);
     }
 
-    static void assertReductionLongArraysEquals(float[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, float[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(float[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, float[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(float[] a, float[] b, float element, int index) {
+    static void assertInsertArraysEquals(float[] r, float[] a, float element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(float[]a, float[]r) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBi
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTern
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, f
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(float actual, float expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FU
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBin
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         float apply(float[] a, int b);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FBinArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         float[] apply(float[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         float[] apply(float[] r, float[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         float[] apply(float[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         float[] apply(float[] a, float[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLan
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         float[] apply(float[] a, float[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, bool
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         float[] apply(float[] a, float[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         float[] apply(float[] a, float[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(float[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(float[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -954,7 +954,7 @@ static void assertArraysEquals(float[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(float[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1406,7 +1406,7 @@ static void ADDFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::ADD);
+        assertArraysEquals(r, a, b, Float128VectorTests::ADD);
     }
     static float add(float a, float b) {
         return (float)(a + b);
@@ -1424,7 +1424,7 @@ static void addFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::add);
+        assertArraysEquals(r, a, b, Float128VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void ADDFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void addFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::add);
     }
     static float SUB(float a, float b) {
         return (float)(a - b);
@@ -1482,7 +1482,7 @@ static void SUBFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::SUB);
+        assertArraysEquals(r, a, b, Float128VectorTests::SUB);
     }
     static float sub(float a, float b) {
         return (float)(a - b);
@@ -1500,7 +1500,7 @@ static void subFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::sub);
+        assertArraysEquals(r, a, b, Float128VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1520,7 +1520,7 @@ static void SUBFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1538,7 +1538,7 @@ static void subFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::sub);
     }
     static float MUL(float a, float b) {
         return (float)(a * b);
@@ -1558,7 +1558,7 @@ static void MULFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::MUL);
+        assertArraysEquals(r, a, b, Float128VectorTests::MUL);
     }
     static float mul(float a, float b) {
         return (float)(a * b);
@@ -1576,7 +1576,7 @@ static void mulFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::mul);
+        assertArraysEquals(r, a, b, Float128VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void MULFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1614,7 +1614,7 @@ static void mulFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1635,7 +1635,7 @@ static void DIVFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::DIV);
+        assertArraysEquals(r, a, b, Float128VectorTests::DIV);
     }
     static float div(float a, float b) {
         return (float)(a / b);
@@ -1653,7 +1653,7 @@ static void divFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::div);
+        assertArraysEquals(r, a, b, Float128VectorTests::div);
     }
 
 
@@ -1675,7 +1675,7 @@ static void DIVFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1693,7 +1693,7 @@ static void divFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::div);
     }
 
 
@@ -1716,7 +1716,7 @@ static void FIRST_NONZEROFloat128VectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Float128VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1736,7 +1736,7 @@ static void FIRST_NONZEROFloat128VectorTestsMasked(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1758,7 +1758,7 @@ static void addFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1775,7 +1775,7 @@ static void addFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1789,7 +1789,7 @@ static void subFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1806,7 +1806,7 @@ static void subFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1820,7 +1820,7 @@ static void mulFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1837,7 +1837,7 @@ static void mulFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::mul);
     }
 
 
@@ -1852,7 +1852,7 @@ static void divFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::div);
     }
 
 
@@ -1871,7 +1871,7 @@ static void divFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::div);
     }
 
 
@@ -1894,7 +1894,7 @@ static void ADDFloat128VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Float128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Float128VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1911,7 +1911,7 @@ static void ADDFloat128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float128VectorTests::ADD);
     }
 
 
@@ -1967,7 +1967,7 @@ static void MINFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::MIN);
+        assertArraysEquals(r, a, b, Float128VectorTests::MIN);
     }
     static float min(float a, float b) {
         return (float)(Math.min(a, b));
@@ -1985,7 +1985,7 @@ static void minFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::min);
+        assertArraysEquals(r, a, b, Float128VectorTests::min);
     }
     static float MAX(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2005,7 +2005,7 @@ static void MAXFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::MAX);
+        assertArraysEquals(r, a, b, Float128VectorTests::MAX);
     }
     static float max(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2023,7 +2023,7 @@ static void maxFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::max);
+        assertArraysEquals(r, a, b, Float128VectorTests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2037,7 +2037,7 @@ static void MINFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2051,7 +2051,7 @@ static void minFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2065,7 +2065,7 @@ static void MAXFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2079,7 +2079,7 @@ static void maxFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::max);
     }
 
 
@@ -2131,7 +2131,7 @@ static void ADDReduceFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float128VectorTests::ADDReduce, Float128VectorTests::ADDReduceAll);
     }
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2175,7 +2175,7 @@ static void ADDReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float128VectorTests::ADDReduceMasked, Float128VectorTests::ADDReduceAllMasked);
     }
     static float MULReduce(float[] a, int idx) {
@@ -2216,7 +2216,7 @@ static void MULReduceFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float128VectorTests::MULReduce, Float128VectorTests::MULReduceAll);
     }
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2260,7 +2260,7 @@ static void MULReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float128VectorTests::MULReduceMasked, Float128VectorTests::MULReduceAllMasked);
     }
     static float MINReduce(float[] a, int idx) {
@@ -2301,7 +2301,7 @@ static void MINReduceFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float128VectorTests::MINReduce, Float128VectorTests::MINReduceAll);
     }
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2346,7 +2346,7 @@ static void MINReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float128VectorTests::MINReduceMasked, Float128VectorTests::MINReduceAllMasked);
     }
     static float MAXReduce(float[] a, int idx) {
@@ -2387,7 +2387,7 @@ static void MAXReduceFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float128VectorTests::MAXReduce, Float128VectorTests::MAXReduceAll);
     }
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2432,7 +2432,7 @@ static void MAXReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float128VectorTests::MAXReduceMasked, Float128VectorTests::MAXReduceAllMasked);
     }
 
@@ -2452,7 +2452,7 @@ static void withFloat128VectorTests(IntFunction<float []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (float)4, 0);
+        assertInsertArraysEquals(r, a, (float)4, 0);
     }
     static boolean testIS_DEFAULT(float a) {
         return bits(a)==0;
@@ -3118,7 +3118,7 @@ static void blendFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
@@ -3135,7 +3135,7 @@ static void RearrangeFloat128VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
@@ -3153,7 +3153,7 @@ static void RearrangeFloat128VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "floatUnaryOpProvider")
     static void getFloat128VectorTests(IntFunction<float[]> fa) {
@@ -3308,7 +3308,7 @@ static void getFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float128VectorTests::get);
+        assertArraysEquals(r, a, Float128VectorTests::get);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -3322,7 +3322,7 @@ static void BroadcastFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3369,7 +3369,7 @@ static void sliceUnaryFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Float128VectorTests::sliceUnary);
     }
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3398,7 +3398,7 @@ static void sliceBinaryFloat128VectorTestsBinary(IntFunction<float[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Float128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Float128VectorTests::sliceBinary);
     }
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3431,7 +3431,7 @@ static void sliceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Float128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Float128VectorTests::slice);
     }
     static float[] unsliceUnary(float[] a, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3458,7 +3458,7 @@ static void unsliceUnaryFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Float128VectorTests::unsliceUnary);
     }
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3497,7 +3497,7 @@ static void unsliceBinaryFloat128VectorTestsBinary(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Float128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Float128VectorTests::unsliceBinary);
     }
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3553,7 +3553,7 @@ static void unsliceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Float128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Float128VectorTests::unslice);
     }
 
     static float SIN(float a) {
@@ -3576,7 +3576,7 @@ static void SINFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::SIN, Float128VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::SIN, Float128VectorTests::strictSIN);
     }
 
 
@@ -3600,7 +3600,7 @@ static void EXPFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::EXP, Float128VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::EXP, Float128VectorTests::strictEXP);
     }
 
 
@@ -3624,7 +3624,7 @@ static void LOG1PFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::LOG1P, Float128VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::LOG1P, Float128VectorTests::strictLOG1P);
     }
 
 
@@ -3648,7 +3648,7 @@ static void LOGFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::LOG, Float128VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::LOG, Float128VectorTests::strictLOG);
     }
 
 
@@ -3672,7 +3672,7 @@ static void LOG10Float128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::LOG10, Float128VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::LOG10, Float128VectorTests::strictLOG10);
     }
 
 
@@ -3696,7 +3696,7 @@ static void EXPM1Float128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::EXPM1, Float128VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::EXPM1, Float128VectorTests::strictEXPM1);
     }
 
 
@@ -3720,7 +3720,7 @@ static void COSFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::COS, Float128VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::COS, Float128VectorTests::strictCOS);
     }
 
 
@@ -3744,7 +3744,7 @@ static void TANFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::TAN, Float128VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::TAN, Float128VectorTests::strictTAN);
     }
 
 
@@ -3768,7 +3768,7 @@ static void SINHFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::SINH, Float128VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::SINH, Float128VectorTests::strictSINH);
     }
 
 
@@ -3792,7 +3792,7 @@ static void COSHFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::COSH, Float128VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::COSH, Float128VectorTests::strictCOSH);
     }
 
 
@@ -3816,7 +3816,7 @@ static void TANHFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::TANH, Float128VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::TANH, Float128VectorTests::strictTANH);
     }
 
 
@@ -3840,7 +3840,7 @@ static void ASINFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::ASIN, Float128VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::ASIN, Float128VectorTests::strictASIN);
     }
 
 
@@ -3864,7 +3864,7 @@ static void ACOSFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::ACOS, Float128VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::ACOS, Float128VectorTests::strictACOS);
     }
 
 
@@ -3888,7 +3888,7 @@ static void ATANFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::ATAN, Float128VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::ATAN, Float128VectorTests::strictATAN);
     }
 
 
@@ -3912,7 +3912,7 @@ static void CBRTFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float128VectorTests::CBRT, Float128VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::CBRT, Float128VectorTests::strictCBRT);
     }
 
 
@@ -3938,7 +3938,7 @@ static void HYPOTFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float128VectorTests::HYPOT, Float128VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::HYPOT, Float128VectorTests::strictHYPOT);
     }
 
 
@@ -3965,7 +3965,7 @@ static void POWFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float128VectorTests::POW, Float128VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::POW, Float128VectorTests::strictPOW);
     }
 
     static float pow(float a, float b) {
@@ -3990,7 +3990,7 @@ static void powFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float128VectorTests::pow, Float128VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::pow, Float128VectorTests::strictpow);
     }
 
 
@@ -4017,7 +4017,7 @@ static void ATAN2Float128VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float128VectorTests::ATAN2, Float128VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::ATAN2, Float128VectorTests::strictATAN2);
     }
 
 
@@ -4033,7 +4033,7 @@ static void POWFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float128VectorTests::POW, Float128VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::POW, Float128VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -4047,7 +4047,7 @@ static void powFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float128VectorTests::pow, Float128VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::pow, Float128VectorTests::strictpow);
     }
 
 
@@ -4076,7 +4076,7 @@ static void FMAFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, c, r, Float128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Float128VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4092,7 +4092,7 @@ static void fmaFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Float128VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Float128VectorTests::fma);
     }
 
 
@@ -4115,7 +4115,7 @@ static void FMAFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Float128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
     }
 
 
@@ -4134,7 +4134,7 @@ static void FMAFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Float128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Float128VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
@@ -4149,7 +4149,7 @@ static void FMAFloat128VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa,
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Float128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Float128VectorTests::FMA);
     }
 
 
@@ -4169,7 +4169,7 @@ static void FMAFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Float128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
@@ -4188,7 +4188,7 @@ static void FMAFloat128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Float128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
     }
 
 
@@ -4206,7 +4206,7 @@ static void FMAFloat128VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float128VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat128VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4220,7 +4220,7 @@ static void fmaFloat128VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float128VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float128VectorTests::fma);
     }
 
 
@@ -4239,7 +4239,7 @@ static void FMAFloat128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<flo
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Float128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
     }
 
 
@@ -4265,7 +4265,7 @@ static void NEGFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float128VectorTests::NEG);
+        assertArraysEquals(r, a, Float128VectorTests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4280,7 +4280,7 @@ static void negFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float128VectorTests::neg);
+        assertArraysEquals(r, a, Float128VectorTests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4298,7 +4298,7 @@ static void NEGMaskedFloat128VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Float128VectorTests::NEG);
     }
 
     static float ABS(float a) {
@@ -4321,7 +4321,7 @@ static void ABSFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float128VectorTests::ABS);
+        assertArraysEquals(r, a, Float128VectorTests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4336,7 +4336,7 @@ static void absFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float128VectorTests::abs);
+        assertArraysEquals(r, a, Float128VectorTests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4354,7 +4354,7 @@ static void ABSMaskedFloat128VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Float128VectorTests::ABS);
     }
 
 
@@ -4386,7 +4386,7 @@ static void SQRTFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float128VectorTests::SQRT);
+        assertArraysEquals(r, a, Float128VectorTests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4401,7 +4401,7 @@ static void sqrtFloat128VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float128VectorTests::sqrt);
+        assertArraysEquals(r, a, Float128VectorTests::sqrt);
     }
 
 
@@ -4421,7 +4421,7 @@ static void SQRTMaskedFloat128VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float128VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Float128VectorTests::SQRT);
     }
 
     static float[] gather(float a[], int ix, int[] b, int iy) {
@@ -4446,7 +4446,7 @@ static void gatherFloat128VectorTests(IntFunction<float[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::gather);
+        assertArraysEquals(r, a, b, Float128VectorTests::gather);
     }
     static float[] gatherMasked(float a[], int ix, boolean[] mask, int[] b, int iy) {
         float[] res = new float[SPECIES.length()];
@@ -4474,7 +4474,7 @@ static void gatherMaskedFloat128VectorTests(IntFunction<float[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::gatherMasked);
     }
 
     static float[] scatter(float a[], int ix, int[] b, int iy) {
@@ -4499,7 +4499,7 @@ static void scatterFloat128VectorTests(IntFunction<float[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, Float128VectorTests::scatter);
+        assertArraysEquals(r, a, b, Float128VectorTests::scatter);
     }
 
     static float[] scatterMasked(float r[], float a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4537,7 +4537,7 @@ static void scatterMaskedFloat128VectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float128VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Float128VectorTests::scatterMasked);
     }
 
 
@@ -4579,8 +4579,8 @@ static void toIntArrayFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4590,8 +4590,8 @@ static void toLongArrayFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4601,8 +4601,8 @@ static void toDoubleArrayFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4668,7 +4668,7 @@ static void ADDReduceLongFloat128VectorTests(IntFunction<float[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Float128VectorTests::ADDReduceLong, Float128VectorTests::ADDReduceAllLong);
     }
 
@@ -4709,7 +4709,7 @@ static void ADDReduceLongFloat128VectorTestsMasked(IntFunction<float[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Float128VectorTests::ADDReduceLongMasked, Float128VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4721,7 +4721,7 @@ static void BroadcastLongFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -4739,7 +4739,7 @@ static void blendFloat128VectorTestsBroadcastLongSmokeTest(IntFunction<float[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float128VectorTests::blend);
     }
 
 
@@ -4756,7 +4756,7 @@ static void SelectFromFloat128VectorTests(IntFunction<float[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
@@ -4775,7 +4775,7 @@ static void SelectFromFloat128VectorTestsMaskedSmokeTest(IntFunction<float[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4852,7 +4852,7 @@ static void maskEqFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Float128VectorTests::beq);
+        assertArraysEquals(r, a, b, Float128VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java
index ed2cf47548538..5b504a31fd2a3 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Float256VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (256 / 8));
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(float[] a, float[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<float[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new float[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<float[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorTests.java b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
index 777e2989d1ff0..40a561c5260b5 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         float apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         float[] apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         float apply(float[] a);
     }
 
-    static void assertReductionArraysEquals(float[] a, float[] b, float c,
+    static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         float apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(float[] a, float[] b, float c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(float[] r, float rc, float[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(float[] a);
     }
 
-    static void assertReductionLongArraysEquals(float[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, float[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(float[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, float[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(float[] a, float[] b, float element, int index) {
+    static void assertInsertArraysEquals(float[] r, float[] a, float element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(float[]a, float[]r) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBi
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTern
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, f
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(float actual, float expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FU
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBin
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         float apply(float[] a, int b);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FBinArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         float[] apply(float[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         float[] apply(float[] r, float[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         float[] apply(float[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         float[] apply(float[] a, float[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLan
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         float[] apply(float[] a, float[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, bool
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         float[] apply(float[] a, float[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         float[] apply(float[] a, float[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(float[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(float[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -954,7 +954,7 @@ static void assertArraysEquals(float[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(float[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1406,7 +1406,7 @@ static void ADDFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::ADD);
+        assertArraysEquals(r, a, b, Float256VectorTests::ADD);
     }
     static float add(float a, float b) {
         return (float)(a + b);
@@ -1424,7 +1424,7 @@ static void addFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::add);
+        assertArraysEquals(r, a, b, Float256VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void ADDFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void addFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::add);
     }
     static float SUB(float a, float b) {
         return (float)(a - b);
@@ -1482,7 +1482,7 @@ static void SUBFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::SUB);
+        assertArraysEquals(r, a, b, Float256VectorTests::SUB);
     }
     static float sub(float a, float b) {
         return (float)(a - b);
@@ -1500,7 +1500,7 @@ static void subFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::sub);
+        assertArraysEquals(r, a, b, Float256VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1520,7 +1520,7 @@ static void SUBFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1538,7 +1538,7 @@ static void subFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::sub);
     }
     static float MUL(float a, float b) {
         return (float)(a * b);
@@ -1558,7 +1558,7 @@ static void MULFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::MUL);
+        assertArraysEquals(r, a, b, Float256VectorTests::MUL);
     }
     static float mul(float a, float b) {
         return (float)(a * b);
@@ -1576,7 +1576,7 @@ static void mulFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::mul);
+        assertArraysEquals(r, a, b, Float256VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void MULFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1614,7 +1614,7 @@ static void mulFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1635,7 +1635,7 @@ static void DIVFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::DIV);
+        assertArraysEquals(r, a, b, Float256VectorTests::DIV);
     }
     static float div(float a, float b) {
         return (float)(a / b);
@@ -1653,7 +1653,7 @@ static void divFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::div);
+        assertArraysEquals(r, a, b, Float256VectorTests::div);
     }
 
 
@@ -1675,7 +1675,7 @@ static void DIVFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1693,7 +1693,7 @@ static void divFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::div);
     }
 
 
@@ -1716,7 +1716,7 @@ static void FIRST_NONZEROFloat256VectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Float256VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1736,7 +1736,7 @@ static void FIRST_NONZEROFloat256VectorTestsMasked(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1758,7 +1758,7 @@ static void addFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1775,7 +1775,7 @@ static void addFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1789,7 +1789,7 @@ static void subFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1806,7 +1806,7 @@ static void subFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1820,7 +1820,7 @@ static void mulFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1837,7 +1837,7 @@ static void mulFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::mul);
     }
 
 
@@ -1852,7 +1852,7 @@ static void divFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::div);
     }
 
 
@@ -1871,7 +1871,7 @@ static void divFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::div);
     }
 
 
@@ -1894,7 +1894,7 @@ static void ADDFloat256VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Float256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Float256VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1911,7 +1911,7 @@ static void ADDFloat256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float256VectorTests::ADD);
     }
 
 
@@ -1967,7 +1967,7 @@ static void MINFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::MIN);
+        assertArraysEquals(r, a, b, Float256VectorTests::MIN);
     }
     static float min(float a, float b) {
         return (float)(Math.min(a, b));
@@ -1985,7 +1985,7 @@ static void minFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::min);
+        assertArraysEquals(r, a, b, Float256VectorTests::min);
     }
     static float MAX(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2005,7 +2005,7 @@ static void MAXFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::MAX);
+        assertArraysEquals(r, a, b, Float256VectorTests::MAX);
     }
     static float max(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2023,7 +2023,7 @@ static void maxFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::max);
+        assertArraysEquals(r, a, b, Float256VectorTests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2037,7 +2037,7 @@ static void MINFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2051,7 +2051,7 @@ static void minFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2065,7 +2065,7 @@ static void MAXFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2079,7 +2079,7 @@ static void maxFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::max);
     }
 
 
@@ -2131,7 +2131,7 @@ static void ADDReduceFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float256VectorTests::ADDReduce, Float256VectorTests::ADDReduceAll);
     }
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2175,7 +2175,7 @@ static void ADDReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float256VectorTests::ADDReduceMasked, Float256VectorTests::ADDReduceAllMasked);
     }
     static float MULReduce(float[] a, int idx) {
@@ -2216,7 +2216,7 @@ static void MULReduceFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float256VectorTests::MULReduce, Float256VectorTests::MULReduceAll);
     }
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2260,7 +2260,7 @@ static void MULReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float256VectorTests::MULReduceMasked, Float256VectorTests::MULReduceAllMasked);
     }
     static float MINReduce(float[] a, int idx) {
@@ -2301,7 +2301,7 @@ static void MINReduceFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float256VectorTests::MINReduce, Float256VectorTests::MINReduceAll);
     }
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2346,7 +2346,7 @@ static void MINReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float256VectorTests::MINReduceMasked, Float256VectorTests::MINReduceAllMasked);
     }
     static float MAXReduce(float[] a, int idx) {
@@ -2387,7 +2387,7 @@ static void MAXReduceFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float256VectorTests::MAXReduce, Float256VectorTests::MAXReduceAll);
     }
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2432,7 +2432,7 @@ static void MAXReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float256VectorTests::MAXReduceMasked, Float256VectorTests::MAXReduceAllMasked);
     }
 
@@ -2452,7 +2452,7 @@ static void withFloat256VectorTests(IntFunction<float []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (float)4, 0);
+        assertInsertArraysEquals(r, a, (float)4, 0);
     }
     static boolean testIS_DEFAULT(float a) {
         return bits(a)==0;
@@ -3118,7 +3118,7 @@ static void blendFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
@@ -3135,7 +3135,7 @@ static void RearrangeFloat256VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
@@ -3153,7 +3153,7 @@ static void RearrangeFloat256VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "floatUnaryOpProvider")
     static void getFloat256VectorTests(IntFunction<float[]> fa) {
@@ -3308,7 +3308,7 @@ static void getFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float256VectorTests::get);
+        assertArraysEquals(r, a, Float256VectorTests::get);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -3322,7 +3322,7 @@ static void BroadcastFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3369,7 +3369,7 @@ static void sliceUnaryFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Float256VectorTests::sliceUnary);
     }
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3398,7 +3398,7 @@ static void sliceBinaryFloat256VectorTestsBinary(IntFunction<float[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Float256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Float256VectorTests::sliceBinary);
     }
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3431,7 +3431,7 @@ static void sliceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Float256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Float256VectorTests::slice);
     }
     static float[] unsliceUnary(float[] a, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3458,7 +3458,7 @@ static void unsliceUnaryFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Float256VectorTests::unsliceUnary);
     }
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3497,7 +3497,7 @@ static void unsliceBinaryFloat256VectorTestsBinary(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Float256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Float256VectorTests::unsliceBinary);
     }
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3553,7 +3553,7 @@ static void unsliceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Float256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Float256VectorTests::unslice);
     }
 
     static float SIN(float a) {
@@ -3576,7 +3576,7 @@ static void SINFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::SIN, Float256VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::SIN, Float256VectorTests::strictSIN);
     }
 
 
@@ -3600,7 +3600,7 @@ static void EXPFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::EXP, Float256VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::EXP, Float256VectorTests::strictEXP);
     }
 
 
@@ -3624,7 +3624,7 @@ static void LOG1PFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::LOG1P, Float256VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::LOG1P, Float256VectorTests::strictLOG1P);
     }
 
 
@@ -3648,7 +3648,7 @@ static void LOGFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::LOG, Float256VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::LOG, Float256VectorTests::strictLOG);
     }
 
 
@@ -3672,7 +3672,7 @@ static void LOG10Float256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::LOG10, Float256VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::LOG10, Float256VectorTests::strictLOG10);
     }
 
 
@@ -3696,7 +3696,7 @@ static void EXPM1Float256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::EXPM1, Float256VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::EXPM1, Float256VectorTests::strictEXPM1);
     }
 
 
@@ -3720,7 +3720,7 @@ static void COSFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::COS, Float256VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::COS, Float256VectorTests::strictCOS);
     }
 
 
@@ -3744,7 +3744,7 @@ static void TANFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::TAN, Float256VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::TAN, Float256VectorTests::strictTAN);
     }
 
 
@@ -3768,7 +3768,7 @@ static void SINHFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::SINH, Float256VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::SINH, Float256VectorTests::strictSINH);
     }
 
 
@@ -3792,7 +3792,7 @@ static void COSHFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::COSH, Float256VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::COSH, Float256VectorTests::strictCOSH);
     }
 
 
@@ -3816,7 +3816,7 @@ static void TANHFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::TANH, Float256VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::TANH, Float256VectorTests::strictTANH);
     }
 
 
@@ -3840,7 +3840,7 @@ static void ASINFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::ASIN, Float256VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::ASIN, Float256VectorTests::strictASIN);
     }
 
 
@@ -3864,7 +3864,7 @@ static void ACOSFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::ACOS, Float256VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::ACOS, Float256VectorTests::strictACOS);
     }
 
 
@@ -3888,7 +3888,7 @@ static void ATANFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::ATAN, Float256VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::ATAN, Float256VectorTests::strictATAN);
     }
 
 
@@ -3912,7 +3912,7 @@ static void CBRTFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float256VectorTests::CBRT, Float256VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::CBRT, Float256VectorTests::strictCBRT);
     }
 
 
@@ -3938,7 +3938,7 @@ static void HYPOTFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float256VectorTests::HYPOT, Float256VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::HYPOT, Float256VectorTests::strictHYPOT);
     }
 
 
@@ -3965,7 +3965,7 @@ static void POWFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float256VectorTests::POW, Float256VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::POW, Float256VectorTests::strictPOW);
     }
 
     static float pow(float a, float b) {
@@ -3990,7 +3990,7 @@ static void powFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float256VectorTests::pow, Float256VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::pow, Float256VectorTests::strictpow);
     }
 
 
@@ -4017,7 +4017,7 @@ static void ATAN2Float256VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float256VectorTests::ATAN2, Float256VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::ATAN2, Float256VectorTests::strictATAN2);
     }
 
 
@@ -4033,7 +4033,7 @@ static void POWFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float256VectorTests::POW, Float256VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::POW, Float256VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -4047,7 +4047,7 @@ static void powFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float256VectorTests::pow, Float256VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::pow, Float256VectorTests::strictpow);
     }
 
 
@@ -4076,7 +4076,7 @@ static void FMAFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, c, r, Float256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Float256VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4092,7 +4092,7 @@ static void fmaFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Float256VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Float256VectorTests::fma);
     }
 
 
@@ -4115,7 +4115,7 @@ static void FMAFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Float256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
     }
 
 
@@ -4134,7 +4134,7 @@ static void FMAFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Float256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Float256VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
@@ -4149,7 +4149,7 @@ static void FMAFloat256VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa,
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Float256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Float256VectorTests::FMA);
     }
 
 
@@ -4169,7 +4169,7 @@ static void FMAFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Float256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
@@ -4188,7 +4188,7 @@ static void FMAFloat256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Float256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
     }
 
 
@@ -4206,7 +4206,7 @@ static void FMAFloat256VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float256VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat256VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4220,7 +4220,7 @@ static void fmaFloat256VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float256VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float256VectorTests::fma);
     }
 
 
@@ -4239,7 +4239,7 @@ static void FMAFloat256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<flo
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Float256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
     }
 
 
@@ -4265,7 +4265,7 @@ static void NEGFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float256VectorTests::NEG);
+        assertArraysEquals(r, a, Float256VectorTests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4280,7 +4280,7 @@ static void negFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float256VectorTests::neg);
+        assertArraysEquals(r, a, Float256VectorTests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4298,7 +4298,7 @@ static void NEGMaskedFloat256VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Float256VectorTests::NEG);
     }
 
     static float ABS(float a) {
@@ -4321,7 +4321,7 @@ static void ABSFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float256VectorTests::ABS);
+        assertArraysEquals(r, a, Float256VectorTests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4336,7 +4336,7 @@ static void absFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float256VectorTests::abs);
+        assertArraysEquals(r, a, Float256VectorTests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4354,7 +4354,7 @@ static void ABSMaskedFloat256VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Float256VectorTests::ABS);
     }
 
 
@@ -4386,7 +4386,7 @@ static void SQRTFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float256VectorTests::SQRT);
+        assertArraysEquals(r, a, Float256VectorTests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4401,7 +4401,7 @@ static void sqrtFloat256VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float256VectorTests::sqrt);
+        assertArraysEquals(r, a, Float256VectorTests::sqrt);
     }
 
 
@@ -4421,7 +4421,7 @@ static void SQRTMaskedFloat256VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float256VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Float256VectorTests::SQRT);
     }
 
     static float[] gather(float a[], int ix, int[] b, int iy) {
@@ -4446,7 +4446,7 @@ static void gatherFloat256VectorTests(IntFunction<float[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::gather);
+        assertArraysEquals(r, a, b, Float256VectorTests::gather);
     }
     static float[] gatherMasked(float a[], int ix, boolean[] mask, int[] b, int iy) {
         float[] res = new float[SPECIES.length()];
@@ -4474,7 +4474,7 @@ static void gatherMaskedFloat256VectorTests(IntFunction<float[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::gatherMasked);
     }
 
     static float[] scatter(float a[], int ix, int[] b, int iy) {
@@ -4499,7 +4499,7 @@ static void scatterFloat256VectorTests(IntFunction<float[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, Float256VectorTests::scatter);
+        assertArraysEquals(r, a, b, Float256VectorTests::scatter);
     }
 
     static float[] scatterMasked(float r[], float a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4537,7 +4537,7 @@ static void scatterMaskedFloat256VectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float256VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Float256VectorTests::scatterMasked);
     }
 
 
@@ -4579,8 +4579,8 @@ static void toIntArrayFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4590,8 +4590,8 @@ static void toLongArrayFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4601,8 +4601,8 @@ static void toDoubleArrayFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4668,7 +4668,7 @@ static void ADDReduceLongFloat256VectorTests(IntFunction<float[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Float256VectorTests::ADDReduceLong, Float256VectorTests::ADDReduceAllLong);
     }
 
@@ -4709,7 +4709,7 @@ static void ADDReduceLongFloat256VectorTestsMasked(IntFunction<float[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Float256VectorTests::ADDReduceLongMasked, Float256VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4721,7 +4721,7 @@ static void BroadcastLongFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -4739,7 +4739,7 @@ static void blendFloat256VectorTestsBroadcastLongSmokeTest(IntFunction<float[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float256VectorTests::blend);
     }
 
 
@@ -4756,7 +4756,7 @@ static void SelectFromFloat256VectorTests(IntFunction<float[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
@@ -4775,7 +4775,7 @@ static void SelectFromFloat256VectorTestsMaskedSmokeTest(IntFunction<float[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4852,7 +4852,7 @@ static void maskEqFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Float256VectorTests::beq);
+        assertArraysEquals(r, a, b, Float256VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java
index 958b364528512..0aa356dd9c8e9 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Float512VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (512 / 8));
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(float[] a, float[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<float[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new float[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<float[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorTests.java b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
index bec251d800f88..91556d5d9dffc 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         float apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         float[] apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         float apply(float[] a);
     }
 
-    static void assertReductionArraysEquals(float[] a, float[] b, float c,
+    static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         float apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(float[] a, float[] b, float c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(float[] r, float rc, float[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(float[] a);
     }
 
-    static void assertReductionLongArraysEquals(float[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, float[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(float[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, float[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(float[] a, float[] b, float element, int index) {
+    static void assertInsertArraysEquals(float[] r, float[] a, float element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(float[]a, float[]r) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBi
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTern
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, f
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(float actual, float expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FU
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBin
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         float apply(float[] a, int b);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FBinArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         float[] apply(float[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         float[] apply(float[] r, float[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         float[] apply(float[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         float[] apply(float[] a, float[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLan
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         float[] apply(float[] a, float[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, bool
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         float[] apply(float[] a, float[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         float[] apply(float[] a, float[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(float[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(float[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -954,7 +954,7 @@ static void assertArraysEquals(float[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(float[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1406,7 +1406,7 @@ static void ADDFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::ADD);
+        assertArraysEquals(r, a, b, Float512VectorTests::ADD);
     }
     static float add(float a, float b) {
         return (float)(a + b);
@@ -1424,7 +1424,7 @@ static void addFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::add);
+        assertArraysEquals(r, a, b, Float512VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void ADDFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void addFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::add);
     }
     static float SUB(float a, float b) {
         return (float)(a - b);
@@ -1482,7 +1482,7 @@ static void SUBFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::SUB);
+        assertArraysEquals(r, a, b, Float512VectorTests::SUB);
     }
     static float sub(float a, float b) {
         return (float)(a - b);
@@ -1500,7 +1500,7 @@ static void subFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::sub);
+        assertArraysEquals(r, a, b, Float512VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1520,7 +1520,7 @@ static void SUBFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1538,7 +1538,7 @@ static void subFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::sub);
     }
     static float MUL(float a, float b) {
         return (float)(a * b);
@@ -1558,7 +1558,7 @@ static void MULFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::MUL);
+        assertArraysEquals(r, a, b, Float512VectorTests::MUL);
     }
     static float mul(float a, float b) {
         return (float)(a * b);
@@ -1576,7 +1576,7 @@ static void mulFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::mul);
+        assertArraysEquals(r, a, b, Float512VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void MULFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1614,7 +1614,7 @@ static void mulFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1635,7 +1635,7 @@ static void DIVFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::DIV);
+        assertArraysEquals(r, a, b, Float512VectorTests::DIV);
     }
     static float div(float a, float b) {
         return (float)(a / b);
@@ -1653,7 +1653,7 @@ static void divFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::div);
+        assertArraysEquals(r, a, b, Float512VectorTests::div);
     }
 
 
@@ -1675,7 +1675,7 @@ static void DIVFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1693,7 +1693,7 @@ static void divFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::div);
     }
 
 
@@ -1716,7 +1716,7 @@ static void FIRST_NONZEROFloat512VectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Float512VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1736,7 +1736,7 @@ static void FIRST_NONZEROFloat512VectorTestsMasked(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1758,7 +1758,7 @@ static void addFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1775,7 +1775,7 @@ static void addFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1789,7 +1789,7 @@ static void subFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1806,7 +1806,7 @@ static void subFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1820,7 +1820,7 @@ static void mulFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1837,7 +1837,7 @@ static void mulFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::mul);
     }
 
 
@@ -1852,7 +1852,7 @@ static void divFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::div);
     }
 
 
@@ -1871,7 +1871,7 @@ static void divFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::div);
     }
 
 
@@ -1894,7 +1894,7 @@ static void ADDFloat512VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Float512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Float512VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1911,7 +1911,7 @@ static void ADDFloat512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float512VectorTests::ADD);
     }
 
 
@@ -1967,7 +1967,7 @@ static void MINFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::MIN);
+        assertArraysEquals(r, a, b, Float512VectorTests::MIN);
     }
     static float min(float a, float b) {
         return (float)(Math.min(a, b));
@@ -1985,7 +1985,7 @@ static void minFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::min);
+        assertArraysEquals(r, a, b, Float512VectorTests::min);
     }
     static float MAX(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2005,7 +2005,7 @@ static void MAXFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::MAX);
+        assertArraysEquals(r, a, b, Float512VectorTests::MAX);
     }
     static float max(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2023,7 +2023,7 @@ static void maxFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::max);
+        assertArraysEquals(r, a, b, Float512VectorTests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2037,7 +2037,7 @@ static void MINFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2051,7 +2051,7 @@ static void minFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2065,7 +2065,7 @@ static void MAXFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2079,7 +2079,7 @@ static void maxFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::max);
     }
 
 
@@ -2131,7 +2131,7 @@ static void ADDReduceFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float512VectorTests::ADDReduce, Float512VectorTests::ADDReduceAll);
     }
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2175,7 +2175,7 @@ static void ADDReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float512VectorTests::ADDReduceMasked, Float512VectorTests::ADDReduceAllMasked);
     }
     static float MULReduce(float[] a, int idx) {
@@ -2216,7 +2216,7 @@ static void MULReduceFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float512VectorTests::MULReduce, Float512VectorTests::MULReduceAll);
     }
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2260,7 +2260,7 @@ static void MULReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float512VectorTests::MULReduceMasked, Float512VectorTests::MULReduceAllMasked);
     }
     static float MINReduce(float[] a, int idx) {
@@ -2301,7 +2301,7 @@ static void MINReduceFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float512VectorTests::MINReduce, Float512VectorTests::MINReduceAll);
     }
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2346,7 +2346,7 @@ static void MINReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float512VectorTests::MINReduceMasked, Float512VectorTests::MINReduceAllMasked);
     }
     static float MAXReduce(float[] a, int idx) {
@@ -2387,7 +2387,7 @@ static void MAXReduceFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float512VectorTests::MAXReduce, Float512VectorTests::MAXReduceAll);
     }
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2432,7 +2432,7 @@ static void MAXReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float512VectorTests::MAXReduceMasked, Float512VectorTests::MAXReduceAllMasked);
     }
 
@@ -2452,7 +2452,7 @@ static void withFloat512VectorTests(IntFunction<float []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (float)4, 0);
+        assertInsertArraysEquals(r, a, (float)4, 0);
     }
     static boolean testIS_DEFAULT(float a) {
         return bits(a)==0;
@@ -3118,7 +3118,7 @@ static void blendFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
@@ -3135,7 +3135,7 @@ static void RearrangeFloat512VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
@@ -3153,7 +3153,7 @@ static void RearrangeFloat512VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "floatUnaryOpProvider")
     static void getFloat512VectorTests(IntFunction<float[]> fa) {
@@ -3308,7 +3308,7 @@ static void getFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float512VectorTests::get);
+        assertArraysEquals(r, a, Float512VectorTests::get);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -3322,7 +3322,7 @@ static void BroadcastFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3369,7 +3369,7 @@ static void sliceUnaryFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Float512VectorTests::sliceUnary);
     }
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3398,7 +3398,7 @@ static void sliceBinaryFloat512VectorTestsBinary(IntFunction<float[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Float512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Float512VectorTests::sliceBinary);
     }
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3431,7 +3431,7 @@ static void sliceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Float512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Float512VectorTests::slice);
     }
     static float[] unsliceUnary(float[] a, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3458,7 +3458,7 @@ static void unsliceUnaryFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Float512VectorTests::unsliceUnary);
     }
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3497,7 +3497,7 @@ static void unsliceBinaryFloat512VectorTestsBinary(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Float512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Float512VectorTests::unsliceBinary);
     }
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3553,7 +3553,7 @@ static void unsliceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Float512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Float512VectorTests::unslice);
     }
 
     static float SIN(float a) {
@@ -3576,7 +3576,7 @@ static void SINFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::SIN, Float512VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::SIN, Float512VectorTests::strictSIN);
     }
 
 
@@ -3600,7 +3600,7 @@ static void EXPFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::EXP, Float512VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::EXP, Float512VectorTests::strictEXP);
     }
 
 
@@ -3624,7 +3624,7 @@ static void LOG1PFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::LOG1P, Float512VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::LOG1P, Float512VectorTests::strictLOG1P);
     }
 
 
@@ -3648,7 +3648,7 @@ static void LOGFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::LOG, Float512VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::LOG, Float512VectorTests::strictLOG);
     }
 
 
@@ -3672,7 +3672,7 @@ static void LOG10Float512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::LOG10, Float512VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::LOG10, Float512VectorTests::strictLOG10);
     }
 
 
@@ -3696,7 +3696,7 @@ static void EXPM1Float512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::EXPM1, Float512VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::EXPM1, Float512VectorTests::strictEXPM1);
     }
 
 
@@ -3720,7 +3720,7 @@ static void COSFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::COS, Float512VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::COS, Float512VectorTests::strictCOS);
     }
 
 
@@ -3744,7 +3744,7 @@ static void TANFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::TAN, Float512VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::TAN, Float512VectorTests::strictTAN);
     }
 
 
@@ -3768,7 +3768,7 @@ static void SINHFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::SINH, Float512VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::SINH, Float512VectorTests::strictSINH);
     }
 
 
@@ -3792,7 +3792,7 @@ static void COSHFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::COSH, Float512VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::COSH, Float512VectorTests::strictCOSH);
     }
 
 
@@ -3816,7 +3816,7 @@ static void TANHFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::TANH, Float512VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::TANH, Float512VectorTests::strictTANH);
     }
 
 
@@ -3840,7 +3840,7 @@ static void ASINFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::ASIN, Float512VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::ASIN, Float512VectorTests::strictASIN);
     }
 
 
@@ -3864,7 +3864,7 @@ static void ACOSFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::ACOS, Float512VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::ACOS, Float512VectorTests::strictACOS);
     }
 
 
@@ -3888,7 +3888,7 @@ static void ATANFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::ATAN, Float512VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::ATAN, Float512VectorTests::strictATAN);
     }
 
 
@@ -3912,7 +3912,7 @@ static void CBRTFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float512VectorTests::CBRT, Float512VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::CBRT, Float512VectorTests::strictCBRT);
     }
 
 
@@ -3938,7 +3938,7 @@ static void HYPOTFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float512VectorTests::HYPOT, Float512VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::HYPOT, Float512VectorTests::strictHYPOT);
     }
 
 
@@ -3965,7 +3965,7 @@ static void POWFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float512VectorTests::POW, Float512VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::POW, Float512VectorTests::strictPOW);
     }
 
     static float pow(float a, float b) {
@@ -3990,7 +3990,7 @@ static void powFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float512VectorTests::pow, Float512VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::pow, Float512VectorTests::strictpow);
     }
 
 
@@ -4017,7 +4017,7 @@ static void ATAN2Float512VectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float512VectorTests::ATAN2, Float512VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::ATAN2, Float512VectorTests::strictATAN2);
     }
 
 
@@ -4033,7 +4033,7 @@ static void POWFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float512VectorTests::POW, Float512VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::POW, Float512VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -4047,7 +4047,7 @@ static void powFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float512VectorTests::pow, Float512VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::pow, Float512VectorTests::strictpow);
     }
 
 
@@ -4076,7 +4076,7 @@ static void FMAFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, c, r, Float512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Float512VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4092,7 +4092,7 @@ static void fmaFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Float512VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Float512VectorTests::fma);
     }
 
 
@@ -4115,7 +4115,7 @@ static void FMAFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Float512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
     }
 
 
@@ -4134,7 +4134,7 @@ static void FMAFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Float512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Float512VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
@@ -4149,7 +4149,7 @@ static void FMAFloat512VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa,
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Float512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Float512VectorTests::FMA);
     }
 
 
@@ -4169,7 +4169,7 @@ static void FMAFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Float512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
@@ -4188,7 +4188,7 @@ static void FMAFloat512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Float512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
     }
 
 
@@ -4206,7 +4206,7 @@ static void FMAFloat512VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float512VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat512VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4220,7 +4220,7 @@ static void fmaFloat512VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float512VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float512VectorTests::fma);
     }
 
 
@@ -4239,7 +4239,7 @@ static void FMAFloat512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<flo
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Float512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
     }
 
 
@@ -4265,7 +4265,7 @@ static void NEGFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float512VectorTests::NEG);
+        assertArraysEquals(r, a, Float512VectorTests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4280,7 +4280,7 @@ static void negFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float512VectorTests::neg);
+        assertArraysEquals(r, a, Float512VectorTests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4298,7 +4298,7 @@ static void NEGMaskedFloat512VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Float512VectorTests::NEG);
     }
 
     static float ABS(float a) {
@@ -4321,7 +4321,7 @@ static void ABSFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float512VectorTests::ABS);
+        assertArraysEquals(r, a, Float512VectorTests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4336,7 +4336,7 @@ static void absFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float512VectorTests::abs);
+        assertArraysEquals(r, a, Float512VectorTests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4354,7 +4354,7 @@ static void ABSMaskedFloat512VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Float512VectorTests::ABS);
     }
 
 
@@ -4386,7 +4386,7 @@ static void SQRTFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float512VectorTests::SQRT);
+        assertArraysEquals(r, a, Float512VectorTests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4401,7 +4401,7 @@ static void sqrtFloat512VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float512VectorTests::sqrt);
+        assertArraysEquals(r, a, Float512VectorTests::sqrt);
     }
 
 
@@ -4421,7 +4421,7 @@ static void SQRTMaskedFloat512VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float512VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Float512VectorTests::SQRT);
     }
 
     static float[] gather(float a[], int ix, int[] b, int iy) {
@@ -4446,7 +4446,7 @@ static void gatherFloat512VectorTests(IntFunction<float[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::gather);
+        assertArraysEquals(r, a, b, Float512VectorTests::gather);
     }
     static float[] gatherMasked(float a[], int ix, boolean[] mask, int[] b, int iy) {
         float[] res = new float[SPECIES.length()];
@@ -4474,7 +4474,7 @@ static void gatherMaskedFloat512VectorTests(IntFunction<float[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::gatherMasked);
     }
 
     static float[] scatter(float a[], int ix, int[] b, int iy) {
@@ -4499,7 +4499,7 @@ static void scatterFloat512VectorTests(IntFunction<float[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, Float512VectorTests::scatter);
+        assertArraysEquals(r, a, b, Float512VectorTests::scatter);
     }
 
     static float[] scatterMasked(float r[], float a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4537,7 +4537,7 @@ static void scatterMaskedFloat512VectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float512VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Float512VectorTests::scatterMasked);
     }
 
 
@@ -4579,8 +4579,8 @@ static void toIntArrayFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4590,8 +4590,8 @@ static void toLongArrayFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4601,8 +4601,8 @@ static void toDoubleArrayFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4668,7 +4668,7 @@ static void ADDReduceLongFloat512VectorTests(IntFunction<float[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Float512VectorTests::ADDReduceLong, Float512VectorTests::ADDReduceAllLong);
     }
 
@@ -4709,7 +4709,7 @@ static void ADDReduceLongFloat512VectorTestsMasked(IntFunction<float[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Float512VectorTests::ADDReduceLongMasked, Float512VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4721,7 +4721,7 @@ static void BroadcastLongFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -4739,7 +4739,7 @@ static void blendFloat512VectorTestsBroadcastLongSmokeTest(IntFunction<float[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float512VectorTests::blend);
     }
 
 
@@ -4756,7 +4756,7 @@ static void SelectFromFloat512VectorTests(IntFunction<float[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
@@ -4775,7 +4775,7 @@ static void SelectFromFloat512VectorTestsMaskedSmokeTest(IntFunction<float[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4852,7 +4852,7 @@ static void maskEqFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Float512VectorTests::beq);
+        assertArraysEquals(r, a, b, Float512VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java
index 9f8a5dd45e3f3..166a171582d25 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Float64VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (64 / 8));
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(float[] a, float[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<float[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new float[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<float[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorTests.java b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
index f25193c86fbcc..9e00b5bfc3642 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         float apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         float[] apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         float apply(float[] a);
     }
 
-    static void assertReductionArraysEquals(float[] a, float[] b, float c,
+    static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         float apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(float[] a, float[] b, float c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(float[] r, float rc, float[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(float[] a);
     }
 
-    static void assertReductionLongArraysEquals(float[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, float[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(float[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, float[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(float[] a, float[] b, float element, int index) {
+    static void assertInsertArraysEquals(float[] r, float[] a, float element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(float[]a, float[]r) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBi
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTern
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, f
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -613,7 +613,7 @@ static boolean isWithin1Ulp(float actual, float expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -627,7 +627,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FU
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -641,7 +641,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBin
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -671,7 +671,7 @@ interface FBinArrayOp {
         float apply(float[] a, int b);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FBinArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -686,7 +686,7 @@ interface FGatherScatterOp {
         float[] apply(float[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -713,7 +713,7 @@ interface FScatterMaskedOp {
         float[] apply(float[] r, float[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -723,7 +723,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -734,7 +734,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -744,7 +744,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -761,7 +761,7 @@ interface FLaneOp {
         float[] apply(float[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -771,7 +771,7 @@ static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -781,7 +781,7 @@ interface FLaneBop {
         float[] apply(float[] a, float[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -791,7 +791,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLan
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -802,7 +802,7 @@ interface FLaneMaskedBop {
         float[] apply(float[] a, float[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -812,7 +812,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, bool
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -823,7 +823,7 @@ interface FLanePartBop {
         float[] apply(float[] a, float[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -833,7 +833,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -845,7 +845,7 @@ interface FLanePartMaskedBop {
         float[] apply(float[] a, float[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -855,7 +855,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -897,7 +897,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(float[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -943,7 +943,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(float[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -954,7 +954,7 @@ static void assertArraysEquals(float[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(float[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1406,7 +1406,7 @@ static void ADDFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::ADD);
+        assertArraysEquals(r, a, b, Float64VectorTests::ADD);
     }
     static float add(float a, float b) {
         return (float)(a + b);
@@ -1424,7 +1424,7 @@ static void addFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::add);
+        assertArraysEquals(r, a, b, Float64VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void ADDFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void addFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::add);
     }
     static float SUB(float a, float b) {
         return (float)(a - b);
@@ -1482,7 +1482,7 @@ static void SUBFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::SUB);
+        assertArraysEquals(r, a, b, Float64VectorTests::SUB);
     }
     static float sub(float a, float b) {
         return (float)(a - b);
@@ -1500,7 +1500,7 @@ static void subFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::sub);
+        assertArraysEquals(r, a, b, Float64VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1520,7 +1520,7 @@ static void SUBFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1538,7 +1538,7 @@ static void subFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::sub);
     }
     static float MUL(float a, float b) {
         return (float)(a * b);
@@ -1558,7 +1558,7 @@ static void MULFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::MUL);
+        assertArraysEquals(r, a, b, Float64VectorTests::MUL);
     }
     static float mul(float a, float b) {
         return (float)(a * b);
@@ -1576,7 +1576,7 @@ static void mulFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::mul);
+        assertArraysEquals(r, a, b, Float64VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void MULFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1614,7 +1614,7 @@ static void mulFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1635,7 +1635,7 @@ static void DIVFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::DIV);
+        assertArraysEquals(r, a, b, Float64VectorTests::DIV);
     }
     static float div(float a, float b) {
         return (float)(a / b);
@@ -1653,7 +1653,7 @@ static void divFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::div);
+        assertArraysEquals(r, a, b, Float64VectorTests::div);
     }
 
 
@@ -1675,7 +1675,7 @@ static void DIVFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1693,7 +1693,7 @@ static void divFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::div);
     }
 
 
@@ -1716,7 +1716,7 @@ static void FIRST_NONZEROFloat64VectorTests(IntFunction<float[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Float64VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1736,7 +1736,7 @@ static void FIRST_NONZEROFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFu
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::FIRST_NONZERO);
     }
 
 
@@ -1758,7 +1758,7 @@ static void addFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1775,7 +1775,7 @@ static void addFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> f
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1789,7 +1789,7 @@ static void subFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1806,7 +1806,7 @@ static void subFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> f
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1820,7 +1820,7 @@ static void mulFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1837,7 +1837,7 @@ static void mulFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> f
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::mul);
     }
 
 
@@ -1852,7 +1852,7 @@ static void divFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::div);
     }
 
 
@@ -1871,7 +1871,7 @@ static void divFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> f
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Float64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::div);
     }
 
 
@@ -1894,7 +1894,7 @@ static void ADDFloat64VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Float64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Float64VectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1911,7 +1911,7 @@ static void ADDFloat64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float[
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float64VectorTests::ADD);
     }
 
 
@@ -1967,7 +1967,7 @@ static void MINFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::MIN);
+        assertArraysEquals(r, a, b, Float64VectorTests::MIN);
     }
     static float min(float a, float b) {
         return (float)(Math.min(a, b));
@@ -1985,7 +1985,7 @@ static void minFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::min);
+        assertArraysEquals(r, a, b, Float64VectorTests::min);
     }
     static float MAX(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2005,7 +2005,7 @@ static void MAXFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::MAX);
+        assertArraysEquals(r, a, b, Float64VectorTests::MAX);
     }
     static float max(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2023,7 +2023,7 @@ static void maxFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::max);
+        assertArraysEquals(r, a, b, Float64VectorTests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2037,7 +2037,7 @@ static void MINFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2051,7 +2051,7 @@ static void minFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2065,7 +2065,7 @@ static void MAXFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2079,7 +2079,7 @@ static void maxFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Float64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::max);
     }
 
 
@@ -2131,7 +2131,7 @@ static void ADDReduceFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float64VectorTests::ADDReduce, Float64VectorTests::ADDReduceAll);
     }
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2175,7 +2175,7 @@ static void ADDReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float64VectorTests::ADDReduceMasked, Float64VectorTests::ADDReduceAllMasked);
     }
     static float MULReduce(float[] a, int idx) {
@@ -2216,7 +2216,7 @@ static void MULReduceFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float64VectorTests::MULReduce, Float64VectorTests::MULReduceAll);
     }
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2260,7 +2260,7 @@ static void MULReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float64VectorTests::MULReduceMasked, Float64VectorTests::MULReduceAllMasked);
     }
     static float MINReduce(float[] a, int idx) {
@@ -2301,7 +2301,7 @@ static void MINReduceFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float64VectorTests::MINReduce, Float64VectorTests::MINReduceAll);
     }
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2346,7 +2346,7 @@ static void MINReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float64VectorTests::MINReduceMasked, Float64VectorTests::MINReduceAllMasked);
     }
     static float MAXReduce(float[] a, int idx) {
@@ -2387,7 +2387,7 @@ static void MAXReduceFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Float64VectorTests::MAXReduce, Float64VectorTests::MAXReduceAll);
     }
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2432,7 +2432,7 @@ static void MAXReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Float64VectorTests::MAXReduceMasked, Float64VectorTests::MAXReduceAllMasked);
     }
 
@@ -2452,7 +2452,7 @@ static void withFloat64VectorTests(IntFunction<float []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (float)4, 0);
+        assertInsertArraysEquals(r, a, (float)4, 0);
     }
     static boolean testIS_DEFAULT(float a) {
         return bits(a)==0;
@@ -3118,7 +3118,7 @@ static void blendFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
@@ -3135,7 +3135,7 @@ static void RearrangeFloat64VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
@@ -3153,7 +3153,7 @@ static void RearrangeFloat64VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "floatUnaryOpProvider")
     static void getFloat64VectorTests(IntFunction<float[]> fa) {
@@ -3308,7 +3308,7 @@ static void getFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float64VectorTests::get);
+        assertArraysEquals(r, a, Float64VectorTests::get);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -3322,7 +3322,7 @@ static void BroadcastFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3369,7 +3369,7 @@ static void sliceUnaryFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Float64VectorTests::sliceUnary);
     }
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3398,7 +3398,7 @@ static void sliceBinaryFloat64VectorTestsBinary(IntFunction<float[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Float64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Float64VectorTests::sliceBinary);
     }
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3431,7 +3431,7 @@ static void sliceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<f
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Float64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Float64VectorTests::slice);
     }
     static float[] unsliceUnary(float[] a, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3458,7 +3458,7 @@ static void unsliceUnaryFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Float64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Float64VectorTests::unsliceUnary);
     }
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3497,7 +3497,7 @@ static void unsliceBinaryFloat64VectorTestsBinary(IntFunction<float[]> fa, IntFu
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Float64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Float64VectorTests::unsliceBinary);
     }
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3553,7 +3553,7 @@ static void unsliceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Float64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Float64VectorTests::unslice);
     }
 
     static float SIN(float a) {
@@ -3576,7 +3576,7 @@ static void SINFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::SIN, Float64VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::SIN, Float64VectorTests::strictSIN);
     }
 
 
@@ -3600,7 +3600,7 @@ static void EXPFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::EXP, Float64VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::EXP, Float64VectorTests::strictEXP);
     }
 
 
@@ -3624,7 +3624,7 @@ static void LOG1PFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::LOG1P, Float64VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::LOG1P, Float64VectorTests::strictLOG1P);
     }
 
 
@@ -3648,7 +3648,7 @@ static void LOGFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::LOG, Float64VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::LOG, Float64VectorTests::strictLOG);
     }
 
 
@@ -3672,7 +3672,7 @@ static void LOG10Float64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::LOG10, Float64VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::LOG10, Float64VectorTests::strictLOG10);
     }
 
 
@@ -3696,7 +3696,7 @@ static void EXPM1Float64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::EXPM1, Float64VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::EXPM1, Float64VectorTests::strictEXPM1);
     }
 
 
@@ -3720,7 +3720,7 @@ static void COSFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::COS, Float64VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::COS, Float64VectorTests::strictCOS);
     }
 
 
@@ -3744,7 +3744,7 @@ static void TANFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::TAN, Float64VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::TAN, Float64VectorTests::strictTAN);
     }
 
 
@@ -3768,7 +3768,7 @@ static void SINHFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::SINH, Float64VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::SINH, Float64VectorTests::strictSINH);
     }
 
 
@@ -3792,7 +3792,7 @@ static void COSHFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::COSH, Float64VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::COSH, Float64VectorTests::strictCOSH);
     }
 
 
@@ -3816,7 +3816,7 @@ static void TANHFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::TANH, Float64VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::TANH, Float64VectorTests::strictTANH);
     }
 
 
@@ -3840,7 +3840,7 @@ static void ASINFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::ASIN, Float64VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::ASIN, Float64VectorTests::strictASIN);
     }
 
 
@@ -3864,7 +3864,7 @@ static void ACOSFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::ACOS, Float64VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::ACOS, Float64VectorTests::strictACOS);
     }
 
 
@@ -3888,7 +3888,7 @@ static void ATANFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::ATAN, Float64VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::ATAN, Float64VectorTests::strictATAN);
     }
 
 
@@ -3912,7 +3912,7 @@ static void CBRTFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, Float64VectorTests::CBRT, Float64VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::CBRT, Float64VectorTests::strictCBRT);
     }
 
 
@@ -3938,7 +3938,7 @@ static void HYPOTFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float64VectorTests::HYPOT, Float64VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::HYPOT, Float64VectorTests::strictHYPOT);
     }
 
 
@@ -3965,7 +3965,7 @@ static void POWFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float64VectorTests::POW, Float64VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::POW, Float64VectorTests::strictPOW);
     }
 
     static float pow(float a, float b) {
@@ -3990,7 +3990,7 @@ static void powFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float64VectorTests::pow, Float64VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::pow, Float64VectorTests::strictpow);
     }
 
 
@@ -4017,7 +4017,7 @@ static void ATAN2Float64VectorTests(IntFunction<float[]> fa, IntFunction<float[]
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, Float64VectorTests::ATAN2, Float64VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::ATAN2, Float64VectorTests::strictATAN2);
     }
 
 
@@ -4033,7 +4033,7 @@ static void POWFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float64VectorTests::POW, Float64VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::POW, Float64VectorTests::strictPOW);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -4047,7 +4047,7 @@ static void powFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, Float64VectorTests::pow, Float64VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::pow, Float64VectorTests::strictpow);
     }
 
 
@@ -4076,7 +4076,7 @@ static void FMAFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, c, r, Float64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, Float64VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4092,7 +4092,7 @@ static void fmaFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Float64VectorTests::fma);
+        assertArraysEquals(r, a, b, c, Float64VectorTests::fma);
     }
 
 
@@ -4115,7 +4115,7 @@ static void FMAFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<flo
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Float64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
     }
 
 
@@ -4134,7 +4134,7 @@ static void FMAFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, Int
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Float64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, Float64VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
@@ -4149,7 +4149,7 @@ static void FMAFloat64VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa,
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Float64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, Float64VectorTests::FMA);
     }
 
 
@@ -4169,7 +4169,7 @@ static void FMAFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> f
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Float64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
@@ -4188,7 +4188,7 @@ static void FMAFloat64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[]
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Float64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
     }
 
 
@@ -4206,7 +4206,7 @@ static void FMAFloat64VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> f
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float64VectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloat64VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4220,7 +4220,7 @@ static void fmaFloat64VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> f
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Float64VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Float64VectorTests::fma);
     }
 
 
@@ -4239,7 +4239,7 @@ static void FMAFloat64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<floa
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Float64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
     }
 
 
@@ -4265,7 +4265,7 @@ static void NEGFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float64VectorTests::NEG);
+        assertArraysEquals(r, a, Float64VectorTests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4280,7 +4280,7 @@ static void negFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float64VectorTests::neg);
+        assertArraysEquals(r, a, Float64VectorTests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4298,7 +4298,7 @@ static void NEGMaskedFloat64VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Float64VectorTests::NEG);
     }
 
     static float ABS(float a) {
@@ -4321,7 +4321,7 @@ static void ABSFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float64VectorTests::ABS);
+        assertArraysEquals(r, a, Float64VectorTests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4336,7 +4336,7 @@ static void absFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float64VectorTests::abs);
+        assertArraysEquals(r, a, Float64VectorTests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4354,7 +4354,7 @@ static void ABSMaskedFloat64VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Float64VectorTests::ABS);
     }
 
 
@@ -4386,7 +4386,7 @@ static void SQRTFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float64VectorTests::SQRT);
+        assertArraysEquals(r, a, Float64VectorTests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4401,7 +4401,7 @@ static void sqrtFloat64VectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Float64VectorTests::sqrt);
+        assertArraysEquals(r, a, Float64VectorTests::sqrt);
     }
 
 
@@ -4421,7 +4421,7 @@ static void SQRTMaskedFloat64VectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Float64VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, Float64VectorTests::SQRT);
     }
 
     static float[] gather(float a[], int ix, int[] b, int iy) {
@@ -4446,7 +4446,7 @@ static void gatherFloat64VectorTests(IntFunction<float[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::gather);
+        assertArraysEquals(r, a, b, Float64VectorTests::gather);
     }
     static float[] gatherMasked(float a[], int ix, boolean[] mask, int[] b, int iy) {
         float[] res = new float[SPECIES.length()];
@@ -4474,7 +4474,7 @@ static void gatherMaskedFloat64VectorTests(IntFunction<float[]> fa, BiFunction<I
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::gatherMasked);
     }
 
     static float[] scatter(float a[], int ix, int[] b, int iy) {
@@ -4499,7 +4499,7 @@ static void scatterFloat64VectorTests(IntFunction<float[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Float64VectorTests::scatter);
+        assertArraysEquals(r, a, b, Float64VectorTests::scatter);
     }
 
     static float[] scatterMasked(float r[], float a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4537,7 +4537,7 @@ static void scatterMaskedFloat64VectorTests(IntFunction<float[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Float64VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Float64VectorTests::scatterMasked);
     }
 
 
@@ -4579,8 +4579,8 @@ static void toIntArrayFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4590,8 +4590,8 @@ static void toLongArrayFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4601,8 +4601,8 @@ static void toDoubleArrayFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4668,7 +4668,7 @@ static void ADDReduceLongFloat64VectorTests(IntFunction<float[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Float64VectorTests::ADDReduceLong, Float64VectorTests::ADDReduceAllLong);
     }
 
@@ -4709,7 +4709,7 @@ static void ADDReduceLongFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFu
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Float64VectorTests::ADDReduceLongMasked, Float64VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4721,7 +4721,7 @@ static void BroadcastLongFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -4739,7 +4739,7 @@ static void blendFloat64VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> f
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Float64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Float64VectorTests::blend);
     }
 
 
@@ -4756,7 +4756,7 @@ static void SelectFromFloat64VectorTests(IntFunction<float[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
@@ -4775,7 +4775,7 @@ static void SelectFromFloat64VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4852,7 +4852,7 @@ static void maskEqFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Float64VectorTests::beq);
+        assertArraysEquals(r, a, b, Float64VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java
index d94ddd88906ad..ed32c12a778af 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,47 +67,25 @@ static VectorShape getMaxBit() {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (Max / 8));
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (float) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(float[] a, float[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (float) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -410,7 +388,7 @@ static void loadStoreArray(IntFunction<float[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -481,7 +459,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new float[a.length];
@@ -492,7 +470,7 @@ static void loadStoreMaskArray(IntFunction<float[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatMaskProviderForIOOBE")
@@ -565,7 +543,7 @@ static void loadStoreMask(IntFunction<float[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -589,7 +567,7 @@ static void loadStoreByteBuffer(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -676,7 +654,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -691,7 +669,7 @@ static void loadStoreByteBufferMask(IntFunction<float[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -807,7 +785,7 @@ static void loadStoreByteArray(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "floatByteProviderForIOOBE")
@@ -888,7 +866,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -899,7 +877,7 @@ static void loadStoreByteArrayMask(IntFunction<float[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "floatByteMaskProviderForIOOBE")
@@ -976,7 +954,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -987,7 +965,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
index 8f4723f1493e4..842c4f930753b 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ interface FUnOp {
         float apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -88,7 +88,7 @@ interface FUnArrayOp {
         float[] apply(float a);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -98,13 +98,13 @@ static void assertArraysEquals(float[] a, float[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(float[] r, float[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -123,17 +123,17 @@ interface FReductionAllOp {
         float apply(float[] a);
     }
 
-    static void assertReductionArraysEquals(float[] a, float[] b, float c,
+    static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -145,17 +145,17 @@ interface FReductionAllMaskedOp {
         float apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(float[] a, float[] b, float c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(float[] r, float rc, float[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -167,17 +167,17 @@ interface FReductionAllOpLong {
         long apply(float[] a);
     }
 
-    static void assertReductionLongArraysEquals(float[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, float[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -189,17 +189,17 @@ interface FReductionAllMaskedOpLong {
         long apply(float[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(float[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, float[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -207,37 +207,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(float[] a, float[] b, float element, int index) {
+    static void assertInsertArraysEquals(float[] r, float[] a, float element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -251,7 +251,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -265,7 +265,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(float[] r, float[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -285,7 +285,7 @@ static void assertRearrangeArraysEquals(float[] a, float[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(float[] r, float[] a, float[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -305,7 +305,7 @@ static void assertSelectFromArraysEquals(float[] a, float[] r, float[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(float[]a, float[]r) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -334,7 +334,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -345,7 +345,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -357,7 +357,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -369,11 +369,11 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, FBi
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -384,11 +384,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -402,11 +402,11 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -420,7 +420,7 @@ static void assertBroadcastLongArraysEquals(float[] a, float[] b, float[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -434,11 +434,11 @@ static void assertShiftArraysEquals(float[] a, float[] b, float[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(float[] a, float[] b, float[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -464,7 +464,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -475,11 +475,11 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, FTern
         }
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -491,7 +491,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] c, float[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -504,7 +504,7 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -517,12 +517,12 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -538,12 +538,12 @@ static void assertBroadcastArraysEquals(float[] a, float[] b, float[] c, float[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -559,7 +559,7 @@ static void assertAltBroadcastArraysEquals(float[] a, float[] b, float[] c, floa
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -574,12 +574,12 @@ static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, f
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(float[] a, float[] b, float[] c, float[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(float[] r, float[] a, float[] b, float[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -618,7 +618,7 @@ static boolean isWithin1Ulp(float actual, float expected) {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -632,7 +632,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] r, FUnOp mathf, FU
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -646,7 +646,7 @@ static void assertArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r, FBin
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp(float[] a, float[] b, float[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp(float[] r, float[] a, float[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -676,7 +676,7 @@ interface FBinArrayOp {
         float apply(float[] a, int b);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, FBinArrayOp f) {
+    static void assertArraysEquals(float[] r, float[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -691,7 +691,7 @@ interface FGatherScatterOp {
         float[] apply(float[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -718,7 +718,7 @@ interface FScatterMaskedOp {
         float[] apply(float[] r, float[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -728,7 +728,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -739,7 +739,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -749,7 +749,7 @@ static void assertArraysEquals(float[] a, int[] b, float[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -766,7 +766,7 @@ interface FLaneOp {
         float[] apply(float[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(float[] r, float[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -776,7 +776,7 @@ static void assertArraysEquals(float[] a, float[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -786,7 +786,7 @@ interface FLaneBop {
         float[] apply(float[] a, float[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -796,7 +796,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, FLan
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -807,7 +807,7 @@ interface FLaneMaskedBop {
         float[] apply(float[] a, float[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -817,7 +817,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, bool
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -828,7 +828,7 @@ interface FLanePartBop {
         float[] apply(float[] a, float[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -838,7 +838,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -850,7 +850,7 @@ interface FLanePartMaskedBop {
         float[] apply(float[] a, float[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(float[] r, float[] a, float[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -860,7 +860,7 @@ static void assertArraysEquals(float[] a, float[] b, float[] r, int origin, int
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -902,7 +902,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(float[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -948,7 +948,7 @@ static long longCornerCaseValue(int i) {
     );
 
 
-    static void assertArraysEquals(float[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -959,7 +959,7 @@ static void assertArraysEquals(float[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(float[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, float[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1411,7 +1411,7 @@ static void ADDFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::ADD);
     }
     static float add(float a, float b) {
         return (float)(a + b);
@@ -1429,7 +1429,7 @@ static void addFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::add);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1449,7 +1449,7 @@ static void ADDFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1467,7 +1467,7 @@ static void addFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::add);
     }
     static float SUB(float a, float b) {
         return (float)(a - b);
@@ -1487,7 +1487,7 @@ static void SUBFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::SUB);
     }
     static float sub(float a, float b) {
         return (float)(a - b);
@@ -1505,7 +1505,7 @@ static void subFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1525,7 +1525,7 @@ static void SUBFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1543,7 +1543,7 @@ static void subFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::sub);
     }
     static float MUL(float a, float b) {
         return (float)(a * b);
@@ -1563,7 +1563,7 @@ static void MULFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::MUL);
     }
     static float mul(float a, float b) {
         return (float)(a * b);
@@ -1581,7 +1581,7 @@ static void mulFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1601,7 +1601,7 @@ static void MULFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1619,7 +1619,7 @@ static void mulFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1640,7 +1640,7 @@ static void DIVFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::DIV);
     }
     static float div(float a, float b) {
         return (float)(a / b);
@@ -1658,7 +1658,7 @@ static void divFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::div);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::div);
     }
 
 
@@ -1680,7 +1680,7 @@ static void DIVFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1698,7 +1698,7 @@ static void divFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::div);
     }
 
 
@@ -1721,7 +1721,7 @@ static void FIRST_NONZEROFloatMaxVectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1741,7 +1741,7 @@ static void FIRST_NONZEROFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::FIRST_NONZERO);
     }
 
 
@@ -1763,7 +1763,7 @@ static void addFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1780,7 +1780,7 @@ static void addFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, FloatMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1794,7 +1794,7 @@ static void subFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1811,7 +1811,7 @@ static void subFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, FloatMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -1825,7 +1825,7 @@ static void mulFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1842,7 +1842,7 @@ static void mulFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, FloatMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::mul);
     }
 
 
@@ -1857,7 +1857,7 @@ static void divFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::div);
     }
 
 
@@ -1876,7 +1876,7 @@ static void divFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, FloatMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::div);
     }
 
 
@@ -1899,7 +1899,7 @@ static void ADDFloatMaxVectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, FloatMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, FloatMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -1916,7 +1916,7 @@ static void ADDFloatMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, FloatMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatMaxVectorTests::ADD);
     }
 
 
@@ -1972,7 +1972,7 @@ static void MINFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::MIN);
     }
     static float min(float a, float b) {
         return (float)(Math.min(a, b));
@@ -1990,7 +1990,7 @@ static void minFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::min);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::min);
     }
     static float MAX(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2010,7 +2010,7 @@ static void MAXFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::MAX);
     }
     static float max(float a, float b) {
         return (float)(Math.max(a, b));
@@ -2028,7 +2028,7 @@ static void maxFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::max);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2042,7 +2042,7 @@ static void MINFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2056,7 +2056,7 @@ static void minFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2070,7 +2070,7 @@ static void MAXFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -2084,7 +2084,7 @@ static void maxFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, FloatMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::max);
     }
 
 
@@ -2136,7 +2136,7 @@ static void ADDReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 FloatMaxVectorTests::ADDReduce, FloatMaxVectorTests::ADDReduceAll);
     }
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2180,7 +2180,7 @@ static void ADDReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 FloatMaxVectorTests::ADDReduceMasked, FloatMaxVectorTests::ADDReduceAllMasked);
     }
     static float MULReduce(float[] a, int idx) {
@@ -2221,7 +2221,7 @@ static void MULReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 FloatMaxVectorTests::MULReduce, FloatMaxVectorTests::MULReduceAll);
     }
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2265,7 +2265,7 @@ static void MULReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 FloatMaxVectorTests::MULReduceMasked, FloatMaxVectorTests::MULReduceAllMasked);
     }
     static float MINReduce(float[] a, int idx) {
@@ -2306,7 +2306,7 @@ static void MINReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 FloatMaxVectorTests::MINReduce, FloatMaxVectorTests::MINReduceAll);
     }
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2351,7 +2351,7 @@ static void MINReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 FloatMaxVectorTests::MINReduceMasked, FloatMaxVectorTests::MINReduceAllMasked);
     }
     static float MAXReduce(float[] a, int idx) {
@@ -2392,7 +2392,7 @@ static void MAXReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 FloatMaxVectorTests::MAXReduce, FloatMaxVectorTests::MAXReduceAll);
     }
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2437,7 +2437,7 @@ static void MAXReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 FloatMaxVectorTests::MAXReduceMasked, FloatMaxVectorTests::MAXReduceAllMasked);
     }
 
@@ -2457,7 +2457,7 @@ static void withFloatMaxVectorTests(IntFunction<float []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (float)4, 0);
+        assertInsertArraysEquals(r, a, (float)4, 0);
     }
     static boolean testIS_DEFAULT(float a) {
         return bits(a)==0;
@@ -3123,7 +3123,7 @@ static void blendFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
@@ -3140,7 +3140,7 @@ static void RearrangeFloatMaxVectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
@@ -3158,7 +3158,7 @@ static void RearrangeFloatMaxVectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "floatUnaryOpProvider")
     static void getFloatMaxVectorTests(IntFunction<float[]> fa) {
@@ -3313,7 +3313,7 @@ static void getFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, FloatMaxVectorTests::get);
+        assertArraysEquals(r, a, FloatMaxVectorTests::get);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -3327,7 +3327,7 @@ static void BroadcastFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3374,7 +3374,7 @@ static void sliceUnaryFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, FloatMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, FloatMaxVectorTests::sliceUnary);
     }
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3403,7 +3403,7 @@ static void sliceBinaryFloatMaxVectorTestsBinary(IntFunction<float[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, FloatMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, FloatMaxVectorTests::sliceBinary);
     }
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3436,7 +3436,7 @@ static void sliceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, FloatMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, FloatMaxVectorTests::slice);
     }
     static float[] unsliceUnary(float[] a, int origin, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3463,7 +3463,7 @@ static void unsliceUnaryFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, FloatMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, FloatMaxVectorTests::unsliceUnary);
     }
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3502,7 +3502,7 @@ static void unsliceBinaryFloatMaxVectorTestsBinary(IntFunction<float[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, FloatMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, FloatMaxVectorTests::unsliceBinary);
     }
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
         float[] res = new float[SPECIES.length()];
@@ -3558,7 +3558,7 @@ static void unsliceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, FloatMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, FloatMaxVectorTests::unslice);
     }
 
     static float SIN(float a) {
@@ -3581,7 +3581,7 @@ static void SINFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::SIN, FloatMaxVectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::SIN, FloatMaxVectorTests::strictSIN);
     }
 
 
@@ -3605,7 +3605,7 @@ static void EXPFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::EXP, FloatMaxVectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::EXP, FloatMaxVectorTests::strictEXP);
     }
 
 
@@ -3629,7 +3629,7 @@ static void LOG1PFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::LOG1P, FloatMaxVectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::LOG1P, FloatMaxVectorTests::strictLOG1P);
     }
 
 
@@ -3653,7 +3653,7 @@ static void LOGFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::LOG, FloatMaxVectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::LOG, FloatMaxVectorTests::strictLOG);
     }
 
 
@@ -3677,7 +3677,7 @@ static void LOG10FloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::LOG10, FloatMaxVectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::LOG10, FloatMaxVectorTests::strictLOG10);
     }
 
 
@@ -3701,7 +3701,7 @@ static void EXPM1FloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::EXPM1, FloatMaxVectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::EXPM1, FloatMaxVectorTests::strictEXPM1);
     }
 
 
@@ -3725,7 +3725,7 @@ static void COSFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::COS, FloatMaxVectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::COS, FloatMaxVectorTests::strictCOS);
     }
 
 
@@ -3749,7 +3749,7 @@ static void TANFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::TAN, FloatMaxVectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::TAN, FloatMaxVectorTests::strictTAN);
     }
 
 
@@ -3773,7 +3773,7 @@ static void SINHFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::SINH, FloatMaxVectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::SINH, FloatMaxVectorTests::strictSINH);
     }
 
 
@@ -3797,7 +3797,7 @@ static void COSHFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::COSH, FloatMaxVectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::COSH, FloatMaxVectorTests::strictCOSH);
     }
 
 
@@ -3821,7 +3821,7 @@ static void TANHFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::TANH, FloatMaxVectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::TANH, FloatMaxVectorTests::strictTANH);
     }
 
 
@@ -3845,7 +3845,7 @@ static void ASINFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::ASIN, FloatMaxVectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::ASIN, FloatMaxVectorTests::strictASIN);
     }
 
 
@@ -3869,7 +3869,7 @@ static void ACOSFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::ACOS, FloatMaxVectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::ACOS, FloatMaxVectorTests::strictACOS);
     }
 
 
@@ -3893,7 +3893,7 @@ static void ATANFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::ATAN, FloatMaxVectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::ATAN, FloatMaxVectorTests::strictATAN);
     }
 
 
@@ -3917,7 +3917,7 @@ static void CBRTFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, r, FloatMaxVectorTests::CBRT, FloatMaxVectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::CBRT, FloatMaxVectorTests::strictCBRT);
     }
 
 
@@ -3943,7 +3943,7 @@ static void HYPOTFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, FloatMaxVectorTests::HYPOT, FloatMaxVectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::HYPOT, FloatMaxVectorTests::strictHYPOT);
     }
 
 
@@ -3970,7 +3970,7 @@ static void POWFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, FloatMaxVectorTests::POW, FloatMaxVectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::POW, FloatMaxVectorTests::strictPOW);
     }
 
     static float pow(float a, float b) {
@@ -3995,7 +3995,7 @@ static void powFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, FloatMaxVectorTests::pow, FloatMaxVectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::pow, FloatMaxVectorTests::strictpow);
     }
 
 
@@ -4022,7 +4022,7 @@ static void ATAN2FloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[
             }
         }
 
-        assertArraysEqualsWithinOneUlp(a, b, r, FloatMaxVectorTests::ATAN2, FloatMaxVectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::ATAN2, FloatMaxVectorTests::strictATAN2);
     }
 
 
@@ -4038,7 +4038,7 @@ static void POWFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, FloatMaxVectorTests::POW, FloatMaxVectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::POW, FloatMaxVectorTests::strictPOW);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
@@ -4052,7 +4052,7 @@ static void powFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, FloatMaxVectorTests::pow, FloatMaxVectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::pow, FloatMaxVectorTests::strictpow);
     }
 
 
@@ -4081,7 +4081,7 @@ static void FMAFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             }
         }
 
-        assertArraysEquals(a, b, c, r, FloatMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4097,7 +4097,7 @@ static void fmaFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]>
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, FloatMaxVectorTests::fma);
+        assertArraysEquals(r, a, b, c, FloatMaxVectorTests::fma);
     }
 
 
@@ -4120,7 +4120,7 @@ static void FMAFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<fl
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, FloatMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
     }
 
 
@@ -4139,7 +4139,7 @@ static void FMAFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, In
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, FloatMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
@@ -4154,7 +4154,7 @@ static void FMAFloatMaxVectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa,
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, FloatMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
     }
 
 
@@ -4174,7 +4174,7 @@ static void FMAFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, FloatMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
@@ -4193,7 +4193,7 @@ static void FMAFloatMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FloatMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
     }
 
 
@@ -4211,7 +4211,7 @@ static void FMAFloatMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, FloatMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
     }
     @Test(dataProvider = "floatTernaryOpProvider")
     static void fmaFloatMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
@@ -4225,7 +4225,7 @@ static void fmaFloatMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]>
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, FloatMaxVectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::fma);
     }
 
 
@@ -4244,7 +4244,7 @@ static void FMAFloatMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<flo
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FloatMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
     }
 
 
@@ -4270,7 +4270,7 @@ static void NEGFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, FloatMaxVectorTests::NEG);
+        assertArraysEquals(r, a, FloatMaxVectorTests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4285,7 +4285,7 @@ static void negFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, FloatMaxVectorTests::neg);
+        assertArraysEquals(r, a, FloatMaxVectorTests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4303,7 +4303,7 @@ static void NEGMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, FloatMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, FloatMaxVectorTests::NEG);
     }
 
     static float ABS(float a) {
@@ -4326,7 +4326,7 @@ static void ABSFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, FloatMaxVectorTests::ABS);
+        assertArraysEquals(r, a, FloatMaxVectorTests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4341,7 +4341,7 @@ static void absFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, FloatMaxVectorTests::abs);
+        assertArraysEquals(r, a, FloatMaxVectorTests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
@@ -4359,7 +4359,7 @@ static void ABSMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, FloatMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, FloatMaxVectorTests::ABS);
     }
 
 
@@ -4391,7 +4391,7 @@ static void SQRTFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, FloatMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, FloatMaxVectorTests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
@@ -4406,7 +4406,7 @@ static void sqrtFloatMaxVectorTests(IntFunction<float[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, FloatMaxVectorTests::sqrt);
+        assertArraysEquals(r, a, FloatMaxVectorTests::sqrt);
     }
 
 
@@ -4426,7 +4426,7 @@ static void SQRTMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, FloatMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, mask, FloatMaxVectorTests::SQRT);
     }
 
     static float[] gather(float a[], int ix, int[] b, int iy) {
@@ -4451,7 +4451,7 @@ static void gatherFloatMaxVectorTests(IntFunction<float[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::gather);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::gather);
     }
     static float[] gatherMasked(float a[], int ix, boolean[] mask, int[] b, int iy) {
         float[] res = new float[SPECIES.length()];
@@ -4479,7 +4479,7 @@ static void gatherMaskedFloatMaxVectorTests(IntFunction<float[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::gatherMasked);
     }
 
     static float[] scatter(float a[], int ix, int[] b, int iy) {
@@ -4504,7 +4504,7 @@ static void scatterFloatMaxVectorTests(IntFunction<float[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::scatter);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::scatter);
     }
 
     static float[] scatterMasked(float r[], float a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4542,7 +4542,7 @@ static void scatterMaskedFloatMaxVectorTests(IntFunction<float[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, FloatMaxVectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::scatterMasked);
     }
 
 
@@ -4584,8 +4584,8 @@ static void toIntArrayFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4595,8 +4595,8 @@ static void toLongArrayFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4606,8 +4606,8 @@ static void toDoubleArrayFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4673,7 +4673,7 @@ static void ADDReduceLongFloatMaxVectorTests(IntFunction<float[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 FloatMaxVectorTests::ADDReduceLong, FloatMaxVectorTests::ADDReduceAllLong);
     }
 
@@ -4714,7 +4714,7 @@ static void ADDReduceLongFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 FloatMaxVectorTests::ADDReduceLongMasked, FloatMaxVectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4726,7 +4726,7 @@ static void BroadcastLongFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             FloatVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
@@ -4744,7 +4744,7 @@ static void blendFloatMaxVectorTestsBroadcastLongSmokeTest(IntFunction<float[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, FloatMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatMaxVectorTests::blend);
     }
 
 
@@ -4761,7 +4761,7 @@ static void SelectFromFloatMaxVectorTests(IntFunction<float[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
@@ -4780,7 +4780,7 @@ static void SelectFromFloatMaxVectorTestsMaskedSmokeTest(IntFunction<float[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4857,7 +4857,7 @@ static void maskEqFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, FloatMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java
index 8975e91e892c3..92bf7df4d1188 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Int128VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (128 / 8));
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(int[] a, int[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<int[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new int[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<int[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorTests.java b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
index cc88f6b284b22..5139c08801d28 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         int apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         int[] apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         int apply(int[] a);
     }
 
-    static void assertReductionArraysEquals(int[] a, int[] b, int c,
+    static void assertReductionArraysEquals(int[] r, int rc, int[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         int apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(int[] a, int[] b, int c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(int[] r, int rc, int[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(int[] a);
     }
 
-    static void assertReductionLongArraysEquals(int[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, int[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(int[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, int[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(int[] a, int[] b, int element, int index) {
+    static void assertInsertArraysEquals(int[] r, int[] a, int element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vecto
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vect
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[]
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[
         }
     }
 
-    static void assertBroadcastArraysEquals(int[]a, int[]r) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f)
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMa
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[]
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTer
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, F
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, bool
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, b
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         int apply(int[] a, int b);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FBinArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         int[] apply(int[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         int[] apply(int[] r, int[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatt
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         int[] apply(int[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         int[] apply(int[] a, int[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         int[] apply(int[] a, int[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[]
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         int[] apply(int[] a, int[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         int[] apply(int[] a, int[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
     }
 
 
-    static void assertArraysEquals(int[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(int[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(int[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(int[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(int[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1254,7 +1254,7 @@ static void ADDInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::ADD);
+        assertArraysEquals(r, a, b, Int128VectorTests::ADD);
     }
     static int add(int a, int b) {
         return (int)(a + b);
@@ -1272,7 +1272,7 @@ static void addInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::add);
+        assertArraysEquals(r, a, b, Int128VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1292,7 +1292,7 @@ static void ADDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1310,7 +1310,7 @@ static void addInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::add);
     }
     static int SUB(int a, int b) {
         return (int)(a - b);
@@ -1330,7 +1330,7 @@ static void SUBInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::SUB);
+        assertArraysEquals(r, a, b, Int128VectorTests::SUB);
     }
     static int sub(int a, int b) {
         return (int)(a - b);
@@ -1348,7 +1348,7 @@ static void subInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::sub);
+        assertArraysEquals(r, a, b, Int128VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1368,7 +1368,7 @@ static void SUBInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1386,7 +1386,7 @@ static void subInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::sub);
     }
     static int MUL(int a, int b) {
         return (int)(a * b);
@@ -1406,7 +1406,7 @@ static void MULInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::MUL);
+        assertArraysEquals(r, a, b, Int128VectorTests::MUL);
     }
     static int mul(int a, int b) {
         return (int)(a * b);
@@ -1424,7 +1424,7 @@ static void mulInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::mul);
+        assertArraysEquals(r, a, b, Int128VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void MULInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void mulInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::mul);
     }
 
 
@@ -1487,7 +1487,7 @@ static void DIVInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::DIV);
+        assertArraysEquals(r, a, b, Int128VectorTests::DIV);
     }
     static int div(int a, int b) {
         return (int)(a / b);
@@ -1509,7 +1509,7 @@ static void divInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::div);
+        assertArraysEquals(r, a, b, Int128VectorTests::div);
     }
 
 
@@ -1533,7 +1533,7 @@ static void DIVInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1555,7 +1555,7 @@ static void divInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1576,7 +1576,7 @@ static void FIRST_NONZEROInt128VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Int128VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void FIRST_NONZEROInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1617,7 +1617,7 @@ static void ANDInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::AND);
+        assertArraysEquals(r, a, b, Int128VectorTests::AND);
     }
     static int and(int a, int b) {
         return (int)(a & b);
@@ -1635,7 +1635,7 @@ static void andInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::and);
+        assertArraysEquals(r, a, b, Int128VectorTests::and);
     }
 
 
@@ -1657,7 +1657,7 @@ static void ANDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::AND);
     }
 
 
@@ -1679,7 +1679,7 @@ static void AND_NOTInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Int128VectorTests::AND_NOT);
     }
 
 
@@ -1701,7 +1701,7 @@ static void AND_NOTInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::AND_NOT);
     }
 
 
@@ -1723,7 +1723,7 @@ static void ORInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::OR);
+        assertArraysEquals(r, a, b, Int128VectorTests::OR);
     }
     static int or(int a, int b) {
         return (int)(a | b);
@@ -1741,7 +1741,7 @@ static void orInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::or);
+        assertArraysEquals(r, a, b, Int128VectorTests::or);
     }
 
 
@@ -1763,7 +1763,7 @@ static void ORInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::OR);
     }
 
 
@@ -1785,7 +1785,7 @@ static void XORInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::XOR);
+        assertArraysEquals(r, a, b, Int128VectorTests::XOR);
     }
 
 
@@ -1807,7 +1807,7 @@ static void XORInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::XOR);
     }
 
 
@@ -1822,7 +1822,7 @@ static void addInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1839,7 +1839,7 @@ static void addInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1853,7 +1853,7 @@ static void subInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1870,7 +1870,7 @@ static void subInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1884,7 +1884,7 @@ static void mulInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void mulInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::mul);
     }
 
 
@@ -1920,7 +1920,7 @@ static void divInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::div);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::div);
     }
 
 
@@ -1957,7 +1957,7 @@ static void ORInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1971,7 +1971,7 @@ static void orInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::or);
     }
 
 
@@ -1990,7 +1990,7 @@ static void ORInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::OR);
     }
 
 
@@ -2006,7 +2006,7 @@ static void ANDInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2020,7 +2020,7 @@ static void andInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::and);
     }
 
 
@@ -2039,7 +2039,7 @@ static void ANDInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::AND);
     }
 
 
@@ -2055,7 +2055,7 @@ static void ORInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, Int
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Int128VectorTests::OR);
     }
 
 
@@ -2074,7 +2074,7 @@ static void ORInt128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> f
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int128VectorTests::OR);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ADDInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, In
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Int128VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -2106,7 +2106,7 @@ static void ADDInt128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]>
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int128VectorTests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2127,7 +2127,7 @@ static void LSHLInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Int128VectorTests::LSHL);
     }
 
 
@@ -2149,7 +2149,7 @@ static void LSHLInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::LSHL);
     }
 
 
@@ -2175,7 +2175,7 @@ static void ASHRInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Int128VectorTests::ASHR);
     }
 
 
@@ -2197,7 +2197,7 @@ static void ASHRInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::ASHR);
     }
 
 
@@ -2223,7 +2223,7 @@ static void LSHRInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Int128VectorTests::LSHR);
     }
 
 
@@ -2245,7 +2245,7 @@ static void LSHRInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::LSHR);
     }
 
 
@@ -2270,7 +2270,7 @@ static void LSHLInt128VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Int128VectorTests::LSHL_unary);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLInt128VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::LSHL_unary);
     }
 
 
@@ -2316,7 +2316,7 @@ static void LSHRInt128VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Int128VectorTests::LSHR_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRInt128VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::LSHR_unary);
     }
 
 
@@ -2362,7 +2362,7 @@ static void ASHRInt128VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Int128VectorTests::ASHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRInt128VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::ASHR_unary);
     }
 
 
@@ -2408,7 +2408,7 @@ static void MINInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::MIN);
+        assertArraysEquals(r, a, b, Int128VectorTests::MIN);
     }
     static int min(int a, int b) {
         return (int)(Math.min(a, b));
@@ -2426,7 +2426,7 @@ static void minInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::min);
+        assertArraysEquals(r, a, b, Int128VectorTests::min);
     }
     static int MAX(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2446,7 +2446,7 @@ static void MAXInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::MAX);
+        assertArraysEquals(r, a, b, Int128VectorTests::MAX);
     }
     static int max(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2464,7 +2464,7 @@ static void maxInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::max);
+        assertArraysEquals(r, a, b, Int128VectorTests::max);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2478,7 +2478,7 @@ static void MINInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2492,7 +2492,7 @@ static void minInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2506,7 +2506,7 @@ static void MAXInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2520,7 +2520,7 @@ static void maxInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::max);
     }
 
     static int ANDReduce(int[] a, int idx) {
@@ -2563,7 +2563,7 @@ static void ANDReduceInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int128VectorTests::ANDReduce, Int128VectorTests::ANDReduceAll);
     }
 
@@ -2611,7 +2611,7 @@ static void ANDReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::ANDReduceMasked, Int128VectorTests::ANDReduceAllMasked);
     }
 
@@ -2656,7 +2656,7 @@ static void ORReduceInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int128VectorTests::ORReduce, Int128VectorTests::ORReduceAll);
     }
 
@@ -2704,7 +2704,7 @@ static void ORReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::ORReduceMasked, Int128VectorTests::ORReduceAllMasked);
     }
 
@@ -2749,7 +2749,7 @@ static void XORReduceInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int128VectorTests::XORReduce, Int128VectorTests::XORReduceAll);
     }
 
@@ -2797,7 +2797,7 @@ static void XORReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::XORReduceMasked, Int128VectorTests::XORReduceAllMasked);
     }
 
@@ -2839,7 +2839,7 @@ static void ADDReduceInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int128VectorTests::ADDReduce, Int128VectorTests::ADDReduceAll);
     }
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2883,7 +2883,7 @@ static void ADDReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::ADDReduceMasked, Int128VectorTests::ADDReduceAllMasked);
     }
     static int MULReduce(int[] a, int idx) {
@@ -2924,7 +2924,7 @@ static void MULReduceInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int128VectorTests::MULReduce, Int128VectorTests::MULReduceAll);
     }
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2968,7 +2968,7 @@ static void MULReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::MULReduceMasked, Int128VectorTests::MULReduceAllMasked);
     }
     static int MINReduce(int[] a, int idx) {
@@ -3009,7 +3009,7 @@ static void MINReduceInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int128VectorTests::MINReduce, Int128VectorTests::MINReduceAll);
     }
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3054,7 +3054,7 @@ static void MINReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::MINReduceMasked, Int128VectorTests::MINReduceAllMasked);
     }
     static int MAXReduce(int[] a, int idx) {
@@ -3095,7 +3095,7 @@ static void MAXReduceInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int128VectorTests::MAXReduce, Int128VectorTests::MAXReduceAll);
     }
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3140,7 +3140,7 @@ static void MAXReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::MAXReduceMasked, Int128VectorTests::MAXReduceAllMasked);
     }
 
@@ -3166,7 +3166,7 @@ static void anyTrueInt128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Int128VectorTests::anyTrue);
     }
 
 
@@ -3192,7 +3192,7 @@ static void allTrueInt128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Int128VectorTests::allTrue);
     }
 
 
@@ -3208,7 +3208,7 @@ static void withInt128VectorTests(IntFunction<int []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (int)4, 0);
+        assertInsertArraysEquals(r, a, (int)4, 0);
     }
     static boolean testIS_DEFAULT(int a) {
         return bits(a)==0;
@@ -3757,7 +3757,7 @@ static void blendInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
@@ -3774,7 +3774,7 @@ static void RearrangeInt128VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -3792,7 +3792,7 @@ static void RearrangeInt128VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "intUnaryOpProvider")
     static void getInt128VectorTests(IntFunction<int[]> fa) {
@@ -3947,7 +3947,7 @@ static void getInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::get);
+        assertArraysEquals(r, a, Int128VectorTests::get);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -3961,7 +3961,7 @@ static void BroadcastInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4008,7 +4008,7 @@ static void sliceUnaryInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Int128VectorTests::sliceUnary);
     }
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4037,7 +4037,7 @@ static void sliceBinaryInt128VectorTestsBinary(IntFunction<int[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Int128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Int128VectorTests::sliceBinary);
     }
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4070,7 +4070,7 @@ static void sliceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Int128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Int128VectorTests::slice);
     }
     static int[] unsliceUnary(int[] a, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4097,7 +4097,7 @@ static void unsliceUnaryInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Int128VectorTests::unsliceUnary);
     }
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4136,7 +4136,7 @@ static void unsliceBinaryInt128VectorTestsBinary(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Int128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Int128VectorTests::unsliceBinary);
     }
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4192,7 +4192,7 @@ static void unsliceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Int128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Int128VectorTests::unslice);
     }
 
 
@@ -4241,7 +4241,7 @@ static void BITWISE_BLENDInt128VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, c, r, Int128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4257,7 +4257,7 @@ static void bitwiseBlendInt128VectorTests(IntFunction<int[]> fa, IntFunction<int
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Int128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
     }
 
 
@@ -4280,7 +4280,7 @@ static void BITWISE_BLENDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Int128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4298,7 +4298,7 @@ static void BITWISE_BLENDInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]>
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4313,7 +4313,7 @@ static void BITWISE_BLENDInt128VectorTestsAltBroadcastSmokeTest(IntFunction<int[
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4327,7 +4327,7 @@ static void bitwiseBlendInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> f
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4342,7 +4342,7 @@ static void bitwiseBlendInt128VectorTestsAltBroadcastSmokeTest(IntFunction<int[]
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
     }
 
 
@@ -4362,7 +4362,7 @@ static void BITWISE_BLENDInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Int128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDInt128VectorTestsAltBroadcastMaskedSmokeTest(IntFunctio
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Int128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4399,7 +4399,7 @@ static void BITWISE_BLENDInt128VectorTestsDoubleBroadcastSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt128VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4413,7 +4413,7 @@ static void bitwiseBlendInt128VectorTestsDoubleBroadcastSmokeTest(IntFunction<in
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
     }
 
 
@@ -4432,7 +4432,7 @@ static void BITWISE_BLENDInt128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunc
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Int128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4456,7 +4456,7 @@ static void NEGInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::NEG);
+        assertArraysEquals(r, a, Int128VectorTests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4471,7 +4471,7 @@ static void negInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::neg);
+        assertArraysEquals(r, a, Int128VectorTests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4489,7 +4489,7 @@ static void NEGMaskedInt128VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Int128VectorTests::NEG);
     }
 
     static int ABS(int a) {
@@ -4512,7 +4512,7 @@ static void ABSInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::ABS);
+        assertArraysEquals(r, a, Int128VectorTests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4527,7 +4527,7 @@ static void absInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::abs);
+        assertArraysEquals(r, a, Int128VectorTests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4545,7 +4545,7 @@ static void ABSMaskedInt128VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Int128VectorTests::ABS);
     }
 
 
@@ -4571,7 +4571,7 @@ static void NOTInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::NOT);
+        assertArraysEquals(r, a, Int128VectorTests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4586,7 +4586,7 @@ static void notInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::not);
+        assertArraysEquals(r, a, Int128VectorTests::not);
     }
 
 
@@ -4606,7 +4606,7 @@ static void NOTMaskedInt128VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Int128VectorTests::NOT);
     }
 
 
@@ -4629,7 +4629,7 @@ static void ZOMOInt128VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int128VectorTests::ZOMO);
+        assertArraysEquals(r, a, Int128VectorTests::ZOMO);
     }
 
 
@@ -4649,7 +4649,7 @@ static void ZOMOMaskedInt128VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Int128VectorTests::ZOMO);
     }
 
 
@@ -4677,7 +4677,7 @@ static void gatherInt128VectorTests(IntFunction<int[]> fa, BiFunction<Integer,In
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::gather);
+        assertArraysEquals(r, a, b, Int128VectorTests::gather);
     }
     static int[] gatherMasked(int a[], int ix, boolean[] mask, int[] b, int iy) {
         int[] res = new int[SPECIES.length()];
@@ -4705,7 +4705,7 @@ static void gatherMaskedInt128VectorTests(IntFunction<int[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::gatherMasked);
     }
 
     static int[] scatter(int a[], int ix, int[] b, int iy) {
@@ -4730,7 +4730,7 @@ static void scatterInt128VectorTests(IntFunction<int[]> fa, BiFunction<Integer,I
             }
         }
 
-        assertArraysEquals(a, b, r, Int128VectorTests::scatter);
+        assertArraysEquals(r, a, b, Int128VectorTests::scatter);
     }
 
     static int[] scatterMasked(int r[], int a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4768,7 +4768,7 @@ static void scatterMaskedInt128VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int128VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Int128VectorTests::scatterMasked);
     }
 
 
@@ -4810,8 +4810,8 @@ static void toIntArrayInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4821,8 +4821,8 @@ static void toLongArrayInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4832,8 +4832,8 @@ static void toDoubleArrayInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4899,7 +4899,7 @@ static void ADDReduceLongInt128VectorTests(IntFunction<int[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Int128VectorTests::ADDReduceLong, Int128VectorTests::ADDReduceAllLong);
     }
 
@@ -4940,7 +4940,7 @@ static void ADDReduceLongInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Int128VectorTests::ADDReduceLongMasked, Int128VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4952,7 +4952,7 @@ static void BroadcastLongInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -4970,7 +4970,7 @@ static void blendInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa,
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int128VectorTests::blend);
     }
 
 
@@ -4987,7 +4987,7 @@ static void SelectFromInt128VectorTests(IntFunction<int[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -5006,7 +5006,7 @@ static void SelectFromInt128VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5083,7 +5083,7 @@ static void maskEqInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunct
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Int128VectorTests::beq);
+        assertArraysEquals(r, a, b, Int128VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java
index 145d89ca6b7dc..6f43ed2f0f28b 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Int256VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (256 / 8));
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(int[] a, int[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<int[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new int[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<int[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorTests.java b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
index a2343b08f062c..37e44fa3f3df9 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         int apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         int[] apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         int apply(int[] a);
     }
 
-    static void assertReductionArraysEquals(int[] a, int[] b, int c,
+    static void assertReductionArraysEquals(int[] r, int rc, int[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         int apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(int[] a, int[] b, int c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(int[] r, int rc, int[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(int[] a);
     }
 
-    static void assertReductionLongArraysEquals(int[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, int[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(int[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, int[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(int[] a, int[] b, int element, int index) {
+    static void assertInsertArraysEquals(int[] r, int[] a, int element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vecto
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vect
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[]
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[
         }
     }
 
-    static void assertBroadcastArraysEquals(int[]a, int[]r) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f)
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMa
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[]
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTer
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, F
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, bool
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, b
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         int apply(int[] a, int b);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FBinArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         int[] apply(int[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         int[] apply(int[] r, int[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatt
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         int[] apply(int[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         int[] apply(int[] a, int[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         int[] apply(int[] a, int[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[]
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         int[] apply(int[] a, int[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         int[] apply(int[] a, int[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
     }
 
 
-    static void assertArraysEquals(int[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(int[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(int[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(int[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(int[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1254,7 +1254,7 @@ static void ADDInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::ADD);
+        assertArraysEquals(r, a, b, Int256VectorTests::ADD);
     }
     static int add(int a, int b) {
         return (int)(a + b);
@@ -1272,7 +1272,7 @@ static void addInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::add);
+        assertArraysEquals(r, a, b, Int256VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1292,7 +1292,7 @@ static void ADDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1310,7 +1310,7 @@ static void addInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::add);
     }
     static int SUB(int a, int b) {
         return (int)(a - b);
@@ -1330,7 +1330,7 @@ static void SUBInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::SUB);
+        assertArraysEquals(r, a, b, Int256VectorTests::SUB);
     }
     static int sub(int a, int b) {
         return (int)(a - b);
@@ -1348,7 +1348,7 @@ static void subInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::sub);
+        assertArraysEquals(r, a, b, Int256VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1368,7 +1368,7 @@ static void SUBInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1386,7 +1386,7 @@ static void subInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::sub);
     }
     static int MUL(int a, int b) {
         return (int)(a * b);
@@ -1406,7 +1406,7 @@ static void MULInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::MUL);
+        assertArraysEquals(r, a, b, Int256VectorTests::MUL);
     }
     static int mul(int a, int b) {
         return (int)(a * b);
@@ -1424,7 +1424,7 @@ static void mulInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::mul);
+        assertArraysEquals(r, a, b, Int256VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void MULInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void mulInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::mul);
     }
 
 
@@ -1487,7 +1487,7 @@ static void DIVInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::DIV);
+        assertArraysEquals(r, a, b, Int256VectorTests::DIV);
     }
     static int div(int a, int b) {
         return (int)(a / b);
@@ -1509,7 +1509,7 @@ static void divInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::div);
+        assertArraysEquals(r, a, b, Int256VectorTests::div);
     }
 
 
@@ -1533,7 +1533,7 @@ static void DIVInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1555,7 +1555,7 @@ static void divInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1576,7 +1576,7 @@ static void FIRST_NONZEROInt256VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Int256VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void FIRST_NONZEROInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1617,7 +1617,7 @@ static void ANDInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::AND);
+        assertArraysEquals(r, a, b, Int256VectorTests::AND);
     }
     static int and(int a, int b) {
         return (int)(a & b);
@@ -1635,7 +1635,7 @@ static void andInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::and);
+        assertArraysEquals(r, a, b, Int256VectorTests::and);
     }
 
 
@@ -1657,7 +1657,7 @@ static void ANDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::AND);
     }
 
 
@@ -1679,7 +1679,7 @@ static void AND_NOTInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Int256VectorTests::AND_NOT);
     }
 
 
@@ -1701,7 +1701,7 @@ static void AND_NOTInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::AND_NOT);
     }
 
 
@@ -1723,7 +1723,7 @@ static void ORInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::OR);
+        assertArraysEquals(r, a, b, Int256VectorTests::OR);
     }
     static int or(int a, int b) {
         return (int)(a | b);
@@ -1741,7 +1741,7 @@ static void orInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::or);
+        assertArraysEquals(r, a, b, Int256VectorTests::or);
     }
 
 
@@ -1763,7 +1763,7 @@ static void ORInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::OR);
     }
 
 
@@ -1785,7 +1785,7 @@ static void XORInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::XOR);
+        assertArraysEquals(r, a, b, Int256VectorTests::XOR);
     }
 
 
@@ -1807,7 +1807,7 @@ static void XORInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::XOR);
     }
 
 
@@ -1822,7 +1822,7 @@ static void addInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1839,7 +1839,7 @@ static void addInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1853,7 +1853,7 @@ static void subInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1870,7 +1870,7 @@ static void subInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1884,7 +1884,7 @@ static void mulInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void mulInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::mul);
     }
 
 
@@ -1920,7 +1920,7 @@ static void divInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::div);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::div);
     }
 
 
@@ -1957,7 +1957,7 @@ static void ORInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1971,7 +1971,7 @@ static void orInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::or);
     }
 
 
@@ -1990,7 +1990,7 @@ static void ORInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::OR);
     }
 
 
@@ -2006,7 +2006,7 @@ static void ANDInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2020,7 +2020,7 @@ static void andInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::and);
     }
 
 
@@ -2039,7 +2039,7 @@ static void ANDInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::AND);
     }
 
 
@@ -2055,7 +2055,7 @@ static void ORInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, Int
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Int256VectorTests::OR);
     }
 
 
@@ -2074,7 +2074,7 @@ static void ORInt256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> f
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int256VectorTests::OR);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ADDInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, In
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Int256VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -2106,7 +2106,7 @@ static void ADDInt256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]>
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int256VectorTests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2127,7 +2127,7 @@ static void LSHLInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Int256VectorTests::LSHL);
     }
 
 
@@ -2149,7 +2149,7 @@ static void LSHLInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::LSHL);
     }
 
 
@@ -2175,7 +2175,7 @@ static void ASHRInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Int256VectorTests::ASHR);
     }
 
 
@@ -2197,7 +2197,7 @@ static void ASHRInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::ASHR);
     }
 
 
@@ -2223,7 +2223,7 @@ static void LSHRInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Int256VectorTests::LSHR);
     }
 
 
@@ -2245,7 +2245,7 @@ static void LSHRInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::LSHR);
     }
 
 
@@ -2270,7 +2270,7 @@ static void LSHLInt256VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Int256VectorTests::LSHL_unary);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLInt256VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::LSHL_unary);
     }
 
 
@@ -2316,7 +2316,7 @@ static void LSHRInt256VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Int256VectorTests::LSHR_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRInt256VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::LSHR_unary);
     }
 
 
@@ -2362,7 +2362,7 @@ static void ASHRInt256VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Int256VectorTests::ASHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRInt256VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::ASHR_unary);
     }
 
 
@@ -2408,7 +2408,7 @@ static void MINInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::MIN);
+        assertArraysEquals(r, a, b, Int256VectorTests::MIN);
     }
     static int min(int a, int b) {
         return (int)(Math.min(a, b));
@@ -2426,7 +2426,7 @@ static void minInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::min);
+        assertArraysEquals(r, a, b, Int256VectorTests::min);
     }
     static int MAX(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2446,7 +2446,7 @@ static void MAXInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::MAX);
+        assertArraysEquals(r, a, b, Int256VectorTests::MAX);
     }
     static int max(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2464,7 +2464,7 @@ static void maxInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::max);
+        assertArraysEquals(r, a, b, Int256VectorTests::max);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2478,7 +2478,7 @@ static void MINInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2492,7 +2492,7 @@ static void minInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2506,7 +2506,7 @@ static void MAXInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2520,7 +2520,7 @@ static void maxInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::max);
     }
 
     static int ANDReduce(int[] a, int idx) {
@@ -2563,7 +2563,7 @@ static void ANDReduceInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int256VectorTests::ANDReduce, Int256VectorTests::ANDReduceAll);
     }
 
@@ -2611,7 +2611,7 @@ static void ANDReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::ANDReduceMasked, Int256VectorTests::ANDReduceAllMasked);
     }
 
@@ -2656,7 +2656,7 @@ static void ORReduceInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int256VectorTests::ORReduce, Int256VectorTests::ORReduceAll);
     }
 
@@ -2704,7 +2704,7 @@ static void ORReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::ORReduceMasked, Int256VectorTests::ORReduceAllMasked);
     }
 
@@ -2749,7 +2749,7 @@ static void XORReduceInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int256VectorTests::XORReduce, Int256VectorTests::XORReduceAll);
     }
 
@@ -2797,7 +2797,7 @@ static void XORReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::XORReduceMasked, Int256VectorTests::XORReduceAllMasked);
     }
 
@@ -2839,7 +2839,7 @@ static void ADDReduceInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int256VectorTests::ADDReduce, Int256VectorTests::ADDReduceAll);
     }
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2883,7 +2883,7 @@ static void ADDReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::ADDReduceMasked, Int256VectorTests::ADDReduceAllMasked);
     }
     static int MULReduce(int[] a, int idx) {
@@ -2924,7 +2924,7 @@ static void MULReduceInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int256VectorTests::MULReduce, Int256VectorTests::MULReduceAll);
     }
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2968,7 +2968,7 @@ static void MULReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::MULReduceMasked, Int256VectorTests::MULReduceAllMasked);
     }
     static int MINReduce(int[] a, int idx) {
@@ -3009,7 +3009,7 @@ static void MINReduceInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int256VectorTests::MINReduce, Int256VectorTests::MINReduceAll);
     }
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3054,7 +3054,7 @@ static void MINReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::MINReduceMasked, Int256VectorTests::MINReduceAllMasked);
     }
     static int MAXReduce(int[] a, int idx) {
@@ -3095,7 +3095,7 @@ static void MAXReduceInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int256VectorTests::MAXReduce, Int256VectorTests::MAXReduceAll);
     }
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3140,7 +3140,7 @@ static void MAXReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::MAXReduceMasked, Int256VectorTests::MAXReduceAllMasked);
     }
 
@@ -3166,7 +3166,7 @@ static void anyTrueInt256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Int256VectorTests::anyTrue);
     }
 
 
@@ -3192,7 +3192,7 @@ static void allTrueInt256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Int256VectorTests::allTrue);
     }
 
 
@@ -3208,7 +3208,7 @@ static void withInt256VectorTests(IntFunction<int []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (int)4, 0);
+        assertInsertArraysEquals(r, a, (int)4, 0);
     }
     static boolean testIS_DEFAULT(int a) {
         return bits(a)==0;
@@ -3757,7 +3757,7 @@ static void blendInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
@@ -3774,7 +3774,7 @@ static void RearrangeInt256VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -3792,7 +3792,7 @@ static void RearrangeInt256VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "intUnaryOpProvider")
     static void getInt256VectorTests(IntFunction<int[]> fa) {
@@ -3947,7 +3947,7 @@ static void getInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::get);
+        assertArraysEquals(r, a, Int256VectorTests::get);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -3961,7 +3961,7 @@ static void BroadcastInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4008,7 +4008,7 @@ static void sliceUnaryInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Int256VectorTests::sliceUnary);
     }
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4037,7 +4037,7 @@ static void sliceBinaryInt256VectorTestsBinary(IntFunction<int[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Int256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Int256VectorTests::sliceBinary);
     }
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4070,7 +4070,7 @@ static void sliceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Int256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Int256VectorTests::slice);
     }
     static int[] unsliceUnary(int[] a, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4097,7 +4097,7 @@ static void unsliceUnaryInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Int256VectorTests::unsliceUnary);
     }
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4136,7 +4136,7 @@ static void unsliceBinaryInt256VectorTestsBinary(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Int256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Int256VectorTests::unsliceBinary);
     }
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4192,7 +4192,7 @@ static void unsliceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Int256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Int256VectorTests::unslice);
     }
 
 
@@ -4241,7 +4241,7 @@ static void BITWISE_BLENDInt256VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, c, r, Int256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4257,7 +4257,7 @@ static void bitwiseBlendInt256VectorTests(IntFunction<int[]> fa, IntFunction<int
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Int256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
     }
 
 
@@ -4280,7 +4280,7 @@ static void BITWISE_BLENDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Int256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4298,7 +4298,7 @@ static void BITWISE_BLENDInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]>
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4313,7 +4313,7 @@ static void BITWISE_BLENDInt256VectorTestsAltBroadcastSmokeTest(IntFunction<int[
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4327,7 +4327,7 @@ static void bitwiseBlendInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> f
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4342,7 +4342,7 @@ static void bitwiseBlendInt256VectorTestsAltBroadcastSmokeTest(IntFunction<int[]
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
     }
 
 
@@ -4362,7 +4362,7 @@ static void BITWISE_BLENDInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Int256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDInt256VectorTestsAltBroadcastMaskedSmokeTest(IntFunctio
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Int256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4399,7 +4399,7 @@ static void BITWISE_BLENDInt256VectorTestsDoubleBroadcastSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt256VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4413,7 +4413,7 @@ static void bitwiseBlendInt256VectorTestsDoubleBroadcastSmokeTest(IntFunction<in
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
     }
 
 
@@ -4432,7 +4432,7 @@ static void BITWISE_BLENDInt256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunc
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Int256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4456,7 +4456,7 @@ static void NEGInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::NEG);
+        assertArraysEquals(r, a, Int256VectorTests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4471,7 +4471,7 @@ static void negInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::neg);
+        assertArraysEquals(r, a, Int256VectorTests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4489,7 +4489,7 @@ static void NEGMaskedInt256VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Int256VectorTests::NEG);
     }
 
     static int ABS(int a) {
@@ -4512,7 +4512,7 @@ static void ABSInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::ABS);
+        assertArraysEquals(r, a, Int256VectorTests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4527,7 +4527,7 @@ static void absInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::abs);
+        assertArraysEquals(r, a, Int256VectorTests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4545,7 +4545,7 @@ static void ABSMaskedInt256VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Int256VectorTests::ABS);
     }
 
 
@@ -4571,7 +4571,7 @@ static void NOTInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::NOT);
+        assertArraysEquals(r, a, Int256VectorTests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4586,7 +4586,7 @@ static void notInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::not);
+        assertArraysEquals(r, a, Int256VectorTests::not);
     }
 
 
@@ -4606,7 +4606,7 @@ static void NOTMaskedInt256VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Int256VectorTests::NOT);
     }
 
 
@@ -4629,7 +4629,7 @@ static void ZOMOInt256VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int256VectorTests::ZOMO);
+        assertArraysEquals(r, a, Int256VectorTests::ZOMO);
     }
 
 
@@ -4649,7 +4649,7 @@ static void ZOMOMaskedInt256VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Int256VectorTests::ZOMO);
     }
 
 
@@ -4677,7 +4677,7 @@ static void gatherInt256VectorTests(IntFunction<int[]> fa, BiFunction<Integer,In
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::gather);
+        assertArraysEquals(r, a, b, Int256VectorTests::gather);
     }
     static int[] gatherMasked(int a[], int ix, boolean[] mask, int[] b, int iy) {
         int[] res = new int[SPECIES.length()];
@@ -4705,7 +4705,7 @@ static void gatherMaskedInt256VectorTests(IntFunction<int[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::gatherMasked);
     }
 
     static int[] scatter(int a[], int ix, int[] b, int iy) {
@@ -4730,7 +4730,7 @@ static void scatterInt256VectorTests(IntFunction<int[]> fa, BiFunction<Integer,I
             }
         }
 
-        assertArraysEquals(a, b, r, Int256VectorTests::scatter);
+        assertArraysEquals(r, a, b, Int256VectorTests::scatter);
     }
 
     static int[] scatterMasked(int r[], int a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4768,7 +4768,7 @@ static void scatterMaskedInt256VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int256VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Int256VectorTests::scatterMasked);
     }
 
 
@@ -4810,8 +4810,8 @@ static void toIntArrayInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4821,8 +4821,8 @@ static void toLongArrayInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4832,8 +4832,8 @@ static void toDoubleArrayInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4899,7 +4899,7 @@ static void ADDReduceLongInt256VectorTests(IntFunction<int[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Int256VectorTests::ADDReduceLong, Int256VectorTests::ADDReduceAllLong);
     }
 
@@ -4940,7 +4940,7 @@ static void ADDReduceLongInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Int256VectorTests::ADDReduceLongMasked, Int256VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4952,7 +4952,7 @@ static void BroadcastLongInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -4970,7 +4970,7 @@ static void blendInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa,
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int256VectorTests::blend);
     }
 
 
@@ -4987,7 +4987,7 @@ static void SelectFromInt256VectorTests(IntFunction<int[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -5006,7 +5006,7 @@ static void SelectFromInt256VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5083,7 +5083,7 @@ static void maskEqInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunct
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Int256VectorTests::beq);
+        assertArraysEquals(r, a, b, Int256VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java
index 1c1b076d0e864..d0ed4682c1dc5 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Int512VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (512 / 8));
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(int[] a, int[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<int[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new int[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<int[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorTests.java b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
index 3033460ed8f88..943cb444ec5aa 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         int apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         int[] apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         int apply(int[] a);
     }
 
-    static void assertReductionArraysEquals(int[] a, int[] b, int c,
+    static void assertReductionArraysEquals(int[] r, int rc, int[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         int apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(int[] a, int[] b, int c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(int[] r, int rc, int[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(int[] a);
     }
 
-    static void assertReductionLongArraysEquals(int[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, int[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(int[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, int[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(int[] a, int[] b, int element, int index) {
+    static void assertInsertArraysEquals(int[] r, int[] a, int element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vecto
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vect
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[]
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[
         }
     }
 
-    static void assertBroadcastArraysEquals(int[]a, int[]r) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f)
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMa
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[]
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTer
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, F
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, bool
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, b
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         int apply(int[] a, int b);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FBinArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         int[] apply(int[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         int[] apply(int[] r, int[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatt
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         int[] apply(int[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         int[] apply(int[] a, int[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         int[] apply(int[] a, int[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[]
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         int[] apply(int[] a, int[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         int[] apply(int[] a, int[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
     }
 
 
-    static void assertArraysEquals(int[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(int[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(int[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(int[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(int[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1254,7 +1254,7 @@ static void ADDInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::ADD);
+        assertArraysEquals(r, a, b, Int512VectorTests::ADD);
     }
     static int add(int a, int b) {
         return (int)(a + b);
@@ -1272,7 +1272,7 @@ static void addInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::add);
+        assertArraysEquals(r, a, b, Int512VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1292,7 +1292,7 @@ static void ADDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1310,7 +1310,7 @@ static void addInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::add);
     }
     static int SUB(int a, int b) {
         return (int)(a - b);
@@ -1330,7 +1330,7 @@ static void SUBInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::SUB);
+        assertArraysEquals(r, a, b, Int512VectorTests::SUB);
     }
     static int sub(int a, int b) {
         return (int)(a - b);
@@ -1348,7 +1348,7 @@ static void subInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::sub);
+        assertArraysEquals(r, a, b, Int512VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1368,7 +1368,7 @@ static void SUBInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1386,7 +1386,7 @@ static void subInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::sub);
     }
     static int MUL(int a, int b) {
         return (int)(a * b);
@@ -1406,7 +1406,7 @@ static void MULInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::MUL);
+        assertArraysEquals(r, a, b, Int512VectorTests::MUL);
     }
     static int mul(int a, int b) {
         return (int)(a * b);
@@ -1424,7 +1424,7 @@ static void mulInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::mul);
+        assertArraysEquals(r, a, b, Int512VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void MULInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void mulInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::mul);
     }
 
 
@@ -1487,7 +1487,7 @@ static void DIVInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::DIV);
+        assertArraysEquals(r, a, b, Int512VectorTests::DIV);
     }
     static int div(int a, int b) {
         return (int)(a / b);
@@ -1509,7 +1509,7 @@ static void divInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::div);
+        assertArraysEquals(r, a, b, Int512VectorTests::div);
     }
 
 
@@ -1533,7 +1533,7 @@ static void DIVInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1555,7 +1555,7 @@ static void divInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1576,7 +1576,7 @@ static void FIRST_NONZEROInt512VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Int512VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void FIRST_NONZEROInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1617,7 +1617,7 @@ static void ANDInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::AND);
+        assertArraysEquals(r, a, b, Int512VectorTests::AND);
     }
     static int and(int a, int b) {
         return (int)(a & b);
@@ -1635,7 +1635,7 @@ static void andInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::and);
+        assertArraysEquals(r, a, b, Int512VectorTests::and);
     }
 
 
@@ -1657,7 +1657,7 @@ static void ANDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::AND);
     }
 
 
@@ -1679,7 +1679,7 @@ static void AND_NOTInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Int512VectorTests::AND_NOT);
     }
 
 
@@ -1701,7 +1701,7 @@ static void AND_NOTInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::AND_NOT);
     }
 
 
@@ -1723,7 +1723,7 @@ static void ORInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::OR);
+        assertArraysEquals(r, a, b, Int512VectorTests::OR);
     }
     static int or(int a, int b) {
         return (int)(a | b);
@@ -1741,7 +1741,7 @@ static void orInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::or);
+        assertArraysEquals(r, a, b, Int512VectorTests::or);
     }
 
 
@@ -1763,7 +1763,7 @@ static void ORInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::OR);
     }
 
 
@@ -1785,7 +1785,7 @@ static void XORInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::XOR);
+        assertArraysEquals(r, a, b, Int512VectorTests::XOR);
     }
 
 
@@ -1807,7 +1807,7 @@ static void XORInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::XOR);
     }
 
 
@@ -1822,7 +1822,7 @@ static void addInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1839,7 +1839,7 @@ static void addInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1853,7 +1853,7 @@ static void subInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1870,7 +1870,7 @@ static void subInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1884,7 +1884,7 @@ static void mulInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void mulInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::mul);
     }
 
 
@@ -1920,7 +1920,7 @@ static void divInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::div);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::div);
     }
 
 
@@ -1957,7 +1957,7 @@ static void ORInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1971,7 +1971,7 @@ static void orInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::or);
     }
 
 
@@ -1990,7 +1990,7 @@ static void ORInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::OR);
     }
 
 
@@ -2006,7 +2006,7 @@ static void ANDInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2020,7 +2020,7 @@ static void andInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::and);
     }
 
 
@@ -2039,7 +2039,7 @@ static void ANDInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::AND);
     }
 
 
@@ -2055,7 +2055,7 @@ static void ORInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, Int
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Int512VectorTests::OR);
     }
 
 
@@ -2074,7 +2074,7 @@ static void ORInt512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> f
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int512VectorTests::OR);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ADDInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, In
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Int512VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -2106,7 +2106,7 @@ static void ADDInt512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]>
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int512VectorTests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2127,7 +2127,7 @@ static void LSHLInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Int512VectorTests::LSHL);
     }
 
 
@@ -2149,7 +2149,7 @@ static void LSHLInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::LSHL);
     }
 
 
@@ -2175,7 +2175,7 @@ static void ASHRInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Int512VectorTests::ASHR);
     }
 
 
@@ -2197,7 +2197,7 @@ static void ASHRInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::ASHR);
     }
 
 
@@ -2223,7 +2223,7 @@ static void LSHRInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Int512VectorTests::LSHR);
     }
 
 
@@ -2245,7 +2245,7 @@ static void LSHRInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::LSHR);
     }
 
 
@@ -2270,7 +2270,7 @@ static void LSHLInt512VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Int512VectorTests::LSHL_unary);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLInt512VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::LSHL_unary);
     }
 
 
@@ -2316,7 +2316,7 @@ static void LSHRInt512VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Int512VectorTests::LSHR_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRInt512VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::LSHR_unary);
     }
 
 
@@ -2362,7 +2362,7 @@ static void ASHRInt512VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Int512VectorTests::ASHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRInt512VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::ASHR_unary);
     }
 
 
@@ -2408,7 +2408,7 @@ static void MINInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::MIN);
+        assertArraysEquals(r, a, b, Int512VectorTests::MIN);
     }
     static int min(int a, int b) {
         return (int)(Math.min(a, b));
@@ -2426,7 +2426,7 @@ static void minInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::min);
+        assertArraysEquals(r, a, b, Int512VectorTests::min);
     }
     static int MAX(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2446,7 +2446,7 @@ static void MAXInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::MAX);
+        assertArraysEquals(r, a, b, Int512VectorTests::MAX);
     }
     static int max(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2464,7 +2464,7 @@ static void maxInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::max);
+        assertArraysEquals(r, a, b, Int512VectorTests::max);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2478,7 +2478,7 @@ static void MINInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2492,7 +2492,7 @@ static void minInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2506,7 +2506,7 @@ static void MAXInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2520,7 +2520,7 @@ static void maxInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::max);
     }
 
     static int ANDReduce(int[] a, int idx) {
@@ -2563,7 +2563,7 @@ static void ANDReduceInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int512VectorTests::ANDReduce, Int512VectorTests::ANDReduceAll);
     }
 
@@ -2611,7 +2611,7 @@ static void ANDReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::ANDReduceMasked, Int512VectorTests::ANDReduceAllMasked);
     }
 
@@ -2656,7 +2656,7 @@ static void ORReduceInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int512VectorTests::ORReduce, Int512VectorTests::ORReduceAll);
     }
 
@@ -2704,7 +2704,7 @@ static void ORReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::ORReduceMasked, Int512VectorTests::ORReduceAllMasked);
     }
 
@@ -2749,7 +2749,7 @@ static void XORReduceInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int512VectorTests::XORReduce, Int512VectorTests::XORReduceAll);
     }
 
@@ -2797,7 +2797,7 @@ static void XORReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::XORReduceMasked, Int512VectorTests::XORReduceAllMasked);
     }
 
@@ -2839,7 +2839,7 @@ static void ADDReduceInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int512VectorTests::ADDReduce, Int512VectorTests::ADDReduceAll);
     }
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2883,7 +2883,7 @@ static void ADDReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::ADDReduceMasked, Int512VectorTests::ADDReduceAllMasked);
     }
     static int MULReduce(int[] a, int idx) {
@@ -2924,7 +2924,7 @@ static void MULReduceInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int512VectorTests::MULReduce, Int512VectorTests::MULReduceAll);
     }
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2968,7 +2968,7 @@ static void MULReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::MULReduceMasked, Int512VectorTests::MULReduceAllMasked);
     }
     static int MINReduce(int[] a, int idx) {
@@ -3009,7 +3009,7 @@ static void MINReduceInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int512VectorTests::MINReduce, Int512VectorTests::MINReduceAll);
     }
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3054,7 +3054,7 @@ static void MINReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::MINReduceMasked, Int512VectorTests::MINReduceAllMasked);
     }
     static int MAXReduce(int[] a, int idx) {
@@ -3095,7 +3095,7 @@ static void MAXReduceInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int512VectorTests::MAXReduce, Int512VectorTests::MAXReduceAll);
     }
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3140,7 +3140,7 @@ static void MAXReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::MAXReduceMasked, Int512VectorTests::MAXReduceAllMasked);
     }
 
@@ -3166,7 +3166,7 @@ static void anyTrueInt512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Int512VectorTests::anyTrue);
     }
 
 
@@ -3192,7 +3192,7 @@ static void allTrueInt512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Int512VectorTests::allTrue);
     }
 
 
@@ -3208,7 +3208,7 @@ static void withInt512VectorTests(IntFunction<int []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (int)4, 0);
+        assertInsertArraysEquals(r, a, (int)4, 0);
     }
     static boolean testIS_DEFAULT(int a) {
         return bits(a)==0;
@@ -3757,7 +3757,7 @@ static void blendInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
@@ -3774,7 +3774,7 @@ static void RearrangeInt512VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -3792,7 +3792,7 @@ static void RearrangeInt512VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "intUnaryOpProvider")
     static void getInt512VectorTests(IntFunction<int[]> fa) {
@@ -3947,7 +3947,7 @@ static void getInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::get);
+        assertArraysEquals(r, a, Int512VectorTests::get);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -3961,7 +3961,7 @@ static void BroadcastInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4008,7 +4008,7 @@ static void sliceUnaryInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Int512VectorTests::sliceUnary);
     }
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4037,7 +4037,7 @@ static void sliceBinaryInt512VectorTestsBinary(IntFunction<int[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Int512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Int512VectorTests::sliceBinary);
     }
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4070,7 +4070,7 @@ static void sliceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Int512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Int512VectorTests::slice);
     }
     static int[] unsliceUnary(int[] a, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4097,7 +4097,7 @@ static void unsliceUnaryInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Int512VectorTests::unsliceUnary);
     }
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4136,7 +4136,7 @@ static void unsliceBinaryInt512VectorTestsBinary(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Int512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Int512VectorTests::unsliceBinary);
     }
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4192,7 +4192,7 @@ static void unsliceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Int512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Int512VectorTests::unslice);
     }
 
 
@@ -4241,7 +4241,7 @@ static void BITWISE_BLENDInt512VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, c, r, Int512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4257,7 +4257,7 @@ static void bitwiseBlendInt512VectorTests(IntFunction<int[]> fa, IntFunction<int
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Int512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
     }
 
 
@@ -4280,7 +4280,7 @@ static void BITWISE_BLENDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Int512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4298,7 +4298,7 @@ static void BITWISE_BLENDInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]>
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4313,7 +4313,7 @@ static void BITWISE_BLENDInt512VectorTestsAltBroadcastSmokeTest(IntFunction<int[
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4327,7 +4327,7 @@ static void bitwiseBlendInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> f
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4342,7 +4342,7 @@ static void bitwiseBlendInt512VectorTestsAltBroadcastSmokeTest(IntFunction<int[]
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
     }
 
 
@@ -4362,7 +4362,7 @@ static void BITWISE_BLENDInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Int512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDInt512VectorTestsAltBroadcastMaskedSmokeTest(IntFunctio
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Int512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4399,7 +4399,7 @@ static void BITWISE_BLENDInt512VectorTestsDoubleBroadcastSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt512VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4413,7 +4413,7 @@ static void bitwiseBlendInt512VectorTestsDoubleBroadcastSmokeTest(IntFunction<in
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
     }
 
 
@@ -4432,7 +4432,7 @@ static void BITWISE_BLENDInt512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunc
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Int512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4456,7 +4456,7 @@ static void NEGInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::NEG);
+        assertArraysEquals(r, a, Int512VectorTests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4471,7 +4471,7 @@ static void negInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::neg);
+        assertArraysEquals(r, a, Int512VectorTests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4489,7 +4489,7 @@ static void NEGMaskedInt512VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Int512VectorTests::NEG);
     }
 
     static int ABS(int a) {
@@ -4512,7 +4512,7 @@ static void ABSInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::ABS);
+        assertArraysEquals(r, a, Int512VectorTests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4527,7 +4527,7 @@ static void absInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::abs);
+        assertArraysEquals(r, a, Int512VectorTests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4545,7 +4545,7 @@ static void ABSMaskedInt512VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Int512VectorTests::ABS);
     }
 
 
@@ -4571,7 +4571,7 @@ static void NOTInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::NOT);
+        assertArraysEquals(r, a, Int512VectorTests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4586,7 +4586,7 @@ static void notInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::not);
+        assertArraysEquals(r, a, Int512VectorTests::not);
     }
 
 
@@ -4606,7 +4606,7 @@ static void NOTMaskedInt512VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Int512VectorTests::NOT);
     }
 
 
@@ -4629,7 +4629,7 @@ static void ZOMOInt512VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int512VectorTests::ZOMO);
+        assertArraysEquals(r, a, Int512VectorTests::ZOMO);
     }
 
 
@@ -4649,7 +4649,7 @@ static void ZOMOMaskedInt512VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Int512VectorTests::ZOMO);
     }
 
 
@@ -4677,7 +4677,7 @@ static void gatherInt512VectorTests(IntFunction<int[]> fa, BiFunction<Integer,In
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::gather);
+        assertArraysEquals(r, a, b, Int512VectorTests::gather);
     }
     static int[] gatherMasked(int a[], int ix, boolean[] mask, int[] b, int iy) {
         int[] res = new int[SPECIES.length()];
@@ -4705,7 +4705,7 @@ static void gatherMaskedInt512VectorTests(IntFunction<int[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::gatherMasked);
     }
 
     static int[] scatter(int a[], int ix, int[] b, int iy) {
@@ -4730,7 +4730,7 @@ static void scatterInt512VectorTests(IntFunction<int[]> fa, BiFunction<Integer,I
             }
         }
 
-        assertArraysEquals(a, b, r, Int512VectorTests::scatter);
+        assertArraysEquals(r, a, b, Int512VectorTests::scatter);
     }
 
     static int[] scatterMasked(int r[], int a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4768,7 +4768,7 @@ static void scatterMaskedInt512VectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int512VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Int512VectorTests::scatterMasked);
     }
 
 
@@ -4810,8 +4810,8 @@ static void toIntArrayInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4821,8 +4821,8 @@ static void toLongArrayInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4832,8 +4832,8 @@ static void toDoubleArrayInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4899,7 +4899,7 @@ static void ADDReduceLongInt512VectorTests(IntFunction<int[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Int512VectorTests::ADDReduceLong, Int512VectorTests::ADDReduceAllLong);
     }
 
@@ -4940,7 +4940,7 @@ static void ADDReduceLongInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunct
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Int512VectorTests::ADDReduceLongMasked, Int512VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4952,7 +4952,7 @@ static void BroadcastLongInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -4970,7 +4970,7 @@ static void blendInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa,
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int512VectorTests::blend);
     }
 
 
@@ -4987,7 +4987,7 @@ static void SelectFromInt512VectorTests(IntFunction<int[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -5006,7 +5006,7 @@ static void SelectFromInt512VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5083,7 +5083,7 @@ static void maskEqInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunct
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Int512VectorTests::beq);
+        assertArraysEquals(r, a, b, Int512VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java
index 8878425b25d25..c17b8591dd328 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Int64VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (64 / 8));
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(int[] a, int[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<int[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new int[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<int[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorTests.java b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
index 5861a039da195..9a3a9541423a0 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         int apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         int[] apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         int apply(int[] a);
     }
 
-    static void assertReductionArraysEquals(int[] a, int[] b, int c,
+    static void assertReductionArraysEquals(int[] r, int rc, int[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         int apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(int[] a, int[] b, int c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(int[] r, int rc, int[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(int[] a);
     }
 
-    static void assertReductionLongArraysEquals(int[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, int[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(int[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, int[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(int[] a, int[] b, int element, int index) {
+    static void assertInsertArraysEquals(int[] r, int[] a, int element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vecto
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vect
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[]
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[
         }
     }
 
-    static void assertBroadcastArraysEquals(int[]a, int[]r) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f)
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMa
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[]
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTer
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, F
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, bool
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, b
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         int apply(int[] a, int b);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FBinArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         int[] apply(int[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         int[] apply(int[] r, int[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatt
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         int[] apply(int[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         int[] apply(int[] a, int[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         int[] apply(int[] a, int[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[]
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         int[] apply(int[] a, int[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         int[] apply(int[] a, int[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
     }
 
 
-    static void assertArraysEquals(int[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(int[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(int[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(int[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(int[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1254,7 +1254,7 @@ static void ADDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::ADD);
+        assertArraysEquals(r, a, b, Int64VectorTests::ADD);
     }
     static int add(int a, int b) {
         return (int)(a + b);
@@ -1272,7 +1272,7 @@ static void addInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::add);
+        assertArraysEquals(r, a, b, Int64VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1292,7 +1292,7 @@ static void ADDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1310,7 +1310,7 @@ static void addInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::add);
     }
     static int SUB(int a, int b) {
         return (int)(a - b);
@@ -1330,7 +1330,7 @@ static void SUBInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::SUB);
+        assertArraysEquals(r, a, b, Int64VectorTests::SUB);
     }
     static int sub(int a, int b) {
         return (int)(a - b);
@@ -1348,7 +1348,7 @@ static void subInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::sub);
+        assertArraysEquals(r, a, b, Int64VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1368,7 +1368,7 @@ static void SUBInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1386,7 +1386,7 @@ static void subInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::sub);
     }
     static int MUL(int a, int b) {
         return (int)(a * b);
@@ -1406,7 +1406,7 @@ static void MULInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::MUL);
+        assertArraysEquals(r, a, b, Int64VectorTests::MUL);
     }
     static int mul(int a, int b) {
         return (int)(a * b);
@@ -1424,7 +1424,7 @@ static void mulInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::mul);
+        assertArraysEquals(r, a, b, Int64VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1444,7 +1444,7 @@ static void MULInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1462,7 +1462,7 @@ static void mulInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::mul);
     }
 
 
@@ -1487,7 +1487,7 @@ static void DIVInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::DIV);
+        assertArraysEquals(r, a, b, Int64VectorTests::DIV);
     }
     static int div(int a, int b) {
         return (int)(a / b);
@@ -1509,7 +1509,7 @@ static void divInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::div);
+        assertArraysEquals(r, a, b, Int64VectorTests::div);
     }
 
 
@@ -1533,7 +1533,7 @@ static void DIVInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1555,7 +1555,7 @@ static void divInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1576,7 +1576,7 @@ static void FIRST_NONZEROInt64VectorTests(IntFunction<int[]> fa, IntFunction<int
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Int64VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1596,7 +1596,7 @@ static void FIRST_NONZEROInt64VectorTestsMasked(IntFunction<int[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1617,7 +1617,7 @@ static void ANDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::AND);
+        assertArraysEquals(r, a, b, Int64VectorTests::AND);
     }
     static int and(int a, int b) {
         return (int)(a & b);
@@ -1635,7 +1635,7 @@ static void andInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::and);
+        assertArraysEquals(r, a, b, Int64VectorTests::and);
     }
 
 
@@ -1657,7 +1657,7 @@ static void ANDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::AND);
     }
 
 
@@ -1679,7 +1679,7 @@ static void AND_NOTInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Int64VectorTests::AND_NOT);
     }
 
 
@@ -1701,7 +1701,7 @@ static void AND_NOTInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::AND_NOT);
     }
 
 
@@ -1723,7 +1723,7 @@ static void ORInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::OR);
+        assertArraysEquals(r, a, b, Int64VectorTests::OR);
     }
     static int or(int a, int b) {
         return (int)(a | b);
@@ -1741,7 +1741,7 @@ static void orInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::or);
+        assertArraysEquals(r, a, b, Int64VectorTests::or);
     }
 
 
@@ -1763,7 +1763,7 @@ static void ORInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::OR);
     }
 
 
@@ -1785,7 +1785,7 @@ static void XORInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::XOR);
+        assertArraysEquals(r, a, b, Int64VectorTests::XOR);
     }
 
 
@@ -1807,7 +1807,7 @@ static void XORInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::XOR);
     }
 
 
@@ -1822,7 +1822,7 @@ static void addInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1839,7 +1839,7 @@ static void addInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1853,7 +1853,7 @@ static void subInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1870,7 +1870,7 @@ static void subInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1884,7 +1884,7 @@ static void mulInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1901,7 +1901,7 @@ static void mulInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::mul);
     }
 
 
@@ -1920,7 +1920,7 @@ static void divInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::div);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::div);
     }
 
 
@@ -1957,7 +1957,7 @@ static void ORInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunct
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1971,7 +1971,7 @@ static void orInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunct
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::or);
     }
 
 
@@ -1990,7 +1990,7 @@ static void ORInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, In
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::OR);
     }
 
 
@@ -2006,7 +2006,7 @@ static void ANDInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2020,7 +2020,7 @@ static void andInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::and);
     }
 
 
@@ -2039,7 +2039,7 @@ static void ANDInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Int64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::AND);
     }
 
 
@@ -2055,7 +2055,7 @@ static void ORInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntF
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Int64VectorTests::OR);
     }
 
 
@@ -2074,7 +2074,7 @@ static void ORInt64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int64VectorTests::OR);
     }
 
 
@@ -2089,7 +2089,7 @@ static void ADDInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, Int
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Int64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Int64VectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -2106,7 +2106,7 @@ static void ADDInt64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> f
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int64VectorTests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2127,7 +2127,7 @@ static void LSHLInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Int64VectorTests::LSHL);
     }
 
 
@@ -2149,7 +2149,7 @@ static void LSHLInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::LSHL);
     }
 
 
@@ -2175,7 +2175,7 @@ static void ASHRInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Int64VectorTests::ASHR);
     }
 
 
@@ -2197,7 +2197,7 @@ static void ASHRInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::ASHR);
     }
 
 
@@ -2223,7 +2223,7 @@ static void LSHRInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Int64VectorTests::LSHR);
     }
 
 
@@ -2245,7 +2245,7 @@ static void LSHRInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::LSHR);
     }
 
 
@@ -2270,7 +2270,7 @@ static void LSHLInt64VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Int64VectorTests::LSHL_unary);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLInt64VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::LSHL_unary);
     }
 
 
@@ -2316,7 +2316,7 @@ static void LSHRInt64VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Int64VectorTests::LSHR_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRInt64VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::LSHR_unary);
     }
 
 
@@ -2362,7 +2362,7 @@ static void ASHRInt64VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Int64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Int64VectorTests::ASHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRInt64VectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Int64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::ASHR_unary);
     }
 
 
@@ -2408,7 +2408,7 @@ static void MINInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::MIN);
+        assertArraysEquals(r, a, b, Int64VectorTests::MIN);
     }
     static int min(int a, int b) {
         return (int)(Math.min(a, b));
@@ -2426,7 +2426,7 @@ static void minInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::min);
+        assertArraysEquals(r, a, b, Int64VectorTests::min);
     }
     static int MAX(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2446,7 +2446,7 @@ static void MAXInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::MAX);
+        assertArraysEquals(r, a, b, Int64VectorTests::MAX);
     }
     static int max(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2464,7 +2464,7 @@ static void maxInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::max);
+        assertArraysEquals(r, a, b, Int64VectorTests::max);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2478,7 +2478,7 @@ static void MINInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2492,7 +2492,7 @@ static void minInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2506,7 +2506,7 @@ static void MAXInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2520,7 +2520,7 @@ static void maxInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Int64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::max);
     }
 
     static int ANDReduce(int[] a, int idx) {
@@ -2563,7 +2563,7 @@ static void ANDReduceInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int64VectorTests::ANDReduce, Int64VectorTests::ANDReduceAll);
     }
 
@@ -2611,7 +2611,7 @@ static void ANDReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::ANDReduceMasked, Int64VectorTests::ANDReduceAllMasked);
     }
 
@@ -2656,7 +2656,7 @@ static void ORReduceInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int64VectorTests::ORReduce, Int64VectorTests::ORReduceAll);
     }
 
@@ -2704,7 +2704,7 @@ static void ORReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<bo
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::ORReduceMasked, Int64VectorTests::ORReduceAllMasked);
     }
 
@@ -2749,7 +2749,7 @@ static void XORReduceInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int64VectorTests::XORReduce, Int64VectorTests::XORReduceAll);
     }
 
@@ -2797,7 +2797,7 @@ static void XORReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::XORReduceMasked, Int64VectorTests::XORReduceAllMasked);
     }
 
@@ -2839,7 +2839,7 @@ static void ADDReduceInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int64VectorTests::ADDReduce, Int64VectorTests::ADDReduceAll);
     }
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2883,7 +2883,7 @@ static void ADDReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::ADDReduceMasked, Int64VectorTests::ADDReduceAllMasked);
     }
     static int MULReduce(int[] a, int idx) {
@@ -2924,7 +2924,7 @@ static void MULReduceInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int64VectorTests::MULReduce, Int64VectorTests::MULReduceAll);
     }
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2968,7 +2968,7 @@ static void MULReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::MULReduceMasked, Int64VectorTests::MULReduceAllMasked);
     }
     static int MINReduce(int[] a, int idx) {
@@ -3009,7 +3009,7 @@ static void MINReduceInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int64VectorTests::MINReduce, Int64VectorTests::MINReduceAll);
     }
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3054,7 +3054,7 @@ static void MINReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::MINReduceMasked, Int64VectorTests::MINReduceAllMasked);
     }
     static int MAXReduce(int[] a, int idx) {
@@ -3095,7 +3095,7 @@ static void MAXReduceInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Int64VectorTests::MAXReduce, Int64VectorTests::MAXReduceAll);
     }
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3140,7 +3140,7 @@ static void MAXReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::MAXReduceMasked, Int64VectorTests::MAXReduceAllMasked);
     }
 
@@ -3166,7 +3166,7 @@ static void anyTrueInt64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Int64VectorTests::anyTrue);
     }
 
 
@@ -3192,7 +3192,7 @@ static void allTrueInt64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Int64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Int64VectorTests::allTrue);
     }
 
 
@@ -3208,7 +3208,7 @@ static void withInt64VectorTests(IntFunction<int []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (int)4, 0);
+        assertInsertArraysEquals(r, a, (int)4, 0);
     }
     static boolean testIS_DEFAULT(int a) {
         return bits(a)==0;
@@ -3757,7 +3757,7 @@ static void blendInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
@@ -3774,7 +3774,7 @@ static void RearrangeInt64VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -3792,7 +3792,7 @@ static void RearrangeInt64VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "intUnaryOpProvider")
     static void getInt64VectorTests(IntFunction<int[]> fa) {
@@ -3947,7 +3947,7 @@ static void getInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::get);
+        assertArraysEquals(r, a, Int64VectorTests::get);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -3961,7 +3961,7 @@ static void BroadcastInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4008,7 +4008,7 @@ static void sliceUnaryInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Int64VectorTests::sliceUnary);
     }
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4037,7 +4037,7 @@ static void sliceBinaryInt64VectorTestsBinary(IntFunction<int[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Int64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Int64VectorTests::sliceBinary);
     }
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4070,7 +4070,7 @@ static void sliceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Int64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Int64VectorTests::slice);
     }
     static int[] unsliceUnary(int[] a, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4097,7 +4097,7 @@ static void unsliceUnaryInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Int64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Int64VectorTests::unsliceUnary);
     }
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4136,7 +4136,7 @@ static void unsliceBinaryInt64VectorTestsBinary(IntFunction<int[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Int64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Int64VectorTests::unsliceBinary);
     }
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4192,7 +4192,7 @@ static void unsliceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Int64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Int64VectorTests::unslice);
     }
 
 
@@ -4241,7 +4241,7 @@ static void BITWISE_BLENDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int
             }
         }
 
-        assertArraysEquals(a, b, c, r, Int64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4257,7 +4257,7 @@ static void bitwiseBlendInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Int64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
     }
 
 
@@ -4280,7 +4280,7 @@ static void BITWISE_BLENDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Int64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4298,7 +4298,7 @@ static void BITWISE_BLENDInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> f
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4313,7 +4313,7 @@ static void BITWISE_BLENDInt64VectorTestsAltBroadcastSmokeTest(IntFunction<int[]
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4327,7 +4327,7 @@ static void bitwiseBlendInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Int64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4342,7 +4342,7 @@ static void bitwiseBlendInt64VectorTestsAltBroadcastSmokeTest(IntFunction<int[]>
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Int64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
     }
 
 
@@ -4362,7 +4362,7 @@ static void BITWISE_BLENDInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<in
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Int64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDInt64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Int64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4399,7 +4399,7 @@ static void BITWISE_BLENDInt64VectorTestsDoubleBroadcastSmokeTest(IntFunction<in
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendInt64VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4413,7 +4413,7 @@ static void bitwiseBlendInt64VectorTestsDoubleBroadcastSmokeTest(IntFunction<int
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Int64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
     }
 
 
@@ -4432,7 +4432,7 @@ static void BITWISE_BLENDInt64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunct
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Int64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4456,7 +4456,7 @@ static void NEGInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::NEG);
+        assertArraysEquals(r, a, Int64VectorTests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4471,7 +4471,7 @@ static void negInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::neg);
+        assertArraysEquals(r, a, Int64VectorTests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4489,7 +4489,7 @@ static void NEGMaskedInt64VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Int64VectorTests::NEG);
     }
 
     static int ABS(int a) {
@@ -4512,7 +4512,7 @@ static void ABSInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::ABS);
+        assertArraysEquals(r, a, Int64VectorTests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4527,7 +4527,7 @@ static void absInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::abs);
+        assertArraysEquals(r, a, Int64VectorTests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4545,7 +4545,7 @@ static void ABSMaskedInt64VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Int64VectorTests::ABS);
     }
 
 
@@ -4571,7 +4571,7 @@ static void NOTInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::NOT);
+        assertArraysEquals(r, a, Int64VectorTests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4586,7 +4586,7 @@ static void notInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::not);
+        assertArraysEquals(r, a, Int64VectorTests::not);
     }
 
 
@@ -4606,7 +4606,7 @@ static void NOTMaskedInt64VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Int64VectorTests::NOT);
     }
 
 
@@ -4629,7 +4629,7 @@ static void ZOMOInt64VectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Int64VectorTests::ZOMO);
+        assertArraysEquals(r, a, Int64VectorTests::ZOMO);
     }
 
 
@@ -4649,7 +4649,7 @@ static void ZOMOMaskedInt64VectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Int64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Int64VectorTests::ZOMO);
     }
 
 
@@ -4677,7 +4677,7 @@ static void gatherInt64VectorTests(IntFunction<int[]> fa, BiFunction<Integer,Int
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::gather);
+        assertArraysEquals(r, a, b, Int64VectorTests::gather);
     }
     static int[] gatherMasked(int a[], int ix, boolean[] mask, int[] b, int iy) {
         int[] res = new int[SPECIES.length()];
@@ -4705,7 +4705,7 @@ static void gatherMaskedInt64VectorTests(IntFunction<int[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::gatherMasked);
     }
 
     static int[] scatter(int a[], int ix, int[] b, int iy) {
@@ -4730,7 +4730,7 @@ static void scatterInt64VectorTests(IntFunction<int[]> fa, BiFunction<Integer,In
             }
         }
 
-        assertArraysEquals(a, b, r, Int64VectorTests::scatter);
+        assertArraysEquals(r, a, b, Int64VectorTests::scatter);
     }
 
     static int[] scatterMasked(int r[], int a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4768,7 +4768,7 @@ static void scatterMaskedInt64VectorTests(IntFunction<int[]> fa, IntFunction<int
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Int64VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Int64VectorTests::scatterMasked);
     }
 
 
@@ -4810,8 +4810,8 @@ static void toIntArrayInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4821,8 +4821,8 @@ static void toLongArrayInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4832,8 +4832,8 @@ static void toDoubleArrayInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4899,7 +4899,7 @@ static void ADDReduceLongInt64VectorTests(IntFunction<int[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Int64VectorTests::ADDReduceLong, Int64VectorTests::ADDReduceAllLong);
     }
 
@@ -4940,7 +4940,7 @@ static void ADDReduceLongInt64VectorTestsMasked(IntFunction<int[]> fa, IntFuncti
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Int64VectorTests::ADDReduceLongMasked, Int64VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4952,7 +4952,7 @@ static void BroadcastLongInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -4970,7 +4970,7 @@ static void blendInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, I
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Int64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Int64VectorTests::blend);
     }
 
 
@@ -4987,7 +4987,7 @@ static void SelectFromInt64VectorTests(IntFunction<int[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -5006,7 +5006,7 @@ static void SelectFromInt64VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5083,7 +5083,7 @@ static void maskEqInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFuncti
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Int64VectorTests::beq);
+        assertArraysEquals(r, a, b, Int64VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java
index 3c615afebafb8..7d89b2c2ae058 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,47 +67,25 @@ static VectorShape getMaxBit() {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (Max / 8));
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (int) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(int[] a, int[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (int) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -410,7 +388,7 @@ static void loadStoreArray(IntFunction<int[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -481,7 +459,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new int[a.length];
@@ -492,7 +470,7 @@ static void loadStoreMaskArray(IntFunction<int[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intMaskProviderForIOOBE")
@@ -565,7 +543,7 @@ static void loadStoreMask(IntFunction<int[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -589,7 +567,7 @@ static void loadStoreByteBuffer(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -676,7 +654,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -691,7 +669,7 @@ static void loadStoreByteBufferMask(IntFunction<int[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -807,7 +785,7 @@ static void loadStoreByteArray(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "intByteProviderForIOOBE")
@@ -888,7 +866,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -899,7 +877,7 @@ static void loadStoreByteArrayMask(IntFunction<int[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "intByteMaskProviderForIOOBE")
@@ -976,7 +954,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -987,7 +965,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
index 0fc95639cb0d7..1db67b4b2dea7 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ interface FUnOp {
         int apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -88,7 +88,7 @@ interface FUnArrayOp {
         int[] apply(int a);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -98,13 +98,13 @@ static void assertArraysEquals(int[] a, int[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(int[] r, int[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -123,17 +123,17 @@ interface FReductionAllOp {
         int apply(int[] a);
     }
 
-    static void assertReductionArraysEquals(int[] a, int[] b, int c,
+    static void assertReductionArraysEquals(int[] r, int rc, int[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -145,17 +145,17 @@ interface FReductionAllMaskedOp {
         int apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(int[] a, int[] b, int c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(int[] r, int rc, int[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -167,17 +167,17 @@ interface FReductionAllOpLong {
         long apply(int[] a);
     }
 
-    static void assertReductionLongArraysEquals(int[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, int[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -189,17 +189,17 @@ interface FReductionAllMaskedOpLong {
         long apply(int[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(int[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, int[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -207,37 +207,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(int[] a, int[] b, int element, int index) {
+    static void assertInsertArraysEquals(int[] r, int[] a, int element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -251,7 +251,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, int vecto
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -265,7 +265,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, int vect
         }
     }
 
-    static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -285,7 +285,7 @@ static void assertRearrangeArraysEquals(int[] a, int[] r, int[] order, boolean[]
         }
     }
 
-    static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(int[] r, int[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -305,7 +305,7 @@ static void assertSelectFromArraysEquals(int[] a, int[] r, int[] order, boolean[
         }
     }
 
-    static void assertBroadcastArraysEquals(int[]a, int[]r) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -334,7 +334,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -345,7 +345,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -357,7 +357,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -369,11 +369,11 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, FBinOp f)
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -384,11 +384,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMa
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -402,11 +402,11 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -420,7 +420,7 @@ static void assertBroadcastLongArraysEquals(int[] a, int[] b, int[] r, boolean[]
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -434,11 +434,11 @@ static void assertShiftArraysEquals(int[] a, int[] b, int[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -464,7 +464,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -475,11 +475,11 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -491,7 +491,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mas
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -504,7 +504,7 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTer
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -517,12 +517,12 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, F
         }
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -538,12 +538,12 @@ static void assertBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, bool
         }
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -559,7 +559,7 @@ static void assertAltBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, b
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -574,12 +574,12 @@ static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(int[] a, int[] b, int[] c, int[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(int[] r, int[] a, int[] b, int[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -602,7 +602,7 @@ interface FBinArrayOp {
         int apply(int[] a, int b);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, FBinArrayOp f) {
+    static void assertArraysEquals(int[] r, int[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -617,7 +617,7 @@ interface FGatherScatterOp {
         int[] apply(int[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -644,7 +644,7 @@ interface FScatterMaskedOp {
         int[] apply(int[] r, int[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -654,7 +654,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -665,7 +665,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FGathe
         }
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -675,7 +675,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, boolean[] mask, FScatt
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -692,7 +692,7 @@ interface FLaneOp {
         int[] apply(int[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(int[] r, int[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -702,7 +702,7 @@ static void assertArraysEquals(int[] a, int[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -712,7 +712,7 @@ interface FLaneBop {
         int[] apply(int[] a, int[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -722,7 +722,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, FLaneBop f
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -733,7 +733,7 @@ interface FLaneMaskedBop {
         int[] apply(int[] a, int[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -743,7 +743,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, boolean[]
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -754,7 +754,7 @@ interface FLanePartBop {
         int[] apply(int[] a, int[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -764,7 +764,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -776,7 +776,7 @@ interface FLanePartMaskedBop {
         int[] apply(int[] a, int[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(int[] r, int[] a, int[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -786,7 +786,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -795,7 +795,7 @@ static void assertArraysEquals(int[] a, int[] b, int[] r, int origin, int part,
     }
 
 
-    static void assertArraysEquals(int[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -808,7 +808,7 @@ static void assertArraysEquals(int[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(int[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -819,7 +819,7 @@ static void assertArraysEquals(int[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(int[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, int[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1259,7 +1259,7 @@ static void ADDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::ADD);
     }
     static int add(int a, int b) {
         return (int)(a + b);
@@ -1277,7 +1277,7 @@ static void addIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::add);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1297,7 +1297,7 @@ static void ADDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1315,7 +1315,7 @@ static void addIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::add);
     }
     static int SUB(int a, int b) {
         return (int)(a - b);
@@ -1335,7 +1335,7 @@ static void SUBIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::SUB);
     }
     static int sub(int a, int b) {
         return (int)(a - b);
@@ -1353,7 +1353,7 @@ static void subIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1373,7 +1373,7 @@ static void SUBIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1391,7 +1391,7 @@ static void subIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::sub);
     }
     static int MUL(int a, int b) {
         return (int)(a * b);
@@ -1411,7 +1411,7 @@ static void MULIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::MUL);
     }
     static int mul(int a, int b) {
         return (int)(a * b);
@@ -1429,7 +1429,7 @@ static void mulIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1449,7 +1449,7 @@ static void MULIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1467,7 +1467,7 @@ static void mulIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::mul);
     }
 
 
@@ -1492,7 +1492,7 @@ static void DIVIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::DIV);
     }
     static int div(int a, int b) {
         return (int)(a / b);
@@ -1514,7 +1514,7 @@ static void divIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::div);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::div);
     }
 
 
@@ -1538,7 +1538,7 @@ static void DIVIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1560,7 +1560,7 @@ static void divIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1581,7 +1581,7 @@ static void FIRST_NONZEROIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1601,7 +1601,7 @@ static void FIRST_NONZEROIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1622,7 +1622,7 @@ static void ANDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::AND);
     }
     static int and(int a, int b) {
         return (int)(a & b);
@@ -1640,7 +1640,7 @@ static void andIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::and);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::and);
     }
 
 
@@ -1662,7 +1662,7 @@ static void ANDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::AND);
     }
 
 
@@ -1684,7 +1684,7 @@ static void AND_NOTIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::AND_NOT);
     }
 
 
@@ -1706,7 +1706,7 @@ static void AND_NOTIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::AND_NOT);
     }
 
 
@@ -1728,7 +1728,7 @@ static void ORIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::OR);
     }
     static int or(int a, int b) {
         return (int)(a | b);
@@ -1746,7 +1746,7 @@ static void orIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::or);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::or);
     }
 
 
@@ -1768,7 +1768,7 @@ static void ORIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::OR);
     }
 
 
@@ -1790,7 +1790,7 @@ static void XORIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::XOR);
     }
 
 
@@ -1812,7 +1812,7 @@ static void XORIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::XOR);
     }
 
 
@@ -1827,7 +1827,7 @@ static void addIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1844,7 +1844,7 @@ static void addIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, IntMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1858,7 +1858,7 @@ static void subIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1875,7 +1875,7 @@ static void subIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, IntMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1889,7 +1889,7 @@ static void mulIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -1906,7 +1906,7 @@ static void mulIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, IntMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::mul);
     }
 
 
@@ -1925,7 +1925,7 @@ static void divIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::div);
     }
 
 
@@ -1946,7 +1946,7 @@ static void divIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, IntMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::div);
     }
 
 
@@ -1962,7 +1962,7 @@ static void ORIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -1976,7 +1976,7 @@ static void orIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunc
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::or);
     }
 
 
@@ -1995,7 +1995,7 @@ static void ORIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, I
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, IntMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::OR);
     }
 
 
@@ -2011,7 +2011,7 @@ static void ANDIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2025,7 +2025,7 @@ static void andIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::and);
     }
 
 
@@ -2044,7 +2044,7 @@ static void ANDIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, IntMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::AND);
     }
 
 
@@ -2060,7 +2060,7 @@ static void ORIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, Int
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, IntMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, IntMaxVectorTests::OR);
     }
 
 
@@ -2079,7 +2079,7 @@ static void ORIntMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> f
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, IntMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntMaxVectorTests::OR);
     }
 
 
@@ -2094,7 +2094,7 @@ static void ADDIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, In
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, IntMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, IntMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -2111,7 +2111,7 @@ static void ADDIntMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]>
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, IntMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntMaxVectorTests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2132,7 +2132,7 @@ static void LSHLIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::LSHL);
     }
 
 
@@ -2154,7 +2154,7 @@ static void LSHLIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHL);
     }
 
 
@@ -2180,7 +2180,7 @@ static void ASHRIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::ASHR);
     }
 
 
@@ -2202,7 +2202,7 @@ static void ASHRIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::ASHR);
     }
 
 
@@ -2228,7 +2228,7 @@ static void LSHRIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::LSHR);
     }
 
 
@@ -2250,7 +2250,7 @@ static void LSHRIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHR);
     }
 
 
@@ -2275,7 +2275,7 @@ static void LSHLIntMaxVectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, IntMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2296,7 +2296,7 @@ static void LSHLIntMaxVectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, IntMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2321,7 +2321,7 @@ static void LSHRIntMaxVectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, IntMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2342,7 +2342,7 @@ static void LSHRIntMaxVectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, IntMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2367,7 +2367,7 @@ static void ASHRIntMaxVectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, IntMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::ASHR_unary);
     }
 
 
@@ -2388,7 +2388,7 @@ static void ASHRIntMaxVectorTestsShift(IntFunction<int[]> fa, IntFunction<int[]>
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, IntMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::ASHR_unary);
     }
 
 
@@ -2413,7 +2413,7 @@ static void MINIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::MIN);
     }
     static int min(int a, int b) {
         return (int)(Math.min(a, b));
@@ -2431,7 +2431,7 @@ static void minIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::min);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::min);
     }
     static int MAX(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2451,7 +2451,7 @@ static void MAXIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::MAX);
     }
     static int max(int a, int b) {
         return (int)(Math.max(a, b));
@@ -2469,7 +2469,7 @@ static void maxIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::max);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::max);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2483,7 +2483,7 @@ static void MINIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2497,7 +2497,7 @@ static void minIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2511,7 +2511,7 @@ static void MAXIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
@@ -2525,7 +2525,7 @@ static void maxIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFun
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, IntMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::max);
     }
 
     static int ANDReduce(int[] a, int idx) {
@@ -2568,7 +2568,7 @@ static void ANDReduceIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 IntMaxVectorTests::ANDReduce, IntMaxVectorTests::ANDReduceAll);
     }
 
@@ -2616,7 +2616,7 @@ static void ANDReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::ANDReduceMasked, IntMaxVectorTests::ANDReduceAllMasked);
     }
 
@@ -2661,7 +2661,7 @@ static void ORReduceIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 IntMaxVectorTests::ORReduce, IntMaxVectorTests::ORReduceAll);
     }
 
@@ -2709,7 +2709,7 @@ static void ORReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<b
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::ORReduceMasked, IntMaxVectorTests::ORReduceAllMasked);
     }
 
@@ -2754,7 +2754,7 @@ static void XORReduceIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 IntMaxVectorTests::XORReduce, IntMaxVectorTests::XORReduceAll);
     }
 
@@ -2802,7 +2802,7 @@ static void XORReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::XORReduceMasked, IntMaxVectorTests::XORReduceAllMasked);
     }
 
@@ -2844,7 +2844,7 @@ static void ADDReduceIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 IntMaxVectorTests::ADDReduce, IntMaxVectorTests::ADDReduceAll);
     }
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2888,7 +2888,7 @@ static void ADDReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::ADDReduceMasked, IntMaxVectorTests::ADDReduceAllMasked);
     }
     static int MULReduce(int[] a, int idx) {
@@ -2929,7 +2929,7 @@ static void MULReduceIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 IntMaxVectorTests::MULReduce, IntMaxVectorTests::MULReduceAll);
     }
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -2973,7 +2973,7 @@ static void MULReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::MULReduceMasked, IntMaxVectorTests::MULReduceAllMasked);
     }
     static int MINReduce(int[] a, int idx) {
@@ -3014,7 +3014,7 @@ static void MINReduceIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 IntMaxVectorTests::MINReduce, IntMaxVectorTests::MINReduceAll);
     }
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3059,7 +3059,7 @@ static void MINReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::MINReduceMasked, IntMaxVectorTests::MINReduceAllMasked);
     }
     static int MAXReduce(int[] a, int idx) {
@@ -3100,7 +3100,7 @@ static void MAXReduceIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 IntMaxVectorTests::MAXReduce, IntMaxVectorTests::MAXReduceAll);
     }
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
@@ -3145,7 +3145,7 @@ static void MAXReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::MAXReduceMasked, IntMaxVectorTests::MAXReduceAllMasked);
     }
 
@@ -3171,7 +3171,7 @@ static void anyTrueIntMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, IntMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, IntMaxVectorTests::anyTrue);
     }
 
 
@@ -3197,7 +3197,7 @@ static void allTrueIntMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, IntMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, IntMaxVectorTests::allTrue);
     }
 
 
@@ -3213,7 +3213,7 @@ static void withIntMaxVectorTests(IntFunction<int []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (int)4, 0);
+        assertInsertArraysEquals(r, a, (int)4, 0);
     }
     static boolean testIS_DEFAULT(int a) {
         return bits(a)==0;
@@ -3762,7 +3762,7 @@ static void blendIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
@@ -3779,7 +3779,7 @@ static void RearrangeIntMaxVectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -3797,7 +3797,7 @@ static void RearrangeIntMaxVectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "intUnaryOpProvider")
     static void getIntMaxVectorTests(IntFunction<int[]> fa) {
@@ -3952,7 +3952,7 @@ static void getIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::get);
+        assertArraysEquals(r, a, IntMaxVectorTests::get);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -3966,7 +3966,7 @@ static void BroadcastIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4013,7 +4013,7 @@ static void sliceUnaryIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, IntMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, IntMaxVectorTests::sliceUnary);
     }
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4042,7 +4042,7 @@ static void sliceBinaryIntMaxVectorTestsBinary(IntFunction<int[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, IntMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, IntMaxVectorTests::sliceBinary);
     }
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4075,7 +4075,7 @@ static void sliceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, IntMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, IntMaxVectorTests::slice);
     }
     static int[] unsliceUnary(int[] a, int origin, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4102,7 +4102,7 @@ static void unsliceUnaryIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, IntMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, IntMaxVectorTests::unsliceUnary);
     }
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4141,7 +4141,7 @@ static void unsliceBinaryIntMaxVectorTestsBinary(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, IntMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, IntMaxVectorTests::unsliceBinary);
     }
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
         int[] res = new int[SPECIES.length()];
@@ -4197,7 +4197,7 @@ static void unsliceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, IntMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, IntMaxVectorTests::unslice);
     }
 
 
@@ -4246,7 +4246,7 @@ static void BITWISE_BLENDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, c, r, IntMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4262,7 +4262,7 @@ static void bitwiseBlendIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, IntMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4285,7 +4285,7 @@ static void BITWISE_BLENDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4303,7 +4303,7 @@ static void BITWISE_BLENDIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]>
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, IntMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4318,7 +4318,7 @@ static void BITWISE_BLENDIntMaxVectorTestsAltBroadcastSmokeTest(IntFunction<int[
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, IntMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4332,7 +4332,7 @@ static void bitwiseBlendIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> f
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, IntMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
@@ -4347,7 +4347,7 @@ static void bitwiseBlendIntMaxVectorTestsAltBroadcastSmokeTest(IntFunction<int[]
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, IntMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4367,7 +4367,7 @@ static void BITWISE_BLENDIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
@@ -4386,7 +4386,7 @@ static void BITWISE_BLENDIntMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunctio
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4404,7 +4404,7 @@ static void BITWISE_BLENDIntMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<i
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, IntMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "intTernaryOpProvider")
     static void bitwiseBlendIntMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
@@ -4418,7 +4418,7 @@ static void bitwiseBlendIntMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<in
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, IntMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4437,7 +4437,7 @@ static void BITWISE_BLENDIntMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunc
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4461,7 +4461,7 @@ static void NEGIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::NEG);
+        assertArraysEquals(r, a, IntMaxVectorTests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4476,7 +4476,7 @@ static void negIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::neg);
+        assertArraysEquals(r, a, IntMaxVectorTests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4494,7 +4494,7 @@ static void NEGMaskedIntMaxVectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, IntMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, IntMaxVectorTests::NEG);
     }
 
     static int ABS(int a) {
@@ -4517,7 +4517,7 @@ static void ABSIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::ABS);
+        assertArraysEquals(r, a, IntMaxVectorTests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4532,7 +4532,7 @@ static void absIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::abs);
+        assertArraysEquals(r, a, IntMaxVectorTests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
@@ -4550,7 +4550,7 @@ static void ABSMaskedIntMaxVectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, IntMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, IntMaxVectorTests::ABS);
     }
 
 
@@ -4576,7 +4576,7 @@ static void NOTIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::NOT);
+        assertArraysEquals(r, a, IntMaxVectorTests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
@@ -4591,7 +4591,7 @@ static void notIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::not);
+        assertArraysEquals(r, a, IntMaxVectorTests::not);
     }
 
 
@@ -4611,7 +4611,7 @@ static void NOTMaskedIntMaxVectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, IntMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, IntMaxVectorTests::NOT);
     }
 
 
@@ -4634,7 +4634,7 @@ static void ZOMOIntMaxVectorTests(IntFunction<int[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, IntMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, IntMaxVectorTests::ZOMO);
     }
 
 
@@ -4654,7 +4654,7 @@ static void ZOMOMaskedIntMaxVectorTests(IntFunction<int[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, IntMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, IntMaxVectorTests::ZOMO);
     }
 
 
@@ -4682,7 +4682,7 @@ static void gatherIntMaxVectorTests(IntFunction<int[]> fa, BiFunction<Integer,In
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::gather);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::gather);
     }
     static int[] gatherMasked(int a[], int ix, boolean[] mask, int[] b, int iy) {
         int[] res = new int[SPECIES.length()];
@@ -4710,7 +4710,7 @@ static void gatherMaskedIntMaxVectorTests(IntFunction<int[]> fa, BiFunction<Inte
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::gatherMasked);
     }
 
     static int[] scatter(int a[], int ix, int[] b, int iy) {
@@ -4735,7 +4735,7 @@ static void scatterIntMaxVectorTests(IntFunction<int[]> fa, BiFunction<Integer,I
             }
         }
 
-        assertArraysEquals(a, b, r, IntMaxVectorTests::scatter);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::scatter);
     }
 
     static int[] scatterMasked(int r[], int a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4773,7 +4773,7 @@ static void scatterMaskedIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<in
             }
         }
 
-        assertArraysEquals(a, b, r, mask, IntMaxVectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::scatterMasked);
     }
 
 
@@ -4815,8 +4815,8 @@ static void toIntArrayIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4826,8 +4826,8 @@ static void toLongArrayIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4837,8 +4837,8 @@ static void toDoubleArrayIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector av = IntVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4904,7 +4904,7 @@ static void ADDReduceLongIntMaxVectorTests(IntFunction<int[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 IntMaxVectorTests::ADDReduceLong, IntMaxVectorTests::ADDReduceAllLong);
     }
 
@@ -4945,7 +4945,7 @@ static void ADDReduceLongIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunct
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 IntMaxVectorTests::ADDReduceLongMasked, IntMaxVectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4957,7 +4957,7 @@ static void BroadcastLongIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             IntVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
@@ -4975,7 +4975,7 @@ static void blendIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa,
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, IntMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntMaxVectorTests::blend);
     }
 
 
@@ -4992,7 +4992,7 @@ static void SelectFromIntMaxVectorTests(IntFunction<int[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
@@ -5011,7 +5011,7 @@ static void SelectFromIntMaxVectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5088,7 +5088,7 @@ static void maskEqIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunct
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, IntMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, IntMaxVectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java
index f26817404bc21..54c337cee33e6 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Long128VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (128 / 8));
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(long[] a, long[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<long[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new long[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<long[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorTests.java b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
index db6db4833415c..19ce3554e8801 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         long apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         long[] apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         long apply(long[] a);
     }
 
-    static void assertReductionArraysEquals(long[] a, long[] b, long c,
+    static void assertReductionArraysEquals(long[] r, long rc, long[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         long apply(long[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(long[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(long[] r, long rc, long[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -159,37 +159,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(long[] a, long[] b, long element, int index) {
+    static void assertInsertArraysEquals(long[] r, long[] a, long element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -203,7 +203,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -217,7 +217,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -237,7 +237,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -257,7 +257,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(long[]a, long[]r) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -286,7 +286,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -297,7 +297,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -309,7 +309,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -321,11 +321,11 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -336,11 +336,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -354,11 +354,11 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -372,7 +372,7 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -386,11 +386,11 @@ static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -416,7 +416,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -427,11 +427,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -443,7 +443,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -456,7 +456,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -469,12 +469,12 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -490,12 +490,12 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -511,7 +511,7 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -526,12 +526,12 @@ static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ interface FBinArrayOp {
         long apply(long[] a, int b);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FBinArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,7 +569,7 @@ interface FGatherScatterOp {
         long[] apply(long[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -596,7 +596,7 @@ interface FScatterMaskedOp {
         long[] apply(long[] r, long[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -606,7 +606,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -617,7 +617,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -627,7 +627,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -644,7 +644,7 @@ interface FLaneOp {
         long[] apply(long[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -654,7 +654,7 @@ static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -664,7 +664,7 @@ interface FLaneBop {
         long[] apply(long[] a, long[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -674,7 +674,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -685,7 +685,7 @@ interface FLaneMaskedBop {
         long[] apply(long[] a, long[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -695,7 +695,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -706,7 +706,7 @@ interface FLanePartBop {
         long[] apply(long[] a, long[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -716,7 +716,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -728,7 +728,7 @@ interface FLanePartMaskedBop {
         long[] apply(long[] a, long[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -780,7 +780,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(long[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -793,7 +793,7 @@ static void assertArraysEquals(long[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(long[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -804,7 +804,7 @@ static void assertArraysEquals(long[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(long[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1275,7 +1275,7 @@ static void ADDLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::ADD);
+        assertArraysEquals(r, a, b, Long128VectorTests::ADD);
     }
     static long add(long a, long b) {
         return (long)(a + b);
@@ -1293,7 +1293,7 @@ static void addLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::add);
+        assertArraysEquals(r, a, b, Long128VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1313,7 +1313,7 @@ static void ADDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1331,7 +1331,7 @@ static void addLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::add);
     }
     static long SUB(long a, long b) {
         return (long)(a - b);
@@ -1351,7 +1351,7 @@ static void SUBLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::SUB);
+        assertArraysEquals(r, a, b, Long128VectorTests::SUB);
     }
     static long sub(long a, long b) {
         return (long)(a - b);
@@ -1369,7 +1369,7 @@ static void subLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::sub);
+        assertArraysEquals(r, a, b, Long128VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1389,7 +1389,7 @@ static void SUBLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1407,7 +1407,7 @@ static void subLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::sub);
     }
     static long MUL(long a, long b) {
         return (long)(a * b);
@@ -1427,7 +1427,7 @@ static void MULLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::MUL);
+        assertArraysEquals(r, a, b, Long128VectorTests::MUL);
     }
     static long mul(long a, long b) {
         return (long)(a * b);
@@ -1445,7 +1445,7 @@ static void mulLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::mul);
+        assertArraysEquals(r, a, b, Long128VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1465,7 +1465,7 @@ static void MULLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1483,7 +1483,7 @@ static void mulLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::mul);
     }
 
 
@@ -1508,7 +1508,7 @@ static void DIVLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::DIV);
+        assertArraysEquals(r, a, b, Long128VectorTests::DIV);
     }
     static long div(long a, long b) {
         return (long)(a / b);
@@ -1530,7 +1530,7 @@ static void divLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::div);
+        assertArraysEquals(r, a, b, Long128VectorTests::div);
     }
 
 
@@ -1554,7 +1554,7 @@ static void DIVLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1576,7 +1576,7 @@ static void divLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1597,7 +1597,7 @@ static void FIRST_NONZEROLong128VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Long128VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1617,7 +1617,7 @@ static void FIRST_NONZEROLong128VectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1638,7 +1638,7 @@ static void ANDLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::AND);
+        assertArraysEquals(r, a, b, Long128VectorTests::AND);
     }
     static long and(long a, long b) {
         return (long)(a & b);
@@ -1656,7 +1656,7 @@ static void andLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::and);
+        assertArraysEquals(r, a, b, Long128VectorTests::and);
     }
 
 
@@ -1678,7 +1678,7 @@ static void ANDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::AND);
     }
 
 
@@ -1700,7 +1700,7 @@ static void AND_NOTLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Long128VectorTests::AND_NOT);
     }
 
 
@@ -1722,7 +1722,7 @@ static void AND_NOTLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::AND_NOT);
     }
 
 
@@ -1744,7 +1744,7 @@ static void ORLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::OR);
+        assertArraysEquals(r, a, b, Long128VectorTests::OR);
     }
     static long or(long a, long b) {
         return (long)(a | b);
@@ -1762,7 +1762,7 @@ static void orLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::or);
+        assertArraysEquals(r, a, b, Long128VectorTests::or);
     }
 
 
@@ -1784,7 +1784,7 @@ static void ORLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::OR);
     }
 
 
@@ -1806,7 +1806,7 @@ static void XORLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::XOR);
+        assertArraysEquals(r, a, b, Long128VectorTests::XOR);
     }
 
 
@@ -1828,7 +1828,7 @@ static void XORLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::XOR);
     }
 
 
@@ -1843,7 +1843,7 @@ static void addLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1860,7 +1860,7 @@ static void addLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1874,7 +1874,7 @@ static void subLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1891,7 +1891,7 @@ static void subLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1905,7 +1905,7 @@ static void mulLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1922,7 +1922,7 @@ static void mulLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::mul);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::div);
     }
 
 
@@ -1962,7 +1962,7 @@ static void divLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::div);
     }
 
 
@@ -1978,7 +1978,7 @@ static void ORLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1992,7 +1992,7 @@ static void orLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::or);
     }
 
 
@@ -2011,7 +2011,7 @@ static void ORLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::OR);
     }
 
 
@@ -2027,7 +2027,7 @@ static void ANDLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void andLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::and);
     }
 
 
@@ -2060,7 +2060,7 @@ static void ANDLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::AND);
     }
 
 
@@ -2076,7 +2076,7 @@ static void ORLong128VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Long128VectorTests::OR);
     }
 
 
@@ -2095,7 +2095,7 @@ static void ORLong128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long128VectorTests::OR);
     }
 
 
@@ -2110,7 +2110,7 @@ static void ADDLong128VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Long128VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -2127,7 +2127,7 @@ static void ADDLong128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long128VectorTests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2148,7 +2148,7 @@ static void LSHLLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Long128VectorTests::LSHL);
     }
 
 
@@ -2170,7 +2170,7 @@ static void LSHLLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::LSHL);
     }
 
 
@@ -2196,7 +2196,7 @@ static void ASHRLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Long128VectorTests::ASHR);
     }
 
 
@@ -2218,7 +2218,7 @@ static void ASHRLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::ASHR);
     }
 
 
@@ -2244,7 +2244,7 @@ static void LSHRLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Long128VectorTests::LSHR);
     }
 
 
@@ -2266,7 +2266,7 @@ static void LSHRLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::LSHR);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLLong128VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Long128VectorTests::LSHL_unary);
     }
 
 
@@ -2312,7 +2312,7 @@ static void LSHLLong128VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::LSHL_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRLong128VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Long128VectorTests::LSHR_unary);
     }
 
 
@@ -2358,7 +2358,7 @@ static void LSHRLong128VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::LSHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRLong128VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Long128VectorTests::ASHR_unary);
     }
 
 
@@ -2404,7 +2404,7 @@ static void ASHRLong128VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::ASHR_unary);
     }
 
 
@@ -2429,7 +2429,7 @@ static void MINLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::MIN);
+        assertArraysEquals(r, a, b, Long128VectorTests::MIN);
     }
     static long min(long a, long b) {
         return (long)(Math.min(a, b));
@@ -2447,7 +2447,7 @@ static void minLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::min);
+        assertArraysEquals(r, a, b, Long128VectorTests::min);
     }
     static long MAX(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2467,7 +2467,7 @@ static void MAXLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::MAX);
+        assertArraysEquals(r, a, b, Long128VectorTests::MAX);
     }
     static long max(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2485,7 +2485,7 @@ static void maxLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::max);
+        assertArraysEquals(r, a, b, Long128VectorTests::max);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2499,7 +2499,7 @@ static void MINLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2513,7 +2513,7 @@ static void minLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2527,7 +2527,7 @@ static void MAXLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2541,7 +2541,7 @@ static void maxLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::max);
     }
 
     static long ANDReduce(long[] a, int idx) {
@@ -2584,7 +2584,7 @@ static void ANDReduceLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::ANDReduce, Long128VectorTests::ANDReduceAll);
     }
 
@@ -2632,7 +2632,7 @@ static void ANDReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::ANDReduceMasked, Long128VectorTests::ANDReduceAllMasked);
     }
 
@@ -2677,7 +2677,7 @@ static void ORReduceLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::ORReduce, Long128VectorTests::ORReduceAll);
     }
 
@@ -2725,7 +2725,7 @@ static void ORReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::ORReduceMasked, Long128VectorTests::ORReduceAllMasked);
     }
 
@@ -2770,7 +2770,7 @@ static void XORReduceLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::XORReduce, Long128VectorTests::XORReduceAll);
     }
 
@@ -2818,7 +2818,7 @@ static void XORReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::XORReduceMasked, Long128VectorTests::XORReduceAllMasked);
     }
 
@@ -2860,7 +2860,7 @@ static void ADDReduceLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::ADDReduce, Long128VectorTests::ADDReduceAll);
     }
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2904,7 +2904,7 @@ static void ADDReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::ADDReduceMasked, Long128VectorTests::ADDReduceAllMasked);
     }
     static long MULReduce(long[] a, int idx) {
@@ -2945,7 +2945,7 @@ static void MULReduceLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::MULReduce, Long128VectorTests::MULReduceAll);
     }
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2989,7 +2989,7 @@ static void MULReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::MULReduceMasked, Long128VectorTests::MULReduceAllMasked);
     }
     static long MINReduce(long[] a, int idx) {
@@ -3030,7 +3030,7 @@ static void MINReduceLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::MINReduce, Long128VectorTests::MINReduceAll);
     }
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3075,7 +3075,7 @@ static void MINReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::MINReduceMasked, Long128VectorTests::MINReduceAllMasked);
     }
     static long MAXReduce(long[] a, int idx) {
@@ -3116,7 +3116,7 @@ static void MAXReduceLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::MAXReduce, Long128VectorTests::MAXReduceAll);
     }
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3161,7 +3161,7 @@ static void MAXReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::MAXReduceMasked, Long128VectorTests::MAXReduceAllMasked);
     }
 
@@ -3187,7 +3187,7 @@ static void anyTrueLong128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Long128VectorTests::anyTrue);
     }
 
 
@@ -3213,7 +3213,7 @@ static void allTrueLong128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Long128VectorTests::allTrue);
     }
 
 
@@ -3229,7 +3229,7 @@ static void withLong128VectorTests(IntFunction<long []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (long)4, 0);
+        assertInsertArraysEquals(r, a, (long)4, 0);
     }
     static boolean testIS_DEFAULT(long a) {
         return bits(a)==0;
@@ -3706,7 +3706,7 @@ static void blendLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
@@ -3723,7 +3723,7 @@ static void RearrangeLong128VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
@@ -3741,7 +3741,7 @@ static void RearrangeLong128VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "longUnaryOpProvider")
     static void getLong128VectorTests(IntFunction<long[]> fa) {
@@ -3896,7 +3896,7 @@ static void getLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::get);
+        assertArraysEquals(r, a, Long128VectorTests::get);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -3910,7 +3910,7 @@ static void BroadcastLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3957,7 +3957,7 @@ static void sliceUnaryLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Long128VectorTests::sliceUnary);
     }
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -3986,7 +3986,7 @@ static void sliceBinaryLong128VectorTestsBinary(IntFunction<long[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Long128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Long128VectorTests::sliceBinary);
     }
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4019,7 +4019,7 @@ static void sliceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lo
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Long128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Long128VectorTests::slice);
     }
     static long[] unsliceUnary(long[] a, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4046,7 +4046,7 @@ static void unsliceUnaryLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Long128VectorTests::unsliceUnary);
     }
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4085,7 +4085,7 @@ static void unsliceBinaryLong128VectorTestsBinary(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Long128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Long128VectorTests::unsliceBinary);
     }
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4141,7 +4141,7 @@ static void unsliceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Long128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Long128VectorTests::unslice);
     }
 
 
@@ -4190,7 +4190,7 @@ static void BITWISE_BLENDLong128VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, Long128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4206,7 +4206,7 @@ static void bitwiseBlendLong128VectorTests(IntFunction<long[]> fa, IntFunction<l
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Long128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
     }
 
 
@@ -4229,7 +4229,7 @@ static void BITWISE_BLENDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Long128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4247,7 +4247,7 @@ static void BITWISE_BLENDLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4262,7 +4262,7 @@ static void BITWISE_BLENDLong128VectorTestsAltBroadcastSmokeTest(IntFunction<lon
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4276,7 +4276,7 @@ static void bitwiseBlendLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]>
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4291,7 +4291,7 @@ static void bitwiseBlendLong128VectorTestsAltBroadcastSmokeTest(IntFunction<long
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
     }
 
 
@@ -4311,7 +4311,7 @@ static void BITWISE_BLENDLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Long128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void BITWISE_BLENDLong128VectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Long128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4348,7 +4348,7 @@ static void BITWISE_BLENDLong128VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong128VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4362,7 +4362,7 @@ static void bitwiseBlendLong128VectorTestsDoubleBroadcastSmokeTest(IntFunction<l
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
     }
 
 
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDLong128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Long128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4405,7 +4405,7 @@ static void NEGLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::NEG);
+        assertArraysEquals(r, a, Long128VectorTests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4420,7 +4420,7 @@ static void negLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::neg);
+        assertArraysEquals(r, a, Long128VectorTests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4438,7 +4438,7 @@ static void NEGMaskedLong128VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Long128VectorTests::NEG);
     }
 
     static long ABS(long a) {
@@ -4461,7 +4461,7 @@ static void ABSLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::ABS);
+        assertArraysEquals(r, a, Long128VectorTests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4476,7 +4476,7 @@ static void absLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::abs);
+        assertArraysEquals(r, a, Long128VectorTests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4494,7 +4494,7 @@ static void ABSMaskedLong128VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Long128VectorTests::ABS);
     }
 
 
@@ -4520,7 +4520,7 @@ static void NOTLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::NOT);
+        assertArraysEquals(r, a, Long128VectorTests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4535,7 +4535,7 @@ static void notLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::not);
+        assertArraysEquals(r, a, Long128VectorTests::not);
     }
 
 
@@ -4555,7 +4555,7 @@ static void NOTMaskedLong128VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Long128VectorTests::NOT);
     }
 
 
@@ -4578,7 +4578,7 @@ static void ZOMOLong128VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long128VectorTests::ZOMO);
+        assertArraysEquals(r, a, Long128VectorTests::ZOMO);
     }
 
 
@@ -4598,7 +4598,7 @@ static void ZOMOMaskedLong128VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Long128VectorTests::ZOMO);
     }
 
 
@@ -4626,7 +4626,7 @@ static void gatherLong128VectorTests(IntFunction<long[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::gather);
+        assertArraysEquals(r, a, b, Long128VectorTests::gather);
     }
     static long[] gatherMasked(long a[], int ix, boolean[] mask, int[] b, int iy) {
         long[] res = new long[SPECIES.length()];
@@ -4654,7 +4654,7 @@ static void gatherMaskedLong128VectorTests(IntFunction<long[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::gatherMasked);
     }
 
     static long[] scatter(long a[], int ix, int[] b, int iy) {
@@ -4679,7 +4679,7 @@ static void scatterLong128VectorTests(IntFunction<long[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Long128VectorTests::scatter);
+        assertArraysEquals(r, a, b, Long128VectorTests::scatter);
     }
 
     static long[] scatterMasked(long r[], long a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4717,7 +4717,7 @@ static void scatterMaskedLong128VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long128VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Long128VectorTests::scatterMasked);
     }
 
 
@@ -4759,8 +4759,8 @@ static void toIntArrayLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4770,8 +4770,8 @@ static void toLongArrayLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4781,8 +4781,8 @@ static void toDoubleArrayLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4831,7 +4831,7 @@ static void ADDReduceLongLong128VectorTests(IntFunction<long[]> fa) {
             ra += r[i];
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long128VectorTests::ADDReduce, Long128VectorTests::ADDReduceAll);
     }
 
@@ -4853,7 +4853,7 @@ static void ADDReduceLongLong128VectorTestsMasked(IntFunction<long[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long128VectorTests::ADDReduceMasked, Long128VectorTests::ADDReduceAllMasked);
     }
 
@@ -4870,7 +4870,7 @@ static void SelectFromLong128VectorTests(IntFunction<long[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
@@ -4889,7 +4889,7 @@ static void SelectFromLong128VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4966,7 +4966,7 @@ static void maskEqLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Long128VectorTests::beq);
+        assertArraysEquals(r, a, b, Long128VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java
index 3eb2c4eb359d9..3433fd0239b70 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Long256VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (256 / 8));
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(long[] a, long[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<long[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new long[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<long[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorTests.java b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
index 8794a134430f8..6bd614f5a7c7d 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         long apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         long[] apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         long apply(long[] a);
     }
 
-    static void assertReductionArraysEquals(long[] a, long[] b, long c,
+    static void assertReductionArraysEquals(long[] r, long rc, long[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         long apply(long[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(long[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(long[] r, long rc, long[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -159,37 +159,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(long[] a, long[] b, long element, int index) {
+    static void assertInsertArraysEquals(long[] r, long[] a, long element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -203,7 +203,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -217,7 +217,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -237,7 +237,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -257,7 +257,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(long[]a, long[]r) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -286,7 +286,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -297,7 +297,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -309,7 +309,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -321,11 +321,11 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -336,11 +336,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -354,11 +354,11 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -372,7 +372,7 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -386,11 +386,11 @@ static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -416,7 +416,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -427,11 +427,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -443,7 +443,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -456,7 +456,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -469,12 +469,12 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -490,12 +490,12 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -511,7 +511,7 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -526,12 +526,12 @@ static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ interface FBinArrayOp {
         long apply(long[] a, int b);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FBinArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,7 +569,7 @@ interface FGatherScatterOp {
         long[] apply(long[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -596,7 +596,7 @@ interface FScatterMaskedOp {
         long[] apply(long[] r, long[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -606,7 +606,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -617,7 +617,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -627,7 +627,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -644,7 +644,7 @@ interface FLaneOp {
         long[] apply(long[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -654,7 +654,7 @@ static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -664,7 +664,7 @@ interface FLaneBop {
         long[] apply(long[] a, long[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -674,7 +674,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -685,7 +685,7 @@ interface FLaneMaskedBop {
         long[] apply(long[] a, long[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -695,7 +695,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -706,7 +706,7 @@ interface FLanePartBop {
         long[] apply(long[] a, long[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -716,7 +716,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -728,7 +728,7 @@ interface FLanePartMaskedBop {
         long[] apply(long[] a, long[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -780,7 +780,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(long[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -793,7 +793,7 @@ static void assertArraysEquals(long[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(long[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -804,7 +804,7 @@ static void assertArraysEquals(long[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(long[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1275,7 +1275,7 @@ static void ADDLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::ADD);
+        assertArraysEquals(r, a, b, Long256VectorTests::ADD);
     }
     static long add(long a, long b) {
         return (long)(a + b);
@@ -1293,7 +1293,7 @@ static void addLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::add);
+        assertArraysEquals(r, a, b, Long256VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1313,7 +1313,7 @@ static void ADDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1331,7 +1331,7 @@ static void addLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::add);
     }
     static long SUB(long a, long b) {
         return (long)(a - b);
@@ -1351,7 +1351,7 @@ static void SUBLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::SUB);
+        assertArraysEquals(r, a, b, Long256VectorTests::SUB);
     }
     static long sub(long a, long b) {
         return (long)(a - b);
@@ -1369,7 +1369,7 @@ static void subLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::sub);
+        assertArraysEquals(r, a, b, Long256VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1389,7 +1389,7 @@ static void SUBLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1407,7 +1407,7 @@ static void subLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::sub);
     }
     static long MUL(long a, long b) {
         return (long)(a * b);
@@ -1427,7 +1427,7 @@ static void MULLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::MUL);
+        assertArraysEquals(r, a, b, Long256VectorTests::MUL);
     }
     static long mul(long a, long b) {
         return (long)(a * b);
@@ -1445,7 +1445,7 @@ static void mulLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::mul);
+        assertArraysEquals(r, a, b, Long256VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1465,7 +1465,7 @@ static void MULLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1483,7 +1483,7 @@ static void mulLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::mul);
     }
 
 
@@ -1508,7 +1508,7 @@ static void DIVLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::DIV);
+        assertArraysEquals(r, a, b, Long256VectorTests::DIV);
     }
     static long div(long a, long b) {
         return (long)(a / b);
@@ -1530,7 +1530,7 @@ static void divLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::div);
+        assertArraysEquals(r, a, b, Long256VectorTests::div);
     }
 
 
@@ -1554,7 +1554,7 @@ static void DIVLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1576,7 +1576,7 @@ static void divLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1597,7 +1597,7 @@ static void FIRST_NONZEROLong256VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Long256VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1617,7 +1617,7 @@ static void FIRST_NONZEROLong256VectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1638,7 +1638,7 @@ static void ANDLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::AND);
+        assertArraysEquals(r, a, b, Long256VectorTests::AND);
     }
     static long and(long a, long b) {
         return (long)(a & b);
@@ -1656,7 +1656,7 @@ static void andLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::and);
+        assertArraysEquals(r, a, b, Long256VectorTests::and);
     }
 
 
@@ -1678,7 +1678,7 @@ static void ANDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::AND);
     }
 
 
@@ -1700,7 +1700,7 @@ static void AND_NOTLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Long256VectorTests::AND_NOT);
     }
 
 
@@ -1722,7 +1722,7 @@ static void AND_NOTLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::AND_NOT);
     }
 
 
@@ -1744,7 +1744,7 @@ static void ORLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::OR);
+        assertArraysEquals(r, a, b, Long256VectorTests::OR);
     }
     static long or(long a, long b) {
         return (long)(a | b);
@@ -1762,7 +1762,7 @@ static void orLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::or);
+        assertArraysEquals(r, a, b, Long256VectorTests::or);
     }
 
 
@@ -1784,7 +1784,7 @@ static void ORLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::OR);
     }
 
 
@@ -1806,7 +1806,7 @@ static void XORLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::XOR);
+        assertArraysEquals(r, a, b, Long256VectorTests::XOR);
     }
 
 
@@ -1828,7 +1828,7 @@ static void XORLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::XOR);
     }
 
 
@@ -1843,7 +1843,7 @@ static void addLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1860,7 +1860,7 @@ static void addLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1874,7 +1874,7 @@ static void subLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1891,7 +1891,7 @@ static void subLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1905,7 +1905,7 @@ static void mulLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1922,7 +1922,7 @@ static void mulLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::mul);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::div);
     }
 
 
@@ -1962,7 +1962,7 @@ static void divLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::div);
     }
 
 
@@ -1978,7 +1978,7 @@ static void ORLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1992,7 +1992,7 @@ static void orLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::or);
     }
 
 
@@ -2011,7 +2011,7 @@ static void ORLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::OR);
     }
 
 
@@ -2027,7 +2027,7 @@ static void ANDLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void andLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::and);
     }
 
 
@@ -2060,7 +2060,7 @@ static void ANDLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::AND);
     }
 
 
@@ -2076,7 +2076,7 @@ static void ORLong256VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Long256VectorTests::OR);
     }
 
 
@@ -2095,7 +2095,7 @@ static void ORLong256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long256VectorTests::OR);
     }
 
 
@@ -2110,7 +2110,7 @@ static void ADDLong256VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Long256VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -2127,7 +2127,7 @@ static void ADDLong256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long256VectorTests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2148,7 +2148,7 @@ static void LSHLLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Long256VectorTests::LSHL);
     }
 
 
@@ -2170,7 +2170,7 @@ static void LSHLLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::LSHL);
     }
 
 
@@ -2196,7 +2196,7 @@ static void ASHRLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Long256VectorTests::ASHR);
     }
 
 
@@ -2218,7 +2218,7 @@ static void ASHRLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::ASHR);
     }
 
 
@@ -2244,7 +2244,7 @@ static void LSHRLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Long256VectorTests::LSHR);
     }
 
 
@@ -2266,7 +2266,7 @@ static void LSHRLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::LSHR);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLLong256VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Long256VectorTests::LSHL_unary);
     }
 
 
@@ -2312,7 +2312,7 @@ static void LSHLLong256VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::LSHL_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRLong256VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Long256VectorTests::LSHR_unary);
     }
 
 
@@ -2358,7 +2358,7 @@ static void LSHRLong256VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::LSHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRLong256VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Long256VectorTests::ASHR_unary);
     }
 
 
@@ -2404,7 +2404,7 @@ static void ASHRLong256VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::ASHR_unary);
     }
 
 
@@ -2429,7 +2429,7 @@ static void MINLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::MIN);
+        assertArraysEquals(r, a, b, Long256VectorTests::MIN);
     }
     static long min(long a, long b) {
         return (long)(Math.min(a, b));
@@ -2447,7 +2447,7 @@ static void minLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::min);
+        assertArraysEquals(r, a, b, Long256VectorTests::min);
     }
     static long MAX(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2467,7 +2467,7 @@ static void MAXLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::MAX);
+        assertArraysEquals(r, a, b, Long256VectorTests::MAX);
     }
     static long max(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2485,7 +2485,7 @@ static void maxLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::max);
+        assertArraysEquals(r, a, b, Long256VectorTests::max);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2499,7 +2499,7 @@ static void MINLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2513,7 +2513,7 @@ static void minLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2527,7 +2527,7 @@ static void MAXLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2541,7 +2541,7 @@ static void maxLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::max);
     }
 
     static long ANDReduce(long[] a, int idx) {
@@ -2584,7 +2584,7 @@ static void ANDReduceLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::ANDReduce, Long256VectorTests::ANDReduceAll);
     }
 
@@ -2632,7 +2632,7 @@ static void ANDReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::ANDReduceMasked, Long256VectorTests::ANDReduceAllMasked);
     }
 
@@ -2677,7 +2677,7 @@ static void ORReduceLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::ORReduce, Long256VectorTests::ORReduceAll);
     }
 
@@ -2725,7 +2725,7 @@ static void ORReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::ORReduceMasked, Long256VectorTests::ORReduceAllMasked);
     }
 
@@ -2770,7 +2770,7 @@ static void XORReduceLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::XORReduce, Long256VectorTests::XORReduceAll);
     }
 
@@ -2818,7 +2818,7 @@ static void XORReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::XORReduceMasked, Long256VectorTests::XORReduceAllMasked);
     }
 
@@ -2860,7 +2860,7 @@ static void ADDReduceLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::ADDReduce, Long256VectorTests::ADDReduceAll);
     }
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2904,7 +2904,7 @@ static void ADDReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::ADDReduceMasked, Long256VectorTests::ADDReduceAllMasked);
     }
     static long MULReduce(long[] a, int idx) {
@@ -2945,7 +2945,7 @@ static void MULReduceLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::MULReduce, Long256VectorTests::MULReduceAll);
     }
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2989,7 +2989,7 @@ static void MULReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::MULReduceMasked, Long256VectorTests::MULReduceAllMasked);
     }
     static long MINReduce(long[] a, int idx) {
@@ -3030,7 +3030,7 @@ static void MINReduceLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::MINReduce, Long256VectorTests::MINReduceAll);
     }
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3075,7 +3075,7 @@ static void MINReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::MINReduceMasked, Long256VectorTests::MINReduceAllMasked);
     }
     static long MAXReduce(long[] a, int idx) {
@@ -3116,7 +3116,7 @@ static void MAXReduceLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::MAXReduce, Long256VectorTests::MAXReduceAll);
     }
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3161,7 +3161,7 @@ static void MAXReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::MAXReduceMasked, Long256VectorTests::MAXReduceAllMasked);
     }
 
@@ -3187,7 +3187,7 @@ static void anyTrueLong256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Long256VectorTests::anyTrue);
     }
 
 
@@ -3213,7 +3213,7 @@ static void allTrueLong256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Long256VectorTests::allTrue);
     }
 
 
@@ -3229,7 +3229,7 @@ static void withLong256VectorTests(IntFunction<long []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (long)4, 0);
+        assertInsertArraysEquals(r, a, (long)4, 0);
     }
     static boolean testIS_DEFAULT(long a) {
         return bits(a)==0;
@@ -3706,7 +3706,7 @@ static void blendLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
@@ -3723,7 +3723,7 @@ static void RearrangeLong256VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
@@ -3741,7 +3741,7 @@ static void RearrangeLong256VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "longUnaryOpProvider")
     static void getLong256VectorTests(IntFunction<long[]> fa) {
@@ -3896,7 +3896,7 @@ static void getLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::get);
+        assertArraysEquals(r, a, Long256VectorTests::get);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -3910,7 +3910,7 @@ static void BroadcastLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3957,7 +3957,7 @@ static void sliceUnaryLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Long256VectorTests::sliceUnary);
     }
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -3986,7 +3986,7 @@ static void sliceBinaryLong256VectorTestsBinary(IntFunction<long[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Long256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Long256VectorTests::sliceBinary);
     }
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4019,7 +4019,7 @@ static void sliceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lo
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Long256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Long256VectorTests::slice);
     }
     static long[] unsliceUnary(long[] a, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4046,7 +4046,7 @@ static void unsliceUnaryLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Long256VectorTests::unsliceUnary);
     }
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4085,7 +4085,7 @@ static void unsliceBinaryLong256VectorTestsBinary(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Long256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Long256VectorTests::unsliceBinary);
     }
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4141,7 +4141,7 @@ static void unsliceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Long256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Long256VectorTests::unslice);
     }
 
 
@@ -4190,7 +4190,7 @@ static void BITWISE_BLENDLong256VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, Long256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4206,7 +4206,7 @@ static void bitwiseBlendLong256VectorTests(IntFunction<long[]> fa, IntFunction<l
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Long256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
     }
 
 
@@ -4229,7 +4229,7 @@ static void BITWISE_BLENDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Long256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4247,7 +4247,7 @@ static void BITWISE_BLENDLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4262,7 +4262,7 @@ static void BITWISE_BLENDLong256VectorTestsAltBroadcastSmokeTest(IntFunction<lon
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4276,7 +4276,7 @@ static void bitwiseBlendLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]>
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4291,7 +4291,7 @@ static void bitwiseBlendLong256VectorTestsAltBroadcastSmokeTest(IntFunction<long
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
     }
 
 
@@ -4311,7 +4311,7 @@ static void BITWISE_BLENDLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Long256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void BITWISE_BLENDLong256VectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Long256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4348,7 +4348,7 @@ static void BITWISE_BLENDLong256VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong256VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4362,7 +4362,7 @@ static void bitwiseBlendLong256VectorTestsDoubleBroadcastSmokeTest(IntFunction<l
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
     }
 
 
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDLong256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Long256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4405,7 +4405,7 @@ static void NEGLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::NEG);
+        assertArraysEquals(r, a, Long256VectorTests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4420,7 +4420,7 @@ static void negLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::neg);
+        assertArraysEquals(r, a, Long256VectorTests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4438,7 +4438,7 @@ static void NEGMaskedLong256VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Long256VectorTests::NEG);
     }
 
     static long ABS(long a) {
@@ -4461,7 +4461,7 @@ static void ABSLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::ABS);
+        assertArraysEquals(r, a, Long256VectorTests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4476,7 +4476,7 @@ static void absLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::abs);
+        assertArraysEquals(r, a, Long256VectorTests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4494,7 +4494,7 @@ static void ABSMaskedLong256VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Long256VectorTests::ABS);
     }
 
 
@@ -4520,7 +4520,7 @@ static void NOTLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::NOT);
+        assertArraysEquals(r, a, Long256VectorTests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4535,7 +4535,7 @@ static void notLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::not);
+        assertArraysEquals(r, a, Long256VectorTests::not);
     }
 
 
@@ -4555,7 +4555,7 @@ static void NOTMaskedLong256VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Long256VectorTests::NOT);
     }
 
 
@@ -4578,7 +4578,7 @@ static void ZOMOLong256VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long256VectorTests::ZOMO);
+        assertArraysEquals(r, a, Long256VectorTests::ZOMO);
     }
 
 
@@ -4598,7 +4598,7 @@ static void ZOMOMaskedLong256VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Long256VectorTests::ZOMO);
     }
 
 
@@ -4626,7 +4626,7 @@ static void gatherLong256VectorTests(IntFunction<long[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::gather);
+        assertArraysEquals(r, a, b, Long256VectorTests::gather);
     }
     static long[] gatherMasked(long a[], int ix, boolean[] mask, int[] b, int iy) {
         long[] res = new long[SPECIES.length()];
@@ -4654,7 +4654,7 @@ static void gatherMaskedLong256VectorTests(IntFunction<long[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::gatherMasked);
     }
 
     static long[] scatter(long a[], int ix, int[] b, int iy) {
@@ -4679,7 +4679,7 @@ static void scatterLong256VectorTests(IntFunction<long[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Long256VectorTests::scatter);
+        assertArraysEquals(r, a, b, Long256VectorTests::scatter);
     }
 
     static long[] scatterMasked(long r[], long a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4717,7 +4717,7 @@ static void scatterMaskedLong256VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long256VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Long256VectorTests::scatterMasked);
     }
 
 
@@ -4759,8 +4759,8 @@ static void toIntArrayLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4770,8 +4770,8 @@ static void toLongArrayLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4781,8 +4781,8 @@ static void toDoubleArrayLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4831,7 +4831,7 @@ static void ADDReduceLongLong256VectorTests(IntFunction<long[]> fa) {
             ra += r[i];
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long256VectorTests::ADDReduce, Long256VectorTests::ADDReduceAll);
     }
 
@@ -4853,7 +4853,7 @@ static void ADDReduceLongLong256VectorTestsMasked(IntFunction<long[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long256VectorTests::ADDReduceMasked, Long256VectorTests::ADDReduceAllMasked);
     }
 
@@ -4870,7 +4870,7 @@ static void SelectFromLong256VectorTests(IntFunction<long[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
@@ -4889,7 +4889,7 @@ static void SelectFromLong256VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4966,7 +4966,7 @@ static void maskEqLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Long256VectorTests::beq);
+        assertArraysEquals(r, a, b, Long256VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java
index b9da57a4ba6b0..c5724f854e429 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Long512VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (512 / 8));
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(long[] a, long[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<long[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new long[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<long[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorTests.java b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
index fce11aa298a20..ca02ac5b7261d 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         long apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         long[] apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         long apply(long[] a);
     }
 
-    static void assertReductionArraysEquals(long[] a, long[] b, long c,
+    static void assertReductionArraysEquals(long[] r, long rc, long[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         long apply(long[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(long[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(long[] r, long rc, long[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -159,37 +159,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(long[] a, long[] b, long element, int index) {
+    static void assertInsertArraysEquals(long[] r, long[] a, long element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -203,7 +203,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -217,7 +217,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -237,7 +237,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -257,7 +257,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(long[]a, long[]r) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -286,7 +286,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -297,7 +297,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -309,7 +309,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -321,11 +321,11 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -336,11 +336,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -354,11 +354,11 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -372,7 +372,7 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -386,11 +386,11 @@ static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -416,7 +416,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -427,11 +427,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -443,7 +443,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -456,7 +456,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -469,12 +469,12 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -490,12 +490,12 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -511,7 +511,7 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -526,12 +526,12 @@ static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ interface FBinArrayOp {
         long apply(long[] a, int b);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FBinArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,7 +569,7 @@ interface FGatherScatterOp {
         long[] apply(long[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -596,7 +596,7 @@ interface FScatterMaskedOp {
         long[] apply(long[] r, long[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -606,7 +606,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -617,7 +617,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -627,7 +627,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -644,7 +644,7 @@ interface FLaneOp {
         long[] apply(long[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -654,7 +654,7 @@ static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -664,7 +664,7 @@ interface FLaneBop {
         long[] apply(long[] a, long[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -674,7 +674,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -685,7 +685,7 @@ interface FLaneMaskedBop {
         long[] apply(long[] a, long[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -695,7 +695,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -706,7 +706,7 @@ interface FLanePartBop {
         long[] apply(long[] a, long[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -716,7 +716,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -728,7 +728,7 @@ interface FLanePartMaskedBop {
         long[] apply(long[] a, long[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -780,7 +780,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(long[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -793,7 +793,7 @@ static void assertArraysEquals(long[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(long[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -804,7 +804,7 @@ static void assertArraysEquals(long[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(long[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1275,7 +1275,7 @@ static void ADDLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::ADD);
+        assertArraysEquals(r, a, b, Long512VectorTests::ADD);
     }
     static long add(long a, long b) {
         return (long)(a + b);
@@ -1293,7 +1293,7 @@ static void addLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::add);
+        assertArraysEquals(r, a, b, Long512VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1313,7 +1313,7 @@ static void ADDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1331,7 +1331,7 @@ static void addLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::add);
     }
     static long SUB(long a, long b) {
         return (long)(a - b);
@@ -1351,7 +1351,7 @@ static void SUBLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::SUB);
+        assertArraysEquals(r, a, b, Long512VectorTests::SUB);
     }
     static long sub(long a, long b) {
         return (long)(a - b);
@@ -1369,7 +1369,7 @@ static void subLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::sub);
+        assertArraysEquals(r, a, b, Long512VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1389,7 +1389,7 @@ static void SUBLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1407,7 +1407,7 @@ static void subLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::sub);
     }
     static long MUL(long a, long b) {
         return (long)(a * b);
@@ -1427,7 +1427,7 @@ static void MULLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::MUL);
+        assertArraysEquals(r, a, b, Long512VectorTests::MUL);
     }
     static long mul(long a, long b) {
         return (long)(a * b);
@@ -1445,7 +1445,7 @@ static void mulLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::mul);
+        assertArraysEquals(r, a, b, Long512VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1465,7 +1465,7 @@ static void MULLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1483,7 +1483,7 @@ static void mulLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::mul);
     }
 
 
@@ -1508,7 +1508,7 @@ static void DIVLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::DIV);
+        assertArraysEquals(r, a, b, Long512VectorTests::DIV);
     }
     static long div(long a, long b) {
         return (long)(a / b);
@@ -1530,7 +1530,7 @@ static void divLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::div);
+        assertArraysEquals(r, a, b, Long512VectorTests::div);
     }
 
 
@@ -1554,7 +1554,7 @@ static void DIVLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1576,7 +1576,7 @@ static void divLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1597,7 +1597,7 @@ static void FIRST_NONZEROLong512VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Long512VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1617,7 +1617,7 @@ static void FIRST_NONZEROLong512VectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1638,7 +1638,7 @@ static void ANDLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::AND);
+        assertArraysEquals(r, a, b, Long512VectorTests::AND);
     }
     static long and(long a, long b) {
         return (long)(a & b);
@@ -1656,7 +1656,7 @@ static void andLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::and);
+        assertArraysEquals(r, a, b, Long512VectorTests::and);
     }
 
 
@@ -1678,7 +1678,7 @@ static void ANDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::AND);
     }
 
 
@@ -1700,7 +1700,7 @@ static void AND_NOTLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Long512VectorTests::AND_NOT);
     }
 
 
@@ -1722,7 +1722,7 @@ static void AND_NOTLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::AND_NOT);
     }
 
 
@@ -1744,7 +1744,7 @@ static void ORLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::OR);
+        assertArraysEquals(r, a, b, Long512VectorTests::OR);
     }
     static long or(long a, long b) {
         return (long)(a | b);
@@ -1762,7 +1762,7 @@ static void orLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::or);
+        assertArraysEquals(r, a, b, Long512VectorTests::or);
     }
 
 
@@ -1784,7 +1784,7 @@ static void ORLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::OR);
     }
 
 
@@ -1806,7 +1806,7 @@ static void XORLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::XOR);
+        assertArraysEquals(r, a, b, Long512VectorTests::XOR);
     }
 
 
@@ -1828,7 +1828,7 @@ static void XORLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::XOR);
     }
 
 
@@ -1843,7 +1843,7 @@ static void addLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1860,7 +1860,7 @@ static void addLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1874,7 +1874,7 @@ static void subLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1891,7 +1891,7 @@ static void subLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1905,7 +1905,7 @@ static void mulLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1922,7 +1922,7 @@ static void mulLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::mul);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::div);
     }
 
 
@@ -1962,7 +1962,7 @@ static void divLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::div);
     }
 
 
@@ -1978,7 +1978,7 @@ static void ORLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1992,7 +1992,7 @@ static void orLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::or);
     }
 
 
@@ -2011,7 +2011,7 @@ static void ORLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::OR);
     }
 
 
@@ -2027,7 +2027,7 @@ static void ANDLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void andLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::and);
     }
 
 
@@ -2060,7 +2060,7 @@ static void ANDLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::AND);
     }
 
 
@@ -2076,7 +2076,7 @@ static void ORLong512VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Long512VectorTests::OR);
     }
 
 
@@ -2095,7 +2095,7 @@ static void ORLong512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long512VectorTests::OR);
     }
 
 
@@ -2110,7 +2110,7 @@ static void ADDLong512VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Long512VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -2127,7 +2127,7 @@ static void ADDLong512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long512VectorTests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2148,7 +2148,7 @@ static void LSHLLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Long512VectorTests::LSHL);
     }
 
 
@@ -2170,7 +2170,7 @@ static void LSHLLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::LSHL);
     }
 
 
@@ -2196,7 +2196,7 @@ static void ASHRLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Long512VectorTests::ASHR);
     }
 
 
@@ -2218,7 +2218,7 @@ static void ASHRLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::ASHR);
     }
 
 
@@ -2244,7 +2244,7 @@ static void LSHRLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Long512VectorTests::LSHR);
     }
 
 
@@ -2266,7 +2266,7 @@ static void LSHRLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::LSHR);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLLong512VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Long512VectorTests::LSHL_unary);
     }
 
 
@@ -2312,7 +2312,7 @@ static void LSHLLong512VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::LSHL_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRLong512VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Long512VectorTests::LSHR_unary);
     }
 
 
@@ -2358,7 +2358,7 @@ static void LSHRLong512VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::LSHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRLong512VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Long512VectorTests::ASHR_unary);
     }
 
 
@@ -2404,7 +2404,7 @@ static void ASHRLong512VectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::ASHR_unary);
     }
 
 
@@ -2429,7 +2429,7 @@ static void MINLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::MIN);
+        assertArraysEquals(r, a, b, Long512VectorTests::MIN);
     }
     static long min(long a, long b) {
         return (long)(Math.min(a, b));
@@ -2447,7 +2447,7 @@ static void minLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::min);
+        assertArraysEquals(r, a, b, Long512VectorTests::min);
     }
     static long MAX(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2467,7 +2467,7 @@ static void MAXLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::MAX);
+        assertArraysEquals(r, a, b, Long512VectorTests::MAX);
     }
     static long max(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2485,7 +2485,7 @@ static void maxLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::max);
+        assertArraysEquals(r, a, b, Long512VectorTests::max);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2499,7 +2499,7 @@ static void MINLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2513,7 +2513,7 @@ static void minLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2527,7 +2527,7 @@ static void MAXLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2541,7 +2541,7 @@ static void maxLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::max);
     }
 
     static long ANDReduce(long[] a, int idx) {
@@ -2584,7 +2584,7 @@ static void ANDReduceLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::ANDReduce, Long512VectorTests::ANDReduceAll);
     }
 
@@ -2632,7 +2632,7 @@ static void ANDReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::ANDReduceMasked, Long512VectorTests::ANDReduceAllMasked);
     }
 
@@ -2677,7 +2677,7 @@ static void ORReduceLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::ORReduce, Long512VectorTests::ORReduceAll);
     }
 
@@ -2725,7 +2725,7 @@ static void ORReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::ORReduceMasked, Long512VectorTests::ORReduceAllMasked);
     }
 
@@ -2770,7 +2770,7 @@ static void XORReduceLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::XORReduce, Long512VectorTests::XORReduceAll);
     }
 
@@ -2818,7 +2818,7 @@ static void XORReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::XORReduceMasked, Long512VectorTests::XORReduceAllMasked);
     }
 
@@ -2860,7 +2860,7 @@ static void ADDReduceLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::ADDReduce, Long512VectorTests::ADDReduceAll);
     }
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2904,7 +2904,7 @@ static void ADDReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::ADDReduceMasked, Long512VectorTests::ADDReduceAllMasked);
     }
     static long MULReduce(long[] a, int idx) {
@@ -2945,7 +2945,7 @@ static void MULReduceLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::MULReduce, Long512VectorTests::MULReduceAll);
     }
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2989,7 +2989,7 @@ static void MULReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::MULReduceMasked, Long512VectorTests::MULReduceAllMasked);
     }
     static long MINReduce(long[] a, int idx) {
@@ -3030,7 +3030,7 @@ static void MINReduceLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::MINReduce, Long512VectorTests::MINReduceAll);
     }
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3075,7 +3075,7 @@ static void MINReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::MINReduceMasked, Long512VectorTests::MINReduceAllMasked);
     }
     static long MAXReduce(long[] a, int idx) {
@@ -3116,7 +3116,7 @@ static void MAXReduceLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::MAXReduce, Long512VectorTests::MAXReduceAll);
     }
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3161,7 +3161,7 @@ static void MAXReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::MAXReduceMasked, Long512VectorTests::MAXReduceAllMasked);
     }
 
@@ -3187,7 +3187,7 @@ static void anyTrueLong512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Long512VectorTests::anyTrue);
     }
 
 
@@ -3213,7 +3213,7 @@ static void allTrueLong512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Long512VectorTests::allTrue);
     }
 
 
@@ -3229,7 +3229,7 @@ static void withLong512VectorTests(IntFunction<long []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (long)4, 0);
+        assertInsertArraysEquals(r, a, (long)4, 0);
     }
     static boolean testIS_DEFAULT(long a) {
         return bits(a)==0;
@@ -3706,7 +3706,7 @@ static void blendLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
@@ -3723,7 +3723,7 @@ static void RearrangeLong512VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
@@ -3741,7 +3741,7 @@ static void RearrangeLong512VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "longUnaryOpProvider")
     static void getLong512VectorTests(IntFunction<long[]> fa) {
@@ -3896,7 +3896,7 @@ static void getLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::get);
+        assertArraysEquals(r, a, Long512VectorTests::get);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -3910,7 +3910,7 @@ static void BroadcastLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3957,7 +3957,7 @@ static void sliceUnaryLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Long512VectorTests::sliceUnary);
     }
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -3986,7 +3986,7 @@ static void sliceBinaryLong512VectorTestsBinary(IntFunction<long[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Long512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Long512VectorTests::sliceBinary);
     }
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4019,7 +4019,7 @@ static void sliceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lo
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Long512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Long512VectorTests::slice);
     }
     static long[] unsliceUnary(long[] a, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4046,7 +4046,7 @@ static void unsliceUnaryLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Long512VectorTests::unsliceUnary);
     }
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4085,7 +4085,7 @@ static void unsliceBinaryLong512VectorTestsBinary(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Long512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Long512VectorTests::unsliceBinary);
     }
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4141,7 +4141,7 @@ static void unsliceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Long512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Long512VectorTests::unslice);
     }
 
 
@@ -4190,7 +4190,7 @@ static void BITWISE_BLENDLong512VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, Long512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4206,7 +4206,7 @@ static void bitwiseBlendLong512VectorTests(IntFunction<long[]> fa, IntFunction<l
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Long512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
     }
 
 
@@ -4229,7 +4229,7 @@ static void BITWISE_BLENDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Long512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4247,7 +4247,7 @@ static void BITWISE_BLENDLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4262,7 +4262,7 @@ static void BITWISE_BLENDLong512VectorTestsAltBroadcastSmokeTest(IntFunction<lon
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4276,7 +4276,7 @@ static void bitwiseBlendLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]>
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4291,7 +4291,7 @@ static void bitwiseBlendLong512VectorTestsAltBroadcastSmokeTest(IntFunction<long
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
     }
 
 
@@ -4311,7 +4311,7 @@ static void BITWISE_BLENDLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Long512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void BITWISE_BLENDLong512VectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Long512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4348,7 +4348,7 @@ static void BITWISE_BLENDLong512VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong512VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4362,7 +4362,7 @@ static void bitwiseBlendLong512VectorTestsDoubleBroadcastSmokeTest(IntFunction<l
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
     }
 
 
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDLong512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Long512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4405,7 +4405,7 @@ static void NEGLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::NEG);
+        assertArraysEquals(r, a, Long512VectorTests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4420,7 +4420,7 @@ static void negLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::neg);
+        assertArraysEquals(r, a, Long512VectorTests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4438,7 +4438,7 @@ static void NEGMaskedLong512VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Long512VectorTests::NEG);
     }
 
     static long ABS(long a) {
@@ -4461,7 +4461,7 @@ static void ABSLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::ABS);
+        assertArraysEquals(r, a, Long512VectorTests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4476,7 +4476,7 @@ static void absLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::abs);
+        assertArraysEquals(r, a, Long512VectorTests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4494,7 +4494,7 @@ static void ABSMaskedLong512VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Long512VectorTests::ABS);
     }
 
 
@@ -4520,7 +4520,7 @@ static void NOTLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::NOT);
+        assertArraysEquals(r, a, Long512VectorTests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4535,7 +4535,7 @@ static void notLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::not);
+        assertArraysEquals(r, a, Long512VectorTests::not);
     }
 
 
@@ -4555,7 +4555,7 @@ static void NOTMaskedLong512VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Long512VectorTests::NOT);
     }
 
 
@@ -4578,7 +4578,7 @@ static void ZOMOLong512VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long512VectorTests::ZOMO);
+        assertArraysEquals(r, a, Long512VectorTests::ZOMO);
     }
 
 
@@ -4598,7 +4598,7 @@ static void ZOMOMaskedLong512VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Long512VectorTests::ZOMO);
     }
 
 
@@ -4626,7 +4626,7 @@ static void gatherLong512VectorTests(IntFunction<long[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::gather);
+        assertArraysEquals(r, a, b, Long512VectorTests::gather);
     }
     static long[] gatherMasked(long a[], int ix, boolean[] mask, int[] b, int iy) {
         long[] res = new long[SPECIES.length()];
@@ -4654,7 +4654,7 @@ static void gatherMaskedLong512VectorTests(IntFunction<long[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::gatherMasked);
     }
 
     static long[] scatter(long a[], int ix, int[] b, int iy) {
@@ -4679,7 +4679,7 @@ static void scatterLong512VectorTests(IntFunction<long[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Long512VectorTests::scatter);
+        assertArraysEquals(r, a, b, Long512VectorTests::scatter);
     }
 
     static long[] scatterMasked(long r[], long a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4717,7 +4717,7 @@ static void scatterMaskedLong512VectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long512VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Long512VectorTests::scatterMasked);
     }
 
 
@@ -4759,8 +4759,8 @@ static void toIntArrayLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4770,8 +4770,8 @@ static void toLongArrayLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4781,8 +4781,8 @@ static void toDoubleArrayLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4831,7 +4831,7 @@ static void ADDReduceLongLong512VectorTests(IntFunction<long[]> fa) {
             ra += r[i];
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long512VectorTests::ADDReduce, Long512VectorTests::ADDReduceAll);
     }
 
@@ -4853,7 +4853,7 @@ static void ADDReduceLongLong512VectorTestsMasked(IntFunction<long[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long512VectorTests::ADDReduceMasked, Long512VectorTests::ADDReduceAllMasked);
     }
 
@@ -4870,7 +4870,7 @@ static void SelectFromLong512VectorTests(IntFunction<long[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
@@ -4889,7 +4889,7 @@ static void SelectFromLong512VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4966,7 +4966,7 @@ static void maskEqLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Long512VectorTests::beq);
+        assertArraysEquals(r, a, b, Long512VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java
index f832bc0e1544a..c0764c57196b0 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Long64VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (64 / 8));
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(long[] a, long[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<long[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new long[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<long[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorTests.java b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
index 1df5de54d4067..2ba810968c04b 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         long apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         long[] apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         long apply(long[] a);
     }
 
-    static void assertReductionArraysEquals(long[] a, long[] b, long c,
+    static void assertReductionArraysEquals(long[] r, long rc, long[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         long apply(long[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(long[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(long[] r, long rc, long[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -159,37 +159,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(long[] a, long[] b, long element, int index) {
+    static void assertInsertArraysEquals(long[] r, long[] a, long element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -203,7 +203,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -217,7 +217,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -237,7 +237,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -257,7 +257,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(long[]a, long[]r) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -286,7 +286,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -297,7 +297,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -309,7 +309,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -321,11 +321,11 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -336,11 +336,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -354,11 +354,11 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -372,7 +372,7 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -386,11 +386,11 @@ static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -416,7 +416,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -427,11 +427,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -443,7 +443,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -456,7 +456,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -469,12 +469,12 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -490,12 +490,12 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -511,7 +511,7 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -526,12 +526,12 @@ static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ interface FBinArrayOp {
         long apply(long[] a, int b);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FBinArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,7 +569,7 @@ interface FGatherScatterOp {
         long[] apply(long[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -596,7 +596,7 @@ interface FScatterMaskedOp {
         long[] apply(long[] r, long[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -606,7 +606,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -617,7 +617,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -627,7 +627,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -644,7 +644,7 @@ interface FLaneOp {
         long[] apply(long[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -654,7 +654,7 @@ static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -664,7 +664,7 @@ interface FLaneBop {
         long[] apply(long[] a, long[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -674,7 +674,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -685,7 +685,7 @@ interface FLaneMaskedBop {
         long[] apply(long[] a, long[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -695,7 +695,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -706,7 +706,7 @@ interface FLanePartBop {
         long[] apply(long[] a, long[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -716,7 +716,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -728,7 +728,7 @@ interface FLanePartMaskedBop {
         long[] apply(long[] a, long[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -780,7 +780,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(long[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -793,7 +793,7 @@ static void assertArraysEquals(long[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(long[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -804,7 +804,7 @@ static void assertArraysEquals(long[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(long[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1275,7 +1275,7 @@ static void ADDLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::ADD);
+        assertArraysEquals(r, a, b, Long64VectorTests::ADD);
     }
     static long add(long a, long b) {
         return (long)(a + b);
@@ -1293,7 +1293,7 @@ static void addLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::add);
+        assertArraysEquals(r, a, b, Long64VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1313,7 +1313,7 @@ static void ADDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1331,7 +1331,7 @@ static void addLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::add);
     }
     static long SUB(long a, long b) {
         return (long)(a - b);
@@ -1351,7 +1351,7 @@ static void SUBLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::SUB);
+        assertArraysEquals(r, a, b, Long64VectorTests::SUB);
     }
     static long sub(long a, long b) {
         return (long)(a - b);
@@ -1369,7 +1369,7 @@ static void subLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::sub);
+        assertArraysEquals(r, a, b, Long64VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1389,7 +1389,7 @@ static void SUBLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1407,7 +1407,7 @@ static void subLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::sub);
     }
     static long MUL(long a, long b) {
         return (long)(a * b);
@@ -1427,7 +1427,7 @@ static void MULLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::MUL);
+        assertArraysEquals(r, a, b, Long64VectorTests::MUL);
     }
     static long mul(long a, long b) {
         return (long)(a * b);
@@ -1445,7 +1445,7 @@ static void mulLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::mul);
+        assertArraysEquals(r, a, b, Long64VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1465,7 +1465,7 @@ static void MULLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1483,7 +1483,7 @@ static void mulLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::mul);
     }
 
 
@@ -1508,7 +1508,7 @@ static void DIVLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::DIV);
+        assertArraysEquals(r, a, b, Long64VectorTests::DIV);
     }
     static long div(long a, long b) {
         return (long)(a / b);
@@ -1530,7 +1530,7 @@ static void divLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::div);
+        assertArraysEquals(r, a, b, Long64VectorTests::div);
     }
 
 
@@ -1554,7 +1554,7 @@ static void DIVLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1576,7 +1576,7 @@ static void divLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1597,7 +1597,7 @@ static void FIRST_NONZEROLong64VectorTests(IntFunction<long[]> fa, IntFunction<l
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Long64VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1617,7 +1617,7 @@ static void FIRST_NONZEROLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1638,7 +1638,7 @@ static void ANDLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::AND);
+        assertArraysEquals(r, a, b, Long64VectorTests::AND);
     }
     static long and(long a, long b) {
         return (long)(a & b);
@@ -1656,7 +1656,7 @@ static void andLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::and);
+        assertArraysEquals(r, a, b, Long64VectorTests::and);
     }
 
 
@@ -1678,7 +1678,7 @@ static void ANDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::AND);
     }
 
 
@@ -1700,7 +1700,7 @@ static void AND_NOTLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Long64VectorTests::AND_NOT);
     }
 
 
@@ -1722,7 +1722,7 @@ static void AND_NOTLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<l
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::AND_NOT);
     }
 
 
@@ -1744,7 +1744,7 @@ static void ORLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::OR);
+        assertArraysEquals(r, a, b, Long64VectorTests::OR);
     }
     static long or(long a, long b) {
         return (long)(a | b);
@@ -1762,7 +1762,7 @@ static void orLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::or);
+        assertArraysEquals(r, a, b, Long64VectorTests::or);
     }
 
 
@@ -1784,7 +1784,7 @@ static void ORLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::OR);
     }
 
 
@@ -1806,7 +1806,7 @@ static void XORLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::XOR);
+        assertArraysEquals(r, a, b, Long64VectorTests::XOR);
     }
 
 
@@ -1828,7 +1828,7 @@ static void XORLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::XOR);
     }
 
 
@@ -1843,7 +1843,7 @@ static void addLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1860,7 +1860,7 @@ static void addLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1874,7 +1874,7 @@ static void subLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1891,7 +1891,7 @@ static void subLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1905,7 +1905,7 @@ static void mulLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1922,7 +1922,7 @@ static void mulLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::mul);
     }
 
 
@@ -1941,7 +1941,7 @@ static void divLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::div);
     }
 
 
@@ -1962,7 +1962,7 @@ static void divLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::div);
     }
 
 
@@ -1978,7 +1978,7 @@ static void ORLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFun
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1992,7 +1992,7 @@ static void orLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFun
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::or);
     }
 
 
@@ -2011,7 +2011,7 @@ static void ORLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::OR);
     }
 
 
@@ -2027,7 +2027,7 @@ static void ANDLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2041,7 +2041,7 @@ static void andLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::and);
     }
 
 
@@ -2060,7 +2060,7 @@ static void ANDLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Long64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::AND);
     }
 
 
@@ -2076,7 +2076,7 @@ static void ORLong64VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, In
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Long64VectorTests::OR);
     }
 
 
@@ -2095,7 +2095,7 @@ static void ORLong64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long64VectorTests::OR);
     }
 
 
@@ -2110,7 +2110,7 @@ static void ADDLong64VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, I
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Long64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Long64VectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -2127,7 +2127,7 @@ static void ADDLong64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]>
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Long64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Long64VectorTests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2148,7 +2148,7 @@ static void LSHLLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Long64VectorTests::LSHL);
     }
 
 
@@ -2170,7 +2170,7 @@ static void LSHLLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::LSHL);
     }
 
 
@@ -2196,7 +2196,7 @@ static void ASHRLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Long64VectorTests::ASHR);
     }
 
 
@@ -2218,7 +2218,7 @@ static void ASHRLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::ASHR);
     }
 
 
@@ -2244,7 +2244,7 @@ static void LSHRLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Long64VectorTests::LSHR);
     }
 
 
@@ -2266,7 +2266,7 @@ static void LSHRLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::LSHR);
     }
 
 
@@ -2291,7 +2291,7 @@ static void LSHLLong64VectorTestsShift(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Long64VectorTests::LSHL_unary);
     }
 
 
@@ -2312,7 +2312,7 @@ static void LSHLLong64VectorTestsShift(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::LSHL_unary);
     }
 
 
@@ -2337,7 +2337,7 @@ static void LSHRLong64VectorTestsShift(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Long64VectorTests::LSHR_unary);
     }
 
 
@@ -2358,7 +2358,7 @@ static void LSHRLong64VectorTestsShift(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::LSHR_unary);
     }
 
 
@@ -2383,7 +2383,7 @@ static void ASHRLong64VectorTestsShift(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Long64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Long64VectorTests::ASHR_unary);
     }
 
 
@@ -2404,7 +2404,7 @@ static void ASHRLong64VectorTestsShift(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Long64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::ASHR_unary);
     }
 
 
@@ -2429,7 +2429,7 @@ static void MINLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::MIN);
+        assertArraysEquals(r, a, b, Long64VectorTests::MIN);
     }
     static long min(long a, long b) {
         return (long)(Math.min(a, b));
@@ -2447,7 +2447,7 @@ static void minLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::min);
+        assertArraysEquals(r, a, b, Long64VectorTests::min);
     }
     static long MAX(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2467,7 +2467,7 @@ static void MAXLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::MAX);
+        assertArraysEquals(r, a, b, Long64VectorTests::MAX);
     }
     static long max(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2485,7 +2485,7 @@ static void maxLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::max);
+        assertArraysEquals(r, a, b, Long64VectorTests::max);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2499,7 +2499,7 @@ static void MINLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2513,7 +2513,7 @@ static void minLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2527,7 +2527,7 @@ static void MAXLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2541,7 +2541,7 @@ static void maxLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Long64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::max);
     }
 
     static long ANDReduce(long[] a, int idx) {
@@ -2584,7 +2584,7 @@ static void ANDReduceLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::ANDReduce, Long64VectorTests::ANDReduceAll);
     }
 
@@ -2632,7 +2632,7 @@ static void ANDReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::ANDReduceMasked, Long64VectorTests::ANDReduceAllMasked);
     }
 
@@ -2677,7 +2677,7 @@ static void ORReduceLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::ORReduce, Long64VectorTests::ORReduceAll);
     }
 
@@ -2725,7 +2725,7 @@ static void ORReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::ORReduceMasked, Long64VectorTests::ORReduceAllMasked);
     }
 
@@ -2770,7 +2770,7 @@ static void XORReduceLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::XORReduce, Long64VectorTests::XORReduceAll);
     }
 
@@ -2818,7 +2818,7 @@ static void XORReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::XORReduceMasked, Long64VectorTests::XORReduceAllMasked);
     }
 
@@ -2860,7 +2860,7 @@ static void ADDReduceLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::ADDReduce, Long64VectorTests::ADDReduceAll);
     }
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2904,7 +2904,7 @@ static void ADDReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::ADDReduceMasked, Long64VectorTests::ADDReduceAllMasked);
     }
     static long MULReduce(long[] a, int idx) {
@@ -2945,7 +2945,7 @@ static void MULReduceLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::MULReduce, Long64VectorTests::MULReduceAll);
     }
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2989,7 +2989,7 @@ static void MULReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::MULReduceMasked, Long64VectorTests::MULReduceAllMasked);
     }
     static long MINReduce(long[] a, int idx) {
@@ -3030,7 +3030,7 @@ static void MINReduceLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::MINReduce, Long64VectorTests::MINReduceAll);
     }
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3075,7 +3075,7 @@ static void MINReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::MINReduceMasked, Long64VectorTests::MINReduceAllMasked);
     }
     static long MAXReduce(long[] a, int idx) {
@@ -3116,7 +3116,7 @@ static void MAXReduceLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::MAXReduce, Long64VectorTests::MAXReduceAll);
     }
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3161,7 +3161,7 @@ static void MAXReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::MAXReduceMasked, Long64VectorTests::MAXReduceAllMasked);
     }
 
@@ -3187,7 +3187,7 @@ static void anyTrueLong64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Long64VectorTests::anyTrue);
     }
 
 
@@ -3213,7 +3213,7 @@ static void allTrueLong64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Long64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Long64VectorTests::allTrue);
     }
 
 
@@ -3229,7 +3229,7 @@ static void withLong64VectorTests(IntFunction<long []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (long)4, 0);
+        assertInsertArraysEquals(r, a, (long)4, 0);
     }
     static boolean testIS_DEFAULT(long a) {
         return bits(a)==0;
@@ -3706,7 +3706,7 @@ static void blendLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
@@ -3723,7 +3723,7 @@ static void RearrangeLong64VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
@@ -3741,7 +3741,7 @@ static void RearrangeLong64VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "longUnaryOpProvider")
     static void getLong64VectorTests(IntFunction<long[]> fa) {
@@ -3896,7 +3896,7 @@ static void getLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::get);
+        assertArraysEquals(r, a, Long64VectorTests::get);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -3910,7 +3910,7 @@ static void BroadcastLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3957,7 +3957,7 @@ static void sliceUnaryLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Long64VectorTests::sliceUnary);
     }
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -3986,7 +3986,7 @@ static void sliceBinaryLong64VectorTestsBinary(IntFunction<long[]> fa, IntFuncti
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Long64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Long64VectorTests::sliceBinary);
     }
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4019,7 +4019,7 @@ static void sliceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Long64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Long64VectorTests::slice);
     }
     static long[] unsliceUnary(long[] a, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4046,7 +4046,7 @@ static void unsliceUnaryLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Long64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Long64VectorTests::unsliceUnary);
     }
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4085,7 +4085,7 @@ static void unsliceBinaryLong64VectorTestsBinary(IntFunction<long[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Long64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Long64VectorTests::unsliceBinary);
     }
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4141,7 +4141,7 @@ static void unsliceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<l
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Long64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Long64VectorTests::unslice);
     }
 
 
@@ -4190,7 +4190,7 @@ static void BITWISE_BLENDLong64VectorTests(IntFunction<long[]> fa, IntFunction<l
             }
         }
 
-        assertArraysEquals(a, b, c, r, Long64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4206,7 +4206,7 @@ static void bitwiseBlendLong64VectorTests(IntFunction<long[]> fa, IntFunction<lo
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Long64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
     }
 
 
@@ -4229,7 +4229,7 @@ static void BITWISE_BLENDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Long64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4247,7 +4247,7 @@ static void BITWISE_BLENDLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]>
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4262,7 +4262,7 @@ static void BITWISE_BLENDLong64VectorTestsAltBroadcastSmokeTest(IntFunction<long
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4276,7 +4276,7 @@ static void bitwiseBlendLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]>
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Long64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4291,7 +4291,7 @@ static void bitwiseBlendLong64VectorTestsAltBroadcastSmokeTest(IntFunction<long[
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Long64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
     }
 
 
@@ -4311,7 +4311,7 @@ static void BITWISE_BLENDLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<l
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Long64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
@@ -4330,7 +4330,7 @@ static void BITWISE_BLENDLong64VectorTestsAltBroadcastMaskedSmokeTest(IntFunctio
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Long64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4348,7 +4348,7 @@ static void BITWISE_BLENDLong64VectorTestsDoubleBroadcastSmokeTest(IntFunction<l
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLong64VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4362,7 +4362,7 @@ static void bitwiseBlendLong64VectorTestsDoubleBroadcastSmokeTest(IntFunction<lo
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Long64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
     }
 
 
@@ -4381,7 +4381,7 @@ static void BITWISE_BLENDLong64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunc
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Long64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4405,7 +4405,7 @@ static void NEGLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::NEG);
+        assertArraysEquals(r, a, Long64VectorTests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4420,7 +4420,7 @@ static void negLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::neg);
+        assertArraysEquals(r, a, Long64VectorTests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4438,7 +4438,7 @@ static void NEGMaskedLong64VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Long64VectorTests::NEG);
     }
 
     static long ABS(long a) {
@@ -4461,7 +4461,7 @@ static void ABSLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::ABS);
+        assertArraysEquals(r, a, Long64VectorTests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4476,7 +4476,7 @@ static void absLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::abs);
+        assertArraysEquals(r, a, Long64VectorTests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4494,7 +4494,7 @@ static void ABSMaskedLong64VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Long64VectorTests::ABS);
     }
 
 
@@ -4520,7 +4520,7 @@ static void NOTLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::NOT);
+        assertArraysEquals(r, a, Long64VectorTests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4535,7 +4535,7 @@ static void notLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::not);
+        assertArraysEquals(r, a, Long64VectorTests::not);
     }
 
 
@@ -4555,7 +4555,7 @@ static void NOTMaskedLong64VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Long64VectorTests::NOT);
     }
 
 
@@ -4578,7 +4578,7 @@ static void ZOMOLong64VectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Long64VectorTests::ZOMO);
+        assertArraysEquals(r, a, Long64VectorTests::ZOMO);
     }
 
 
@@ -4598,7 +4598,7 @@ static void ZOMOMaskedLong64VectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Long64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Long64VectorTests::ZOMO);
     }
 
 
@@ -4626,7 +4626,7 @@ static void gatherLong64VectorTests(IntFunction<long[]> fa, BiFunction<Integer,I
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::gather);
+        assertArraysEquals(r, a, b, Long64VectorTests::gather);
     }
     static long[] gatherMasked(long a[], int ix, boolean[] mask, int[] b, int iy) {
         long[] res = new long[SPECIES.length()];
@@ -4654,7 +4654,7 @@ static void gatherMaskedLong64VectorTests(IntFunction<long[]> fa, BiFunction<Int
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::gatherMasked);
     }
 
     static long[] scatter(long a[], int ix, int[] b, int iy) {
@@ -4679,7 +4679,7 @@ static void scatterLong64VectorTests(IntFunction<long[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, Long64VectorTests::scatter);
+        assertArraysEquals(r, a, b, Long64VectorTests::scatter);
     }
 
     static long[] scatterMasked(long r[], long a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4717,7 +4717,7 @@ static void scatterMaskedLong64VectorTests(IntFunction<long[]> fa, IntFunction<l
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Long64VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Long64VectorTests::scatterMasked);
     }
 
 
@@ -4759,8 +4759,8 @@ static void toIntArrayLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4770,8 +4770,8 @@ static void toLongArrayLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4781,8 +4781,8 @@ static void toDoubleArrayLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4831,7 +4831,7 @@ static void ADDReduceLongLong64VectorTests(IntFunction<long[]> fa) {
             ra += r[i];
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Long64VectorTests::ADDReduce, Long64VectorTests::ADDReduceAll);
     }
 
@@ -4853,7 +4853,7 @@ static void ADDReduceLongLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunc
             ra += r[i];
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Long64VectorTests::ADDReduceMasked, Long64VectorTests::ADDReduceAllMasked);
     }
 
@@ -4870,7 +4870,7 @@ static void SelectFromLong64VectorTests(IntFunction<long[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
@@ -4889,7 +4889,7 @@ static void SelectFromLong64VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4966,7 +4966,7 @@ static void maskEqLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunct
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Long64VectorTests::beq);
+        assertArraysEquals(r, a, b, Long64VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java
index a48bd7452d70d..4f092652734c0 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,47 +67,25 @@ static VectorShape getMaxBit() {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (Max / 8));
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (long) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(long[] a, long[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (long) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -410,7 +388,7 @@ static void loadStoreArray(IntFunction<long[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -481,7 +459,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new long[a.length];
@@ -492,7 +470,7 @@ static void loadStoreMaskArray(IntFunction<long[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longMaskProviderForIOOBE")
@@ -565,7 +543,7 @@ static void loadStoreMask(IntFunction<long[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -589,7 +567,7 @@ static void loadStoreByteBuffer(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -676,7 +654,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -691,7 +669,7 @@ static void loadStoreByteBufferMask(IntFunction<long[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -807,7 +785,7 @@ static void loadStoreByteArray(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "longByteProviderForIOOBE")
@@ -888,7 +866,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -899,7 +877,7 @@ static void loadStoreByteArrayMask(IntFunction<long[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "longByteMaskProviderForIOOBE")
@@ -976,7 +954,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -987,7 +965,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
index 9c878b3529ef6..364ae80ddc50a 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ interface FUnOp {
         long apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -88,7 +88,7 @@ interface FUnArrayOp {
         long[] apply(long a);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -98,13 +98,13 @@ static void assertArraysEquals(long[] a, long[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(long[] r, long[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -123,17 +123,17 @@ interface FReductionAllOp {
         long apply(long[] a);
     }
 
-    static void assertReductionArraysEquals(long[] a, long[] b, long c,
+    static void assertReductionArraysEquals(long[] r, long rc, long[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -145,17 +145,17 @@ interface FReductionAllMaskedOp {
         long apply(long[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(long[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(long[] r, long rc, long[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -164,37 +164,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(long[] a, long[] b, long element, int index) {
+    static void assertInsertArraysEquals(long[] r, long[] a, long element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -208,7 +208,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, int vec
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -222,7 +222,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, int v
         }
     }
 
-    static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(long[] r, long[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -242,7 +242,7 @@ static void assertRearrangeArraysEquals(long[] a, long[] r, int[] order, boolean
         }
     }
 
-    static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(long[] r, long[] a, long[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -262,7 +262,7 @@ static void assertSelectFromArraysEquals(long[] a, long[] r, long[] order, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(long[]a, long[]r) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -291,7 +291,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -302,7 +302,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -314,7 +314,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, FBinOp f)
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -326,11 +326,11 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, FBinOp
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -341,11 +341,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBi
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -359,11 +359,11 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -377,7 +377,7 @@ static void assertBroadcastLongArraysEquals(long[] a, long[] b, long[] r, boolea
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -391,11 +391,11 @@ static void assertShiftArraysEquals(long[] a, long[] b, long[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(long[] a, long[] b, long[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -421,7 +421,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -432,11 +432,11 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f
         }
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -448,7 +448,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -461,7 +461,7 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -474,12 +474,12 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -495,12 +495,12 @@ static void assertBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r,
         }
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -516,7 +516,7 @@ static void assertAltBroadcastArraysEquals(long[] a, long[] b, long[] c, long[]
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -531,12 +531,12 @@ static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(long[] a, long[] b, long[] c, long[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(long[] r, long[] a, long[] b, long[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -559,7 +559,7 @@ interface FBinArrayOp {
         long apply(long[] a, int b);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, FBinArrayOp f) {
+    static void assertArraysEquals(long[] r, long[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -574,7 +574,7 @@ interface FGatherScatterOp {
         long[] apply(long[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -601,7 +601,7 @@ interface FScatterMaskedOp {
         long[] apply(long[] r, long[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -611,7 +611,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -622,7 +622,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FGat
         }
     }
 
-    static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -632,7 +632,7 @@ static void assertArraysEquals(long[] a, int[] b, long[] r, boolean[] mask, FSca
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -649,7 +649,7 @@ interface FLaneOp {
         long[] apply(long[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(long[] r, long[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -659,7 +659,7 @@ static void assertArraysEquals(long[] a, long[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -669,7 +669,7 @@ interface FLaneBop {
         long[] apply(long[] a, long[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -679,7 +679,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, FLaneBo
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -690,7 +690,7 @@ interface FLaneMaskedBop {
         long[] apply(long[] a, long[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -700,7 +700,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, boolean
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -711,7 +711,7 @@ interface FLanePartBop {
         long[] apply(long[] a, long[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -721,7 +721,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -733,7 +733,7 @@ interface FLanePartMaskedBop {
         long[] apply(long[] a, long[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(long[] r, long[] a, long[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -743,7 +743,7 @@ static void assertArraysEquals(long[] a, long[] b, long[] r, int origin, int par
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -785,7 +785,7 @@ static int intCornerCaseValue(int i) {
             })
     );
 
-    static void assertArraysEquals(long[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -798,7 +798,7 @@ static void assertArraysEquals(long[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(long[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -809,7 +809,7 @@ static void assertArraysEquals(long[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(long[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, long[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1280,7 +1280,7 @@ static void ADDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::ADD);
     }
     static long add(long a, long b) {
         return (long)(a + b);
@@ -1298,7 +1298,7 @@ static void addLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::add);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1318,7 +1318,7 @@ static void ADDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1336,7 +1336,7 @@ static void addLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::add);
     }
     static long SUB(long a, long b) {
         return (long)(a - b);
@@ -1356,7 +1356,7 @@ static void SUBLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::SUB);
     }
     static long sub(long a, long b) {
         return (long)(a - b);
@@ -1374,7 +1374,7 @@ static void subLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1394,7 +1394,7 @@ static void SUBLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1412,7 +1412,7 @@ static void subLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::sub);
     }
     static long MUL(long a, long b) {
         return (long)(a * b);
@@ -1432,7 +1432,7 @@ static void MULLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::MUL);
     }
     static long mul(long a, long b) {
         return (long)(a * b);
@@ -1450,7 +1450,7 @@ static void mulLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1470,7 +1470,7 @@ static void MULLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1488,7 +1488,7 @@ static void mulLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::mul);
     }
 
 
@@ -1513,7 +1513,7 @@ static void DIVLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::DIV);
     }
     static long div(long a, long b) {
         return (long)(a / b);
@@ -1535,7 +1535,7 @@ static void divLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::div);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::div);
     }
 
 
@@ -1559,7 +1559,7 @@ static void DIVLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1581,7 +1581,7 @@ static void divLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1602,7 +1602,7 @@ static void FIRST_NONZEROLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1622,7 +1622,7 @@ static void FIRST_NONZEROLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1643,7 +1643,7 @@ static void ANDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::AND);
     }
     static long and(long a, long b) {
         return (long)(a & b);
@@ -1661,7 +1661,7 @@ static void andLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::and);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::and);
     }
 
 
@@ -1683,7 +1683,7 @@ static void ANDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::AND);
     }
 
 
@@ -1705,7 +1705,7 @@ static void AND_NOTLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::AND_NOT);
     }
 
 
@@ -1727,7 +1727,7 @@ static void AND_NOTLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::AND_NOT);
     }
 
 
@@ -1749,7 +1749,7 @@ static void ORLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::OR);
     }
     static long or(long a, long b) {
         return (long)(a | b);
@@ -1767,7 +1767,7 @@ static void orLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb)
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::or);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::or);
     }
 
 
@@ -1789,7 +1789,7 @@ static void ORLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::OR);
     }
 
 
@@ -1811,7 +1811,7 @@ static void XORLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::XOR);
     }
 
 
@@ -1833,7 +1833,7 @@ static void XORLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::XOR);
     }
 
 
@@ -1848,7 +1848,7 @@ static void addLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1865,7 +1865,7 @@ static void addLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, LongMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1879,7 +1879,7 @@ static void subLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1896,7 +1896,7 @@ static void subLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, LongMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1910,7 +1910,7 @@ static void mulLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -1927,7 +1927,7 @@ static void mulLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, LongMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::mul);
     }
 
 
@@ -1946,7 +1946,7 @@ static void divLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::div);
     }
 
 
@@ -1967,7 +1967,7 @@ static void divLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, LongMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::div);
     }
 
 
@@ -1983,7 +1983,7 @@ static void ORLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -1997,7 +1997,7 @@ static void orLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFu
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::or);
     }
 
 
@@ -2016,7 +2016,7 @@ static void ORLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, LongMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::OR);
     }
 
 
@@ -2032,7 +2032,7 @@ static void ANDLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2046,7 +2046,7 @@ static void andLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::and);
     }
 
 
@@ -2065,7 +2065,7 @@ static void ANDLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, LongMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::AND);
     }
 
 
@@ -2081,7 +2081,7 @@ static void ORLongMaxVectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, I
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, LongMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, LongMaxVectorTests::OR);
     }
 
 
@@ -2100,7 +2100,7 @@ static void ORLongMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]>
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, LongMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongMaxVectorTests::OR);
     }
 
 
@@ -2115,7 +2115,7 @@ static void ADDLongMaxVectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, LongMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, LongMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
@@ -2132,7 +2132,7 @@ static void ADDLongMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, LongMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongMaxVectorTests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2153,7 +2153,7 @@ static void LSHLLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::LSHL);
     }
 
 
@@ -2175,7 +2175,7 @@ static void LSHLLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHL);
     }
 
 
@@ -2201,7 +2201,7 @@ static void ASHRLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::ASHR);
     }
 
 
@@ -2223,7 +2223,7 @@ static void ASHRLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::ASHR);
     }
 
 
@@ -2249,7 +2249,7 @@ static void LSHRLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::LSHR);
     }
 
 
@@ -2271,7 +2271,7 @@ static void LSHRLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<lon
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHR);
     }
 
 
@@ -2296,7 +2296,7 @@ static void LSHLLongMaxVectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, LongMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2317,7 +2317,7 @@ static void LSHLLongMaxVectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, LongMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2342,7 +2342,7 @@ static void LSHRLongMaxVectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, LongMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2363,7 +2363,7 @@ static void LSHRLongMaxVectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, LongMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2388,7 +2388,7 @@ static void ASHRLongMaxVectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, LongMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::ASHR_unary);
     }
 
 
@@ -2409,7 +2409,7 @@ static void ASHRLongMaxVectorTestsShift(IntFunction<long[]> fa, IntFunction<long
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, LongMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::ASHR_unary);
     }
 
 
@@ -2434,7 +2434,7 @@ static void MINLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::MIN);
     }
     static long min(long a, long b) {
         return (long)(Math.min(a, b));
@@ -2452,7 +2452,7 @@ static void minLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::min);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::min);
     }
     static long MAX(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2472,7 +2472,7 @@ static void MAXLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::MAX);
     }
     static long max(long a, long b) {
         return (long)(Math.max(a, b));
@@ -2490,7 +2490,7 @@ static void maxLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::max);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::max);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2504,7 +2504,7 @@ static void MINLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2518,7 +2518,7 @@ static void minLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2532,7 +2532,7 @@ static void MAXLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
@@ -2546,7 +2546,7 @@ static void maxLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntF
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, LongMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::max);
     }
 
     static long ANDReduce(long[] a, int idx) {
@@ -2589,7 +2589,7 @@ static void ANDReduceLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::ANDReduce, LongMaxVectorTests::ANDReduceAll);
     }
 
@@ -2637,7 +2637,7 @@ static void ANDReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::ANDReduceMasked, LongMaxVectorTests::ANDReduceAllMasked);
     }
 
@@ -2682,7 +2682,7 @@ static void ORReduceLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::ORReduce, LongMaxVectorTests::ORReduceAll);
     }
 
@@ -2730,7 +2730,7 @@ static void ORReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::ORReduceMasked, LongMaxVectorTests::ORReduceAllMasked);
     }
 
@@ -2775,7 +2775,7 @@ static void XORReduceLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::XORReduce, LongMaxVectorTests::XORReduceAll);
     }
 
@@ -2823,7 +2823,7 @@ static void XORReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::XORReduceMasked, LongMaxVectorTests::XORReduceAllMasked);
     }
 
@@ -2865,7 +2865,7 @@ static void ADDReduceLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::ADDReduce, LongMaxVectorTests::ADDReduceAll);
     }
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2909,7 +2909,7 @@ static void ADDReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::ADDReduceMasked, LongMaxVectorTests::ADDReduceAllMasked);
     }
     static long MULReduce(long[] a, int idx) {
@@ -2950,7 +2950,7 @@ static void MULReduceLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::MULReduce, LongMaxVectorTests::MULReduceAll);
     }
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -2994,7 +2994,7 @@ static void MULReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::MULReduceMasked, LongMaxVectorTests::MULReduceAllMasked);
     }
     static long MINReduce(long[] a, int idx) {
@@ -3035,7 +3035,7 @@ static void MINReduceLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::MINReduce, LongMaxVectorTests::MINReduceAll);
     }
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3080,7 +3080,7 @@ static void MINReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::MINReduceMasked, LongMaxVectorTests::MINReduceAllMasked);
     }
     static long MAXReduce(long[] a, int idx) {
@@ -3121,7 +3121,7 @@ static void MAXReduceLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::MAXReduce, LongMaxVectorTests::MAXReduceAll);
     }
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
@@ -3166,7 +3166,7 @@ static void MAXReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::MAXReduceMasked, LongMaxVectorTests::MAXReduceAllMasked);
     }
 
@@ -3192,7 +3192,7 @@ static void anyTrueLongMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, LongMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, LongMaxVectorTests::anyTrue);
     }
 
 
@@ -3218,7 +3218,7 @@ static void allTrueLongMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, LongMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, LongMaxVectorTests::allTrue);
     }
 
 
@@ -3234,7 +3234,7 @@ static void withLongMaxVectorTests(IntFunction<long []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (long)4, 0);
+        assertInsertArraysEquals(r, a, (long)4, 0);
     }
     static boolean testIS_DEFAULT(long a) {
         return bits(a)==0;
@@ -3711,7 +3711,7 @@ static void blendLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]>
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
@@ -3728,7 +3728,7 @@ static void RearrangeLongMaxVectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
@@ -3746,7 +3746,7 @@ static void RearrangeLongMaxVectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "longUnaryOpProvider")
     static void getLongMaxVectorTests(IntFunction<long[]> fa) {
@@ -3901,7 +3901,7 @@ static void getLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::get);
+        assertArraysEquals(r, a, LongMaxVectorTests::get);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -3915,7 +3915,7 @@ static void BroadcastLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -3962,7 +3962,7 @@ static void sliceUnaryLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, LongMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, LongMaxVectorTests::sliceUnary);
     }
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -3991,7 +3991,7 @@ static void sliceBinaryLongMaxVectorTestsBinary(IntFunction<long[]> fa, IntFunct
             }
         }
 
-        assertArraysEquals(a, b, r, origin, LongMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, LongMaxVectorTests::sliceBinary);
     }
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4024,7 +4024,7 @@ static void sliceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<lo
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, LongMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, LongMaxVectorTests::slice);
     }
     static long[] unsliceUnary(long[] a, int origin, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4051,7 +4051,7 @@ static void unsliceUnaryLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, LongMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, LongMaxVectorTests::unsliceUnary);
     }
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4090,7 +4090,7 @@ static void unsliceBinaryLongMaxVectorTestsBinary(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, LongMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, LongMaxVectorTests::unsliceBinary);
     }
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
         long[] res = new long[SPECIES.length()];
@@ -4146,7 +4146,7 @@ static void unsliceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, LongMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, LongMaxVectorTests::unslice);
     }
 
 
@@ -4195,7 +4195,7 @@ static void BITWISE_BLENDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, c, r, LongMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4211,7 +4211,7 @@ static void bitwiseBlendLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<l
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, LongMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4234,7 +4234,7 @@ static void BITWISE_BLENDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4252,7 +4252,7 @@ static void BITWISE_BLENDLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, LongMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4267,7 +4267,7 @@ static void BITWISE_BLENDLongMaxVectorTestsAltBroadcastSmokeTest(IntFunction<lon
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, LongMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4281,7 +4281,7 @@ static void bitwiseBlendLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]>
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, LongMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
@@ -4296,7 +4296,7 @@ static void bitwiseBlendLongMaxVectorTestsAltBroadcastSmokeTest(IntFunction<long
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, LongMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4316,7 +4316,7 @@ static void BITWISE_BLENDLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
@@ -4335,7 +4335,7 @@ static void BITWISE_BLENDLongMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4353,7 +4353,7 @@ static void BITWISE_BLENDLongMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, LongMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "longTernaryOpProvider")
     static void bitwiseBlendLongMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
@@ -4367,7 +4367,7 @@ static void bitwiseBlendLongMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<l
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, LongMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4386,7 +4386,7 @@ static void BITWISE_BLENDLongMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4410,7 +4410,7 @@ static void NEGLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::NEG);
+        assertArraysEquals(r, a, LongMaxVectorTests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4425,7 +4425,7 @@ static void negLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::neg);
+        assertArraysEquals(r, a, LongMaxVectorTests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4443,7 +4443,7 @@ static void NEGMaskedLongMaxVectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, LongMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, LongMaxVectorTests::NEG);
     }
 
     static long ABS(long a) {
@@ -4466,7 +4466,7 @@ static void ABSLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::ABS);
+        assertArraysEquals(r, a, LongMaxVectorTests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4481,7 +4481,7 @@ static void absLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::abs);
+        assertArraysEquals(r, a, LongMaxVectorTests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
@@ -4499,7 +4499,7 @@ static void ABSMaskedLongMaxVectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, LongMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, LongMaxVectorTests::ABS);
     }
 
 
@@ -4525,7 +4525,7 @@ static void NOTLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::NOT);
+        assertArraysEquals(r, a, LongMaxVectorTests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
@@ -4540,7 +4540,7 @@ static void notLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::not);
+        assertArraysEquals(r, a, LongMaxVectorTests::not);
     }
 
 
@@ -4560,7 +4560,7 @@ static void NOTMaskedLongMaxVectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, LongMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, LongMaxVectorTests::NOT);
     }
 
 
@@ -4583,7 +4583,7 @@ static void ZOMOLongMaxVectorTests(IntFunction<long[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, LongMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, LongMaxVectorTests::ZOMO);
     }
 
 
@@ -4603,7 +4603,7 @@ static void ZOMOMaskedLongMaxVectorTests(IntFunction<long[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, LongMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, LongMaxVectorTests::ZOMO);
     }
 
 
@@ -4631,7 +4631,7 @@ static void gatherLongMaxVectorTests(IntFunction<long[]> fa, BiFunction<Integer,
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::gather);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::gather);
     }
     static long[] gatherMasked(long a[], int ix, boolean[] mask, int[] b, int iy) {
         long[] res = new long[SPECIES.length()];
@@ -4659,7 +4659,7 @@ static void gatherMaskedLongMaxVectorTests(IntFunction<long[]> fa, BiFunction<In
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::gatherMasked);
     }
 
     static long[] scatter(long a[], int ix, int[] b, int iy) {
@@ -4684,7 +4684,7 @@ static void scatterLongMaxVectorTests(IntFunction<long[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, LongMaxVectorTests::scatter);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::scatter);
     }
 
     static long[] scatterMasked(long r[], long a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4722,7 +4722,7 @@ static void scatterMaskedLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, LongMaxVectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::scatterMasked);
     }
 
 
@@ -4764,8 +4764,8 @@ static void toIntArrayLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4775,8 +4775,8 @@ static void toLongArrayLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4786,8 +4786,8 @@ static void toDoubleArrayLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             LongVector av = LongVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4836,7 +4836,7 @@ static void ADDReduceLongLongMaxVectorTests(IntFunction<long[]> fa) {
             ra += r[i];
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 LongMaxVectorTests::ADDReduce, LongMaxVectorTests::ADDReduceAll);
     }
 
@@ -4858,7 +4858,7 @@ static void ADDReduceLongLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFun
             ra += r[i];
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 LongMaxVectorTests::ADDReduceMasked, LongMaxVectorTests::ADDReduceAllMasked);
     }
 
@@ -4875,7 +4875,7 @@ static void SelectFromLongMaxVectorTests(IntFunction<long[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
@@ -4894,7 +4894,7 @@ static void SelectFromLongMaxVectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -4971,7 +4971,7 @@ static void maskEqLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, LongMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, LongMaxVectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java
index f0455261a4158..0b723fd38270d 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Short128VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (128 / 8));
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(short[] a, short[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<short[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new short[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<short[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorTests.java b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
index df4ca39096838..91f3e215759ea 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         short apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         short[] apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         short apply(short[] a);
     }
 
-    static void assertReductionArraysEquals(short[] a, short[] b, short c,
+    static void assertReductionArraysEquals(short[] r, short rc, short[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         short apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(short[] a, short[] b, short c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(short[] r, short rc, short[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(short[] a);
     }
 
-    static void assertReductionLongArraysEquals(short[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, short[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(short[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, short[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(short[] a, short[] b, short element, int index) {
+    static void assertInsertArraysEquals(short[] r, short[] a, short element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(short[]a, short[]r) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBi
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTern
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, s
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         short apply(short[] a, int b);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FBinArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         short[] apply(short[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         short[] apply(short[] r, short[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         short[] apply(short[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         short[] apply(short[] a, short[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLan
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         short[] apply(short[] a, short[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, bool
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         short[] apply(short[] a, short[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         short[] apply(short[] a, short[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
     }
 
 
-    static void assertArraysEquals(short[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(short[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(short[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(short[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(short[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1278,7 +1278,7 @@ static void ADDShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::ADD);
+        assertArraysEquals(r, a, b, Short128VectorTests::ADD);
     }
     static short add(short a, short b) {
         return (short)(a + b);
@@ -1296,7 +1296,7 @@ static void addShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::add);
+        assertArraysEquals(r, a, b, Short128VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1316,7 +1316,7 @@ static void ADDShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1334,7 +1334,7 @@ static void addShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::add);
     }
     static short SUB(short a, short b) {
         return (short)(a - b);
@@ -1354,7 +1354,7 @@ static void SUBShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::SUB);
+        assertArraysEquals(r, a, b, Short128VectorTests::SUB);
     }
     static short sub(short a, short b) {
         return (short)(a - b);
@@ -1372,7 +1372,7 @@ static void subShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::sub);
+        assertArraysEquals(r, a, b, Short128VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1392,7 +1392,7 @@ static void SUBShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1410,7 +1410,7 @@ static void subShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::sub);
     }
     static short MUL(short a, short b) {
         return (short)(a * b);
@@ -1430,7 +1430,7 @@ static void MULShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::MUL);
+        assertArraysEquals(r, a, b, Short128VectorTests::MUL);
     }
     static short mul(short a, short b) {
         return (short)(a * b);
@@ -1448,7 +1448,7 @@ static void mulShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::mul);
+        assertArraysEquals(r, a, b, Short128VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1468,7 +1468,7 @@ static void MULShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1486,7 +1486,7 @@ static void mulShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::mul);
     }
 
 
@@ -1511,7 +1511,7 @@ static void DIVShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::DIV);
+        assertArraysEquals(r, a, b, Short128VectorTests::DIV);
     }
     static short div(short a, short b) {
         return (short)(a / b);
@@ -1533,7 +1533,7 @@ static void divShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::div);
+        assertArraysEquals(r, a, b, Short128VectorTests::div);
     }
 
 
@@ -1557,7 +1557,7 @@ static void DIVShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1579,7 +1579,7 @@ static void divShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1600,7 +1600,7 @@ static void FIRST_NONZEROShort128VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Short128VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1620,7 +1620,7 @@ static void FIRST_NONZEROShort128VectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -1641,7 +1641,7 @@ static void ANDShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::AND);
+        assertArraysEquals(r, a, b, Short128VectorTests::AND);
     }
     static short and(short a, short b) {
         return (short)(a & b);
@@ -1659,7 +1659,7 @@ static void andShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::and);
+        assertArraysEquals(r, a, b, Short128VectorTests::and);
     }
 
 
@@ -1681,7 +1681,7 @@ static void ANDShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::AND);
     }
 
 
@@ -1703,7 +1703,7 @@ static void AND_NOTShort128VectorTests(IntFunction<short[]> fa, IntFunction<shor
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Short128VectorTests::AND_NOT);
     }
 
 
@@ -1725,7 +1725,7 @@ static void AND_NOTShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::AND_NOT);
     }
 
 
@@ -1747,7 +1747,7 @@ static void ORShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::OR);
+        assertArraysEquals(r, a, b, Short128VectorTests::OR);
     }
     static short or(short a, short b) {
         return (short)(a | b);
@@ -1765,7 +1765,7 @@ static void orShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::or);
+        assertArraysEquals(r, a, b, Short128VectorTests::or);
     }
 
 
@@ -1787,7 +1787,7 @@ static void ORShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::OR);
     }
 
 
@@ -1809,7 +1809,7 @@ static void XORShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::XOR);
+        assertArraysEquals(r, a, b, Short128VectorTests::XOR);
     }
 
 
@@ -1831,7 +1831,7 @@ static void XORShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::XOR);
     }
 
 
@@ -1846,7 +1846,7 @@ static void addShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1863,7 +1863,7 @@ static void addShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1877,7 +1877,7 @@ static void subShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1894,7 +1894,7 @@ static void subShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1908,7 +1908,7 @@ static void mulShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1925,7 +1925,7 @@ static void mulShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::mul);
     }
 
 
@@ -1944,7 +1944,7 @@ static void divShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::div);
     }
 
 
@@ -1965,7 +1965,7 @@ static void divShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::div);
     }
 
 
@@ -1981,7 +1981,7 @@ static void ORShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1995,7 +1995,7 @@ static void orShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::or);
     }
 
 
@@ -2014,7 +2014,7 @@ static void ORShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::OR);
     }
 
 
@@ -2030,7 +2030,7 @@ static void ANDShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2044,7 +2044,7 @@ static void andShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::and);
     }
 
 
@@ -2063,7 +2063,7 @@ static void ANDShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::AND);
     }
 
 
@@ -2079,7 +2079,7 @@ static void ORShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa,
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Short128VectorTests::OR);
     }
 
 
@@ -2098,7 +2098,7 @@ static void ORShort128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short128VectorTests::OR);
     }
 
 
@@ -2113,7 +2113,7 @@ static void ADDShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Short128VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -2130,7 +2130,7 @@ static void ADDShort128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short128VectorTests::ADD);
     }
 
 
@@ -2155,7 +2155,7 @@ static void LSHLShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Short128VectorTests::LSHL);
     }
 
 
@@ -2177,7 +2177,7 @@ static void LSHLShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::LSHL);
     }
 
 
@@ -2203,7 +2203,7 @@ static void ASHRShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Short128VectorTests::ASHR);
     }
 
 
@@ -2225,7 +2225,7 @@ static void ASHRShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::ASHR);
     }
 
 
@@ -2251,7 +2251,7 @@ static void LSHRShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Short128VectorTests::LSHR);
     }
 
 
@@ -2273,7 +2273,7 @@ static void LSHRShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::LSHR);
     }
 
 
@@ -2298,7 +2298,7 @@ static void LSHLShort128VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Short128VectorTests::LSHL_unary);
     }
 
 
@@ -2319,7 +2319,7 @@ static void LSHLShort128VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::LSHL_unary);
     }
 
 
@@ -2344,7 +2344,7 @@ static void LSHRShort128VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Short128VectorTests::LSHR_unary);
     }
 
 
@@ -2365,7 +2365,7 @@ static void LSHRShort128VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::LSHR_unary);
     }
 
 
@@ -2390,7 +2390,7 @@ static void ASHRShort128VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Short128VectorTests::ASHR_unary);
     }
 
 
@@ -2411,7 +2411,7 @@ static void ASHRShort128VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::ASHR_unary);
     }
 
     static short MIN(short a, short b) {
@@ -2432,7 +2432,7 @@ static void MINShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::MIN);
+        assertArraysEquals(r, a, b, Short128VectorTests::MIN);
     }
     static short min(short a, short b) {
         return (short)(Math.min(a, b));
@@ -2450,7 +2450,7 @@ static void minShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::min);
+        assertArraysEquals(r, a, b, Short128VectorTests::min);
     }
     static short MAX(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2470,7 +2470,7 @@ static void MAXShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::MAX);
+        assertArraysEquals(r, a, b, Short128VectorTests::MAX);
     }
     static short max(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2488,7 +2488,7 @@ static void maxShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::max);
+        assertArraysEquals(r, a, b, Short128VectorTests::max);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2502,7 +2502,7 @@ static void MINShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2516,7 +2516,7 @@ static void minShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2530,7 +2530,7 @@ static void MAXShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2544,7 +2544,7 @@ static void maxShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::max);
     }
 
     static short ANDReduce(short[] a, int idx) {
@@ -2587,7 +2587,7 @@ static void ANDReduceShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short128VectorTests::ANDReduce, Short128VectorTests::ANDReduceAll);
     }
 
@@ -2635,7 +2635,7 @@ static void ANDReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::ANDReduceMasked, Short128VectorTests::ANDReduceAllMasked);
     }
 
@@ -2680,7 +2680,7 @@ static void ORReduceShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short128VectorTests::ORReduce, Short128VectorTests::ORReduceAll);
     }
 
@@ -2728,7 +2728,7 @@ static void ORReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::ORReduceMasked, Short128VectorTests::ORReduceAllMasked);
     }
 
@@ -2773,7 +2773,7 @@ static void XORReduceShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short128VectorTests::XORReduce, Short128VectorTests::XORReduceAll);
     }
 
@@ -2821,7 +2821,7 @@ static void XORReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::XORReduceMasked, Short128VectorTests::XORReduceAllMasked);
     }
 
@@ -2863,7 +2863,7 @@ static void ADDReduceShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short128VectorTests::ADDReduce, Short128VectorTests::ADDReduceAll);
     }
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2907,7 +2907,7 @@ static void ADDReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::ADDReduceMasked, Short128VectorTests::ADDReduceAllMasked);
     }
     static short MULReduce(short[] a, int idx) {
@@ -2948,7 +2948,7 @@ static void MULReduceShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short128VectorTests::MULReduce, Short128VectorTests::MULReduceAll);
     }
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2992,7 +2992,7 @@ static void MULReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::MULReduceMasked, Short128VectorTests::MULReduceAllMasked);
     }
     static short MINReduce(short[] a, int idx) {
@@ -3033,7 +3033,7 @@ static void MINReduceShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short128VectorTests::MINReduce, Short128VectorTests::MINReduceAll);
     }
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3078,7 +3078,7 @@ static void MINReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::MINReduceMasked, Short128VectorTests::MINReduceAllMasked);
     }
     static short MAXReduce(short[] a, int idx) {
@@ -3119,7 +3119,7 @@ static void MAXReduceShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short128VectorTests::MAXReduce, Short128VectorTests::MAXReduceAll);
     }
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3164,7 +3164,7 @@ static void MAXReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::MAXReduceMasked, Short128VectorTests::MAXReduceAllMasked);
     }
 
@@ -3190,7 +3190,7 @@ static void anyTrueShort128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Short128VectorTests::anyTrue);
     }
 
 
@@ -3216,7 +3216,7 @@ static void allTrueShort128VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Short128VectorTests::allTrue);
     }
 
 
@@ -3232,7 +3232,7 @@ static void withShort128VectorTests(IntFunction<short []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (short)4, 0);
+        assertInsertArraysEquals(r, a, (short)4, 0);
     }
     static boolean testIS_DEFAULT(short a) {
         return bits(a)==0;
@@ -3781,7 +3781,7 @@ static void blendShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
@@ -3798,7 +3798,7 @@ static void RearrangeShort128VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
@@ -3816,7 +3816,7 @@ static void RearrangeShort128VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "shortUnaryOpProvider")
     static void getShort128VectorTests(IntFunction<short[]> fa) {
@@ -3971,7 +3971,7 @@ static void getShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::get);
+        assertArraysEquals(r, a, Short128VectorTests::get);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -3985,7 +3985,7 @@ static void BroadcastShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4032,7 +4032,7 @@ static void sliceUnaryShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Short128VectorTests::sliceUnary);
     }
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4061,7 +4061,7 @@ static void sliceBinaryShort128VectorTestsBinary(IntFunction<short[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Short128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Short128VectorTests::sliceBinary);
     }
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4094,7 +4094,7 @@ static void sliceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Short128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Short128VectorTests::slice);
     }
     static short[] unsliceUnary(short[] a, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4121,7 +4121,7 @@ static void unsliceUnaryShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Short128VectorTests::unsliceUnary);
     }
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4160,7 +4160,7 @@ static void unsliceBinaryShort128VectorTestsBinary(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Short128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Short128VectorTests::unsliceBinary);
     }
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4216,7 +4216,7 @@ static void unsliceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Short128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Short128VectorTests::unslice);
     }
 
 
@@ -4265,7 +4265,7 @@ static void BITWISE_BLENDShort128VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, c, r, Short128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4281,7 +4281,7 @@ static void bitwiseBlendShort128VectorTests(IntFunction<short[]> fa, IntFunction
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Short128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
     }
 
 
@@ -4304,7 +4304,7 @@ static void BITWISE_BLENDShort128VectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Short128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4322,7 +4322,7 @@ static void BITWISE_BLENDShort128VectorTestsBroadcastSmokeTest(IntFunction<short
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4337,7 +4337,7 @@ static void BITWISE_BLENDShort128VectorTestsAltBroadcastSmokeTest(IntFunction<sh
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4351,7 +4351,7 @@ static void bitwiseBlendShort128VectorTestsBroadcastSmokeTest(IntFunction<short[
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4366,7 +4366,7 @@ static void bitwiseBlendShort128VectorTestsAltBroadcastSmokeTest(IntFunction<sho
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
     }
 
 
@@ -4386,7 +4386,7 @@ static void BITWISE_BLENDShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Short128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
@@ -4405,7 +4405,7 @@ static void BITWISE_BLENDShort128VectorTestsAltBroadcastMaskedSmokeTest(IntFunct
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Short128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4423,7 +4423,7 @@ static void BITWISE_BLENDShort128VectorTestsDoubleBroadcastSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort128VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4437,7 +4437,7 @@ static void bitwiseBlendShort128VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
     }
 
 
@@ -4456,7 +4456,7 @@ static void BITWISE_BLENDShort128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFu
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Short128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4480,7 +4480,7 @@ static void NEGShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::NEG);
+        assertArraysEquals(r, a, Short128VectorTests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4495,7 +4495,7 @@ static void negShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::neg);
+        assertArraysEquals(r, a, Short128VectorTests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4513,7 +4513,7 @@ static void NEGMaskedShort128VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Short128VectorTests::NEG);
     }
 
     static short ABS(short a) {
@@ -4536,7 +4536,7 @@ static void ABSShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::ABS);
+        assertArraysEquals(r, a, Short128VectorTests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4551,7 +4551,7 @@ static void absShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::abs);
+        assertArraysEquals(r, a, Short128VectorTests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4569,7 +4569,7 @@ static void ABSMaskedShort128VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Short128VectorTests::ABS);
     }
 
 
@@ -4595,7 +4595,7 @@ static void NOTShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::NOT);
+        assertArraysEquals(r, a, Short128VectorTests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4610,7 +4610,7 @@ static void notShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::not);
+        assertArraysEquals(r, a, Short128VectorTests::not);
     }
 
 
@@ -4630,7 +4630,7 @@ static void NOTMaskedShort128VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Short128VectorTests::NOT);
     }
 
 
@@ -4653,7 +4653,7 @@ static void ZOMOShort128VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short128VectorTests::ZOMO);
+        assertArraysEquals(r, a, Short128VectorTests::ZOMO);
     }
 
 
@@ -4673,7 +4673,7 @@ static void ZOMOMaskedShort128VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Short128VectorTests::ZOMO);
     }
 
 
@@ -4701,7 +4701,7 @@ static void gatherShort128VectorTests(IntFunction<short[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::gather);
+        assertArraysEquals(r, a, b, Short128VectorTests::gather);
     }
     static short[] gatherMasked(short a[], int ix, boolean[] mask, int[] b, int iy) {
         short[] res = new short[SPECIES.length()];
@@ -4729,7 +4729,7 @@ static void gatherMaskedShort128VectorTests(IntFunction<short[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::gatherMasked);
     }
 
     static short[] scatter(short a[], int ix, int[] b, int iy) {
@@ -4754,7 +4754,7 @@ static void scatterShort128VectorTests(IntFunction<short[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, Short128VectorTests::scatter);
+        assertArraysEquals(r, a, b, Short128VectorTests::scatter);
     }
 
     static short[] scatterMasked(short r[], short a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4792,7 +4792,7 @@ static void scatterMaskedShort128VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short128VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Short128VectorTests::scatterMasked);
     }
 
 
@@ -4834,8 +4834,8 @@ static void toIntArrayShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4845,8 +4845,8 @@ static void toLongArrayShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4856,8 +4856,8 @@ static void toDoubleArrayShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4923,7 +4923,7 @@ static void ADDReduceLongShort128VectorTests(IntFunction<short[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Short128VectorTests::ADDReduceLong, Short128VectorTests::ADDReduceAllLong);
     }
 
@@ -4964,7 +4964,7 @@ static void ADDReduceLongShort128VectorTestsMasked(IntFunction<short[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Short128VectorTests::ADDReduceLongMasked, Short128VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4976,7 +4976,7 @@ static void BroadcastLongShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -4994,7 +4994,7 @@ static void blendShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short128VectorTests::blend);
     }
 
 
@@ -5011,7 +5011,7 @@ static void SelectFromShort128VectorTests(IntFunction<short[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
@@ -5030,7 +5030,7 @@ static void SelectFromShort128VectorTestsMaskedSmokeTest(IntFunction<short[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5107,7 +5107,7 @@ static void maskEqShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Short128VectorTests::beq);
+        assertArraysEquals(r, a, b, Short128VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java
index 3828368c354de..567ae6c74864c 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Short256VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (256 / 8));
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(short[] a, short[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<short[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new short[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<short[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorTests.java b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
index 20b5ea4f7f55c..efbde094120bd 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         short apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         short[] apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         short apply(short[] a);
     }
 
-    static void assertReductionArraysEquals(short[] a, short[] b, short c,
+    static void assertReductionArraysEquals(short[] r, short rc, short[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         short apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(short[] a, short[] b, short c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(short[] r, short rc, short[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(short[] a);
     }
 
-    static void assertReductionLongArraysEquals(short[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, short[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(short[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, short[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(short[] a, short[] b, short element, int index) {
+    static void assertInsertArraysEquals(short[] r, short[] a, short element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(short[]a, short[]r) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBi
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTern
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, s
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         short apply(short[] a, int b);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FBinArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         short[] apply(short[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         short[] apply(short[] r, short[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         short[] apply(short[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         short[] apply(short[] a, short[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLan
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         short[] apply(short[] a, short[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, bool
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         short[] apply(short[] a, short[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         short[] apply(short[] a, short[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
     }
 
 
-    static void assertArraysEquals(short[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(short[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(short[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(short[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(short[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1278,7 +1278,7 @@ static void ADDShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::ADD);
+        assertArraysEquals(r, a, b, Short256VectorTests::ADD);
     }
     static short add(short a, short b) {
         return (short)(a + b);
@@ -1296,7 +1296,7 @@ static void addShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::add);
+        assertArraysEquals(r, a, b, Short256VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1316,7 +1316,7 @@ static void ADDShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1334,7 +1334,7 @@ static void addShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::add);
     }
     static short SUB(short a, short b) {
         return (short)(a - b);
@@ -1354,7 +1354,7 @@ static void SUBShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::SUB);
+        assertArraysEquals(r, a, b, Short256VectorTests::SUB);
     }
     static short sub(short a, short b) {
         return (short)(a - b);
@@ -1372,7 +1372,7 @@ static void subShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::sub);
+        assertArraysEquals(r, a, b, Short256VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1392,7 +1392,7 @@ static void SUBShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1410,7 +1410,7 @@ static void subShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::sub);
     }
     static short MUL(short a, short b) {
         return (short)(a * b);
@@ -1430,7 +1430,7 @@ static void MULShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::MUL);
+        assertArraysEquals(r, a, b, Short256VectorTests::MUL);
     }
     static short mul(short a, short b) {
         return (short)(a * b);
@@ -1448,7 +1448,7 @@ static void mulShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::mul);
+        assertArraysEquals(r, a, b, Short256VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1468,7 +1468,7 @@ static void MULShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1486,7 +1486,7 @@ static void mulShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::mul);
     }
 
 
@@ -1511,7 +1511,7 @@ static void DIVShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::DIV);
+        assertArraysEquals(r, a, b, Short256VectorTests::DIV);
     }
     static short div(short a, short b) {
         return (short)(a / b);
@@ -1533,7 +1533,7 @@ static void divShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::div);
+        assertArraysEquals(r, a, b, Short256VectorTests::div);
     }
 
 
@@ -1557,7 +1557,7 @@ static void DIVShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1579,7 +1579,7 @@ static void divShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1600,7 +1600,7 @@ static void FIRST_NONZEROShort256VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Short256VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1620,7 +1620,7 @@ static void FIRST_NONZEROShort256VectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -1641,7 +1641,7 @@ static void ANDShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::AND);
+        assertArraysEquals(r, a, b, Short256VectorTests::AND);
     }
     static short and(short a, short b) {
         return (short)(a & b);
@@ -1659,7 +1659,7 @@ static void andShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::and);
+        assertArraysEquals(r, a, b, Short256VectorTests::and);
     }
 
 
@@ -1681,7 +1681,7 @@ static void ANDShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::AND);
     }
 
 
@@ -1703,7 +1703,7 @@ static void AND_NOTShort256VectorTests(IntFunction<short[]> fa, IntFunction<shor
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Short256VectorTests::AND_NOT);
     }
 
 
@@ -1725,7 +1725,7 @@ static void AND_NOTShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::AND_NOT);
     }
 
 
@@ -1747,7 +1747,7 @@ static void ORShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::OR);
+        assertArraysEquals(r, a, b, Short256VectorTests::OR);
     }
     static short or(short a, short b) {
         return (short)(a | b);
@@ -1765,7 +1765,7 @@ static void orShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::or);
+        assertArraysEquals(r, a, b, Short256VectorTests::or);
     }
 
 
@@ -1787,7 +1787,7 @@ static void ORShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::OR);
     }
 
 
@@ -1809,7 +1809,7 @@ static void XORShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::XOR);
+        assertArraysEquals(r, a, b, Short256VectorTests::XOR);
     }
 
 
@@ -1831,7 +1831,7 @@ static void XORShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::XOR);
     }
 
 
@@ -1846,7 +1846,7 @@ static void addShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1863,7 +1863,7 @@ static void addShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1877,7 +1877,7 @@ static void subShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1894,7 +1894,7 @@ static void subShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1908,7 +1908,7 @@ static void mulShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1925,7 +1925,7 @@ static void mulShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::mul);
     }
 
 
@@ -1944,7 +1944,7 @@ static void divShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::div);
     }
 
 
@@ -1965,7 +1965,7 @@ static void divShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::div);
     }
 
 
@@ -1981,7 +1981,7 @@ static void ORShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1995,7 +1995,7 @@ static void orShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::or);
     }
 
 
@@ -2014,7 +2014,7 @@ static void ORShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::OR);
     }
 
 
@@ -2030,7 +2030,7 @@ static void ANDShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2044,7 +2044,7 @@ static void andShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::and);
     }
 
 
@@ -2063,7 +2063,7 @@ static void ANDShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::AND);
     }
 
 
@@ -2079,7 +2079,7 @@ static void ORShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa,
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Short256VectorTests::OR);
     }
 
 
@@ -2098,7 +2098,7 @@ static void ORShort256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short256VectorTests::OR);
     }
 
 
@@ -2113,7 +2113,7 @@ static void ADDShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Short256VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -2130,7 +2130,7 @@ static void ADDShort256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short256VectorTests::ADD);
     }
 
 
@@ -2155,7 +2155,7 @@ static void LSHLShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Short256VectorTests::LSHL);
     }
 
 
@@ -2177,7 +2177,7 @@ static void LSHLShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::LSHL);
     }
 
 
@@ -2203,7 +2203,7 @@ static void ASHRShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Short256VectorTests::ASHR);
     }
 
 
@@ -2225,7 +2225,7 @@ static void ASHRShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::ASHR);
     }
 
 
@@ -2251,7 +2251,7 @@ static void LSHRShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Short256VectorTests::LSHR);
     }
 
 
@@ -2273,7 +2273,7 @@ static void LSHRShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::LSHR);
     }
 
 
@@ -2298,7 +2298,7 @@ static void LSHLShort256VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Short256VectorTests::LSHL_unary);
     }
 
 
@@ -2319,7 +2319,7 @@ static void LSHLShort256VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::LSHL_unary);
     }
 
 
@@ -2344,7 +2344,7 @@ static void LSHRShort256VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Short256VectorTests::LSHR_unary);
     }
 
 
@@ -2365,7 +2365,7 @@ static void LSHRShort256VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::LSHR_unary);
     }
 
 
@@ -2390,7 +2390,7 @@ static void ASHRShort256VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Short256VectorTests::ASHR_unary);
     }
 
 
@@ -2411,7 +2411,7 @@ static void ASHRShort256VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::ASHR_unary);
     }
 
     static short MIN(short a, short b) {
@@ -2432,7 +2432,7 @@ static void MINShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::MIN);
+        assertArraysEquals(r, a, b, Short256VectorTests::MIN);
     }
     static short min(short a, short b) {
         return (short)(Math.min(a, b));
@@ -2450,7 +2450,7 @@ static void minShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::min);
+        assertArraysEquals(r, a, b, Short256VectorTests::min);
     }
     static short MAX(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2470,7 +2470,7 @@ static void MAXShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::MAX);
+        assertArraysEquals(r, a, b, Short256VectorTests::MAX);
     }
     static short max(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2488,7 +2488,7 @@ static void maxShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::max);
+        assertArraysEquals(r, a, b, Short256VectorTests::max);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2502,7 +2502,7 @@ static void MINShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2516,7 +2516,7 @@ static void minShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2530,7 +2530,7 @@ static void MAXShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2544,7 +2544,7 @@ static void maxShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::max);
     }
 
     static short ANDReduce(short[] a, int idx) {
@@ -2587,7 +2587,7 @@ static void ANDReduceShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short256VectorTests::ANDReduce, Short256VectorTests::ANDReduceAll);
     }
 
@@ -2635,7 +2635,7 @@ static void ANDReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::ANDReduceMasked, Short256VectorTests::ANDReduceAllMasked);
     }
 
@@ -2680,7 +2680,7 @@ static void ORReduceShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short256VectorTests::ORReduce, Short256VectorTests::ORReduceAll);
     }
 
@@ -2728,7 +2728,7 @@ static void ORReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::ORReduceMasked, Short256VectorTests::ORReduceAllMasked);
     }
 
@@ -2773,7 +2773,7 @@ static void XORReduceShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short256VectorTests::XORReduce, Short256VectorTests::XORReduceAll);
     }
 
@@ -2821,7 +2821,7 @@ static void XORReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::XORReduceMasked, Short256VectorTests::XORReduceAllMasked);
     }
 
@@ -2863,7 +2863,7 @@ static void ADDReduceShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short256VectorTests::ADDReduce, Short256VectorTests::ADDReduceAll);
     }
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2907,7 +2907,7 @@ static void ADDReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::ADDReduceMasked, Short256VectorTests::ADDReduceAllMasked);
     }
     static short MULReduce(short[] a, int idx) {
@@ -2948,7 +2948,7 @@ static void MULReduceShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short256VectorTests::MULReduce, Short256VectorTests::MULReduceAll);
     }
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2992,7 +2992,7 @@ static void MULReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::MULReduceMasked, Short256VectorTests::MULReduceAllMasked);
     }
     static short MINReduce(short[] a, int idx) {
@@ -3033,7 +3033,7 @@ static void MINReduceShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short256VectorTests::MINReduce, Short256VectorTests::MINReduceAll);
     }
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3078,7 +3078,7 @@ static void MINReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::MINReduceMasked, Short256VectorTests::MINReduceAllMasked);
     }
     static short MAXReduce(short[] a, int idx) {
@@ -3119,7 +3119,7 @@ static void MAXReduceShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short256VectorTests::MAXReduce, Short256VectorTests::MAXReduceAll);
     }
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3164,7 +3164,7 @@ static void MAXReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::MAXReduceMasked, Short256VectorTests::MAXReduceAllMasked);
     }
 
@@ -3190,7 +3190,7 @@ static void anyTrueShort256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Short256VectorTests::anyTrue);
     }
 
 
@@ -3216,7 +3216,7 @@ static void allTrueShort256VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Short256VectorTests::allTrue);
     }
 
 
@@ -3232,7 +3232,7 @@ static void withShort256VectorTests(IntFunction<short []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (short)4, 0);
+        assertInsertArraysEquals(r, a, (short)4, 0);
     }
     static boolean testIS_DEFAULT(short a) {
         return bits(a)==0;
@@ -3781,7 +3781,7 @@ static void blendShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
@@ -3798,7 +3798,7 @@ static void RearrangeShort256VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
@@ -3816,7 +3816,7 @@ static void RearrangeShort256VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "shortUnaryOpProvider")
     static void getShort256VectorTests(IntFunction<short[]> fa) {
@@ -3971,7 +3971,7 @@ static void getShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::get);
+        assertArraysEquals(r, a, Short256VectorTests::get);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -3985,7 +3985,7 @@ static void BroadcastShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4032,7 +4032,7 @@ static void sliceUnaryShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Short256VectorTests::sliceUnary);
     }
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4061,7 +4061,7 @@ static void sliceBinaryShort256VectorTestsBinary(IntFunction<short[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Short256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Short256VectorTests::sliceBinary);
     }
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4094,7 +4094,7 @@ static void sliceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Short256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Short256VectorTests::slice);
     }
     static short[] unsliceUnary(short[] a, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4121,7 +4121,7 @@ static void unsliceUnaryShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Short256VectorTests::unsliceUnary);
     }
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4160,7 +4160,7 @@ static void unsliceBinaryShort256VectorTestsBinary(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Short256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Short256VectorTests::unsliceBinary);
     }
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4216,7 +4216,7 @@ static void unsliceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Short256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Short256VectorTests::unslice);
     }
 
 
@@ -4265,7 +4265,7 @@ static void BITWISE_BLENDShort256VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, c, r, Short256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4281,7 +4281,7 @@ static void bitwiseBlendShort256VectorTests(IntFunction<short[]> fa, IntFunction
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Short256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
     }
 
 
@@ -4304,7 +4304,7 @@ static void BITWISE_BLENDShort256VectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Short256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4322,7 +4322,7 @@ static void BITWISE_BLENDShort256VectorTestsBroadcastSmokeTest(IntFunction<short
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4337,7 +4337,7 @@ static void BITWISE_BLENDShort256VectorTestsAltBroadcastSmokeTest(IntFunction<sh
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4351,7 +4351,7 @@ static void bitwiseBlendShort256VectorTestsBroadcastSmokeTest(IntFunction<short[
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4366,7 +4366,7 @@ static void bitwiseBlendShort256VectorTestsAltBroadcastSmokeTest(IntFunction<sho
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
     }
 
 
@@ -4386,7 +4386,7 @@ static void BITWISE_BLENDShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Short256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
@@ -4405,7 +4405,7 @@ static void BITWISE_BLENDShort256VectorTestsAltBroadcastMaskedSmokeTest(IntFunct
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Short256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4423,7 +4423,7 @@ static void BITWISE_BLENDShort256VectorTestsDoubleBroadcastSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort256VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4437,7 +4437,7 @@ static void bitwiseBlendShort256VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
     }
 
 
@@ -4456,7 +4456,7 @@ static void BITWISE_BLENDShort256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFu
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Short256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4480,7 +4480,7 @@ static void NEGShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::NEG);
+        assertArraysEquals(r, a, Short256VectorTests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4495,7 +4495,7 @@ static void negShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::neg);
+        assertArraysEquals(r, a, Short256VectorTests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4513,7 +4513,7 @@ static void NEGMaskedShort256VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Short256VectorTests::NEG);
     }
 
     static short ABS(short a) {
@@ -4536,7 +4536,7 @@ static void ABSShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::ABS);
+        assertArraysEquals(r, a, Short256VectorTests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4551,7 +4551,7 @@ static void absShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::abs);
+        assertArraysEquals(r, a, Short256VectorTests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4569,7 +4569,7 @@ static void ABSMaskedShort256VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Short256VectorTests::ABS);
     }
 
 
@@ -4595,7 +4595,7 @@ static void NOTShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::NOT);
+        assertArraysEquals(r, a, Short256VectorTests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4610,7 +4610,7 @@ static void notShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::not);
+        assertArraysEquals(r, a, Short256VectorTests::not);
     }
 
 
@@ -4630,7 +4630,7 @@ static void NOTMaskedShort256VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Short256VectorTests::NOT);
     }
 
 
@@ -4653,7 +4653,7 @@ static void ZOMOShort256VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short256VectorTests::ZOMO);
+        assertArraysEquals(r, a, Short256VectorTests::ZOMO);
     }
 
 
@@ -4673,7 +4673,7 @@ static void ZOMOMaskedShort256VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Short256VectorTests::ZOMO);
     }
 
 
@@ -4701,7 +4701,7 @@ static void gatherShort256VectorTests(IntFunction<short[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::gather);
+        assertArraysEquals(r, a, b, Short256VectorTests::gather);
     }
     static short[] gatherMasked(short a[], int ix, boolean[] mask, int[] b, int iy) {
         short[] res = new short[SPECIES.length()];
@@ -4729,7 +4729,7 @@ static void gatherMaskedShort256VectorTests(IntFunction<short[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::gatherMasked);
     }
 
     static short[] scatter(short a[], int ix, int[] b, int iy) {
@@ -4754,7 +4754,7 @@ static void scatterShort256VectorTests(IntFunction<short[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, Short256VectorTests::scatter);
+        assertArraysEquals(r, a, b, Short256VectorTests::scatter);
     }
 
     static short[] scatterMasked(short r[], short a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4792,7 +4792,7 @@ static void scatterMaskedShort256VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short256VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Short256VectorTests::scatterMasked);
     }
 
 
@@ -4834,8 +4834,8 @@ static void toIntArrayShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4845,8 +4845,8 @@ static void toLongArrayShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4856,8 +4856,8 @@ static void toDoubleArrayShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4923,7 +4923,7 @@ static void ADDReduceLongShort256VectorTests(IntFunction<short[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Short256VectorTests::ADDReduceLong, Short256VectorTests::ADDReduceAllLong);
     }
 
@@ -4964,7 +4964,7 @@ static void ADDReduceLongShort256VectorTestsMasked(IntFunction<short[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Short256VectorTests::ADDReduceLongMasked, Short256VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4976,7 +4976,7 @@ static void BroadcastLongShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -4994,7 +4994,7 @@ static void blendShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short256VectorTests::blend);
     }
 
 
@@ -5011,7 +5011,7 @@ static void SelectFromShort256VectorTests(IntFunction<short[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
@@ -5030,7 +5030,7 @@ static void SelectFromShort256VectorTestsMaskedSmokeTest(IntFunction<short[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5107,7 +5107,7 @@ static void maskEqShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Short256VectorTests::beq);
+        assertArraysEquals(r, a, b, Short256VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java
index 30392650e8a34..ae9d392d75ffc 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Short512VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (512 / 8));
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(short[] a, short[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<short[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new short[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<short[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorTests.java b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
index 29a1388d82b82..16463ba45d8a9 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         short apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         short[] apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         short apply(short[] a);
     }
 
-    static void assertReductionArraysEquals(short[] a, short[] b, short c,
+    static void assertReductionArraysEquals(short[] r, short rc, short[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         short apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(short[] a, short[] b, short c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(short[] r, short rc, short[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(short[] a);
     }
 
-    static void assertReductionLongArraysEquals(short[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, short[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(short[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, short[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(short[] a, short[] b, short element, int index) {
+    static void assertInsertArraysEquals(short[] r, short[] a, short element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(short[]a, short[]r) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBi
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTern
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, s
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         short apply(short[] a, int b);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FBinArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         short[] apply(short[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         short[] apply(short[] r, short[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         short[] apply(short[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         short[] apply(short[] a, short[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLan
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         short[] apply(short[] a, short[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, bool
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         short[] apply(short[] a, short[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         short[] apply(short[] a, short[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
     }
 
 
-    static void assertArraysEquals(short[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(short[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(short[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(short[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(short[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1278,7 +1278,7 @@ static void ADDShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::ADD);
+        assertArraysEquals(r, a, b, Short512VectorTests::ADD);
     }
     static short add(short a, short b) {
         return (short)(a + b);
@@ -1296,7 +1296,7 @@ static void addShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::add);
+        assertArraysEquals(r, a, b, Short512VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1316,7 +1316,7 @@ static void ADDShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1334,7 +1334,7 @@ static void addShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::add);
     }
     static short SUB(short a, short b) {
         return (short)(a - b);
@@ -1354,7 +1354,7 @@ static void SUBShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::SUB);
+        assertArraysEquals(r, a, b, Short512VectorTests::SUB);
     }
     static short sub(short a, short b) {
         return (short)(a - b);
@@ -1372,7 +1372,7 @@ static void subShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::sub);
+        assertArraysEquals(r, a, b, Short512VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1392,7 +1392,7 @@ static void SUBShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1410,7 +1410,7 @@ static void subShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::sub);
     }
     static short MUL(short a, short b) {
         return (short)(a * b);
@@ -1430,7 +1430,7 @@ static void MULShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::MUL);
+        assertArraysEquals(r, a, b, Short512VectorTests::MUL);
     }
     static short mul(short a, short b) {
         return (short)(a * b);
@@ -1448,7 +1448,7 @@ static void mulShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::mul);
+        assertArraysEquals(r, a, b, Short512VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1468,7 +1468,7 @@ static void MULShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1486,7 +1486,7 @@ static void mulShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::mul);
     }
 
 
@@ -1511,7 +1511,7 @@ static void DIVShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::DIV);
+        assertArraysEquals(r, a, b, Short512VectorTests::DIV);
     }
     static short div(short a, short b) {
         return (short)(a / b);
@@ -1533,7 +1533,7 @@ static void divShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::div);
+        assertArraysEquals(r, a, b, Short512VectorTests::div);
     }
 
 
@@ -1557,7 +1557,7 @@ static void DIVShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1579,7 +1579,7 @@ static void divShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1600,7 +1600,7 @@ static void FIRST_NONZEROShort512VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Short512VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1620,7 +1620,7 @@ static void FIRST_NONZEROShort512VectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -1641,7 +1641,7 @@ static void ANDShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::AND);
+        assertArraysEquals(r, a, b, Short512VectorTests::AND);
     }
     static short and(short a, short b) {
         return (short)(a & b);
@@ -1659,7 +1659,7 @@ static void andShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::and);
+        assertArraysEquals(r, a, b, Short512VectorTests::and);
     }
 
 
@@ -1681,7 +1681,7 @@ static void ANDShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::AND);
     }
 
 
@@ -1703,7 +1703,7 @@ static void AND_NOTShort512VectorTests(IntFunction<short[]> fa, IntFunction<shor
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Short512VectorTests::AND_NOT);
     }
 
 
@@ -1725,7 +1725,7 @@ static void AND_NOTShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::AND_NOT);
     }
 
 
@@ -1747,7 +1747,7 @@ static void ORShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::OR);
+        assertArraysEquals(r, a, b, Short512VectorTests::OR);
     }
     static short or(short a, short b) {
         return (short)(a | b);
@@ -1765,7 +1765,7 @@ static void orShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::or);
+        assertArraysEquals(r, a, b, Short512VectorTests::or);
     }
 
 
@@ -1787,7 +1787,7 @@ static void ORShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::OR);
     }
 
 
@@ -1809,7 +1809,7 @@ static void XORShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::XOR);
+        assertArraysEquals(r, a, b, Short512VectorTests::XOR);
     }
 
 
@@ -1831,7 +1831,7 @@ static void XORShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::XOR);
     }
 
 
@@ -1846,7 +1846,7 @@ static void addShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1863,7 +1863,7 @@ static void addShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1877,7 +1877,7 @@ static void subShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1894,7 +1894,7 @@ static void subShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1908,7 +1908,7 @@ static void mulShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1925,7 +1925,7 @@ static void mulShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::mul);
     }
 
 
@@ -1944,7 +1944,7 @@ static void divShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::div);
     }
 
 
@@ -1965,7 +1965,7 @@ static void divShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::div);
     }
 
 
@@ -1981,7 +1981,7 @@ static void ORShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1995,7 +1995,7 @@ static void orShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::or);
     }
 
 
@@ -2014,7 +2014,7 @@ static void ORShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::OR);
     }
 
 
@@ -2030,7 +2030,7 @@ static void ANDShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2044,7 +2044,7 @@ static void andShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::and);
     }
 
 
@@ -2063,7 +2063,7 @@ static void ANDShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::AND);
     }
 
 
@@ -2079,7 +2079,7 @@ static void ORShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa,
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Short512VectorTests::OR);
     }
 
 
@@ -2098,7 +2098,7 @@ static void ORShort512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short512VectorTests::OR);
     }
 
 
@@ -2113,7 +2113,7 @@ static void ADDShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Short512VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -2130,7 +2130,7 @@ static void ADDShort512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short512VectorTests::ADD);
     }
 
 
@@ -2155,7 +2155,7 @@ static void LSHLShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Short512VectorTests::LSHL);
     }
 
 
@@ -2177,7 +2177,7 @@ static void LSHLShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::LSHL);
     }
 
 
@@ -2203,7 +2203,7 @@ static void ASHRShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Short512VectorTests::ASHR);
     }
 
 
@@ -2225,7 +2225,7 @@ static void ASHRShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::ASHR);
     }
 
 
@@ -2251,7 +2251,7 @@ static void LSHRShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Short512VectorTests::LSHR);
     }
 
 
@@ -2273,7 +2273,7 @@ static void LSHRShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::LSHR);
     }
 
 
@@ -2298,7 +2298,7 @@ static void LSHLShort512VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Short512VectorTests::LSHL_unary);
     }
 
 
@@ -2319,7 +2319,7 @@ static void LSHLShort512VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::LSHL_unary);
     }
 
 
@@ -2344,7 +2344,7 @@ static void LSHRShort512VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Short512VectorTests::LSHR_unary);
     }
 
 
@@ -2365,7 +2365,7 @@ static void LSHRShort512VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::LSHR_unary);
     }
 
 
@@ -2390,7 +2390,7 @@ static void ASHRShort512VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Short512VectorTests::ASHR_unary);
     }
 
 
@@ -2411,7 +2411,7 @@ static void ASHRShort512VectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::ASHR_unary);
     }
 
     static short MIN(short a, short b) {
@@ -2432,7 +2432,7 @@ static void MINShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::MIN);
+        assertArraysEquals(r, a, b, Short512VectorTests::MIN);
     }
     static short min(short a, short b) {
         return (short)(Math.min(a, b));
@@ -2450,7 +2450,7 @@ static void minShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::min);
+        assertArraysEquals(r, a, b, Short512VectorTests::min);
     }
     static short MAX(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2470,7 +2470,7 @@ static void MAXShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::MAX);
+        assertArraysEquals(r, a, b, Short512VectorTests::MAX);
     }
     static short max(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2488,7 +2488,7 @@ static void maxShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::max);
+        assertArraysEquals(r, a, b, Short512VectorTests::max);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2502,7 +2502,7 @@ static void MINShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2516,7 +2516,7 @@ static void minShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2530,7 +2530,7 @@ static void MAXShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2544,7 +2544,7 @@ static void maxShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::max);
     }
 
     static short ANDReduce(short[] a, int idx) {
@@ -2587,7 +2587,7 @@ static void ANDReduceShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short512VectorTests::ANDReduce, Short512VectorTests::ANDReduceAll);
     }
 
@@ -2635,7 +2635,7 @@ static void ANDReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::ANDReduceMasked, Short512VectorTests::ANDReduceAllMasked);
     }
 
@@ -2680,7 +2680,7 @@ static void ORReduceShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short512VectorTests::ORReduce, Short512VectorTests::ORReduceAll);
     }
 
@@ -2728,7 +2728,7 @@ static void ORReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::ORReduceMasked, Short512VectorTests::ORReduceAllMasked);
     }
 
@@ -2773,7 +2773,7 @@ static void XORReduceShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short512VectorTests::XORReduce, Short512VectorTests::XORReduceAll);
     }
 
@@ -2821,7 +2821,7 @@ static void XORReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::XORReduceMasked, Short512VectorTests::XORReduceAllMasked);
     }
 
@@ -2863,7 +2863,7 @@ static void ADDReduceShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short512VectorTests::ADDReduce, Short512VectorTests::ADDReduceAll);
     }
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2907,7 +2907,7 @@ static void ADDReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::ADDReduceMasked, Short512VectorTests::ADDReduceAllMasked);
     }
     static short MULReduce(short[] a, int idx) {
@@ -2948,7 +2948,7 @@ static void MULReduceShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short512VectorTests::MULReduce, Short512VectorTests::MULReduceAll);
     }
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2992,7 +2992,7 @@ static void MULReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::MULReduceMasked, Short512VectorTests::MULReduceAllMasked);
     }
     static short MINReduce(short[] a, int idx) {
@@ -3033,7 +3033,7 @@ static void MINReduceShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short512VectorTests::MINReduce, Short512VectorTests::MINReduceAll);
     }
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3078,7 +3078,7 @@ static void MINReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::MINReduceMasked, Short512VectorTests::MINReduceAllMasked);
     }
     static short MAXReduce(short[] a, int idx) {
@@ -3119,7 +3119,7 @@ static void MAXReduceShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short512VectorTests::MAXReduce, Short512VectorTests::MAXReduceAll);
     }
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3164,7 +3164,7 @@ static void MAXReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::MAXReduceMasked, Short512VectorTests::MAXReduceAllMasked);
     }
 
@@ -3190,7 +3190,7 @@ static void anyTrueShort512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Short512VectorTests::anyTrue);
     }
 
 
@@ -3216,7 +3216,7 @@ static void allTrueShort512VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Short512VectorTests::allTrue);
     }
 
 
@@ -3232,7 +3232,7 @@ static void withShort512VectorTests(IntFunction<short []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (short)4, 0);
+        assertInsertArraysEquals(r, a, (short)4, 0);
     }
     static boolean testIS_DEFAULT(short a) {
         return bits(a)==0;
@@ -3781,7 +3781,7 @@ static void blendShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
@@ -3798,7 +3798,7 @@ static void RearrangeShort512VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
@@ -3816,7 +3816,7 @@ static void RearrangeShort512VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "shortUnaryOpProvider")
     static void getShort512VectorTests(IntFunction<short[]> fa) {
@@ -3971,7 +3971,7 @@ static void getShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::get);
+        assertArraysEquals(r, a, Short512VectorTests::get);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -3985,7 +3985,7 @@ static void BroadcastShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4032,7 +4032,7 @@ static void sliceUnaryShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Short512VectorTests::sliceUnary);
     }
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4061,7 +4061,7 @@ static void sliceBinaryShort512VectorTestsBinary(IntFunction<short[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Short512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Short512VectorTests::sliceBinary);
     }
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4094,7 +4094,7 @@ static void sliceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Short512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Short512VectorTests::slice);
     }
     static short[] unsliceUnary(short[] a, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4121,7 +4121,7 @@ static void unsliceUnaryShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Short512VectorTests::unsliceUnary);
     }
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4160,7 +4160,7 @@ static void unsliceBinaryShort512VectorTestsBinary(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Short512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Short512VectorTests::unsliceBinary);
     }
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4216,7 +4216,7 @@ static void unsliceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Short512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Short512VectorTests::unslice);
     }
 
 
@@ -4265,7 +4265,7 @@ static void BITWISE_BLENDShort512VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, c, r, Short512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4281,7 +4281,7 @@ static void bitwiseBlendShort512VectorTests(IntFunction<short[]> fa, IntFunction
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Short512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
     }
 
 
@@ -4304,7 +4304,7 @@ static void BITWISE_BLENDShort512VectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Short512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4322,7 +4322,7 @@ static void BITWISE_BLENDShort512VectorTestsBroadcastSmokeTest(IntFunction<short
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4337,7 +4337,7 @@ static void BITWISE_BLENDShort512VectorTestsAltBroadcastSmokeTest(IntFunction<sh
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4351,7 +4351,7 @@ static void bitwiseBlendShort512VectorTestsBroadcastSmokeTest(IntFunction<short[
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4366,7 +4366,7 @@ static void bitwiseBlendShort512VectorTestsAltBroadcastSmokeTest(IntFunction<sho
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
     }
 
 
@@ -4386,7 +4386,7 @@ static void BITWISE_BLENDShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Short512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
@@ -4405,7 +4405,7 @@ static void BITWISE_BLENDShort512VectorTestsAltBroadcastMaskedSmokeTest(IntFunct
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Short512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4423,7 +4423,7 @@ static void BITWISE_BLENDShort512VectorTestsDoubleBroadcastSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort512VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4437,7 +4437,7 @@ static void bitwiseBlendShort512VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
     }
 
 
@@ -4456,7 +4456,7 @@ static void BITWISE_BLENDShort512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFu
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Short512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4480,7 +4480,7 @@ static void NEGShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::NEG);
+        assertArraysEquals(r, a, Short512VectorTests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4495,7 +4495,7 @@ static void negShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::neg);
+        assertArraysEquals(r, a, Short512VectorTests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4513,7 +4513,7 @@ static void NEGMaskedShort512VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Short512VectorTests::NEG);
     }
 
     static short ABS(short a) {
@@ -4536,7 +4536,7 @@ static void ABSShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::ABS);
+        assertArraysEquals(r, a, Short512VectorTests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4551,7 +4551,7 @@ static void absShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::abs);
+        assertArraysEquals(r, a, Short512VectorTests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4569,7 +4569,7 @@ static void ABSMaskedShort512VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Short512VectorTests::ABS);
     }
 
 
@@ -4595,7 +4595,7 @@ static void NOTShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::NOT);
+        assertArraysEquals(r, a, Short512VectorTests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4610,7 +4610,7 @@ static void notShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::not);
+        assertArraysEquals(r, a, Short512VectorTests::not);
     }
 
 
@@ -4630,7 +4630,7 @@ static void NOTMaskedShort512VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Short512VectorTests::NOT);
     }
 
 
@@ -4653,7 +4653,7 @@ static void ZOMOShort512VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short512VectorTests::ZOMO);
+        assertArraysEquals(r, a, Short512VectorTests::ZOMO);
     }
 
 
@@ -4673,7 +4673,7 @@ static void ZOMOMaskedShort512VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Short512VectorTests::ZOMO);
     }
 
 
@@ -4701,7 +4701,7 @@ static void gatherShort512VectorTests(IntFunction<short[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::gather);
+        assertArraysEquals(r, a, b, Short512VectorTests::gather);
     }
     static short[] gatherMasked(short a[], int ix, boolean[] mask, int[] b, int iy) {
         short[] res = new short[SPECIES.length()];
@@ -4729,7 +4729,7 @@ static void gatherMaskedShort512VectorTests(IntFunction<short[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::gatherMasked);
     }
 
     static short[] scatter(short a[], int ix, int[] b, int iy) {
@@ -4754,7 +4754,7 @@ static void scatterShort512VectorTests(IntFunction<short[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, Short512VectorTests::scatter);
+        assertArraysEquals(r, a, b, Short512VectorTests::scatter);
     }
 
     static short[] scatterMasked(short r[], short a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4792,7 +4792,7 @@ static void scatterMaskedShort512VectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short512VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Short512VectorTests::scatterMasked);
     }
 
 
@@ -4834,8 +4834,8 @@ static void toIntArrayShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4845,8 +4845,8 @@ static void toLongArrayShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4856,8 +4856,8 @@ static void toDoubleArrayShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4923,7 +4923,7 @@ static void ADDReduceLongShort512VectorTests(IntFunction<short[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Short512VectorTests::ADDReduceLong, Short512VectorTests::ADDReduceAllLong);
     }
 
@@ -4964,7 +4964,7 @@ static void ADDReduceLongShort512VectorTestsMasked(IntFunction<short[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Short512VectorTests::ADDReduceLongMasked, Short512VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4976,7 +4976,7 @@ static void BroadcastLongShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -4994,7 +4994,7 @@ static void blendShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short512VectorTests::blend);
     }
 
 
@@ -5011,7 +5011,7 @@ static void SelectFromShort512VectorTests(IntFunction<short[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
@@ -5030,7 +5030,7 @@ static void SelectFromShort512VectorTestsMaskedSmokeTest(IntFunction<short[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5107,7 +5107,7 @@ static void maskEqShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Short512VectorTests::beq);
+        assertArraysEquals(r, a, b, Short512VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java
index 425fc0c37e2ec..c42913ae31197 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,47 +58,25 @@ public class Short64VectorLoadStoreTests extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (64 / 8));
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(short[] a, short[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -401,7 +379,7 @@ static void loadStoreArray(IntFunction<short[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -472,7 +450,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new short[a.length];
@@ -483,7 +461,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortMaskProviderForIOOBE")
@@ -556,7 +534,7 @@ static void loadStoreMask(IntFunction<short[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -580,7 +558,7 @@ static void loadStoreByteBuffer(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -667,7 +645,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -682,7 +660,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -798,7 +776,7 @@ static void loadStoreByteArray(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -879,7 +857,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -890,7 +868,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -967,7 +945,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -978,7 +956,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorTests.java b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
index 885e39012385f..adc10b3b4b9cd 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ interface FUnOp {
         short apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -83,7 +83,7 @@ interface FUnArrayOp {
         short[] apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -93,13 +93,13 @@ static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -118,17 +118,17 @@ interface FReductionAllOp {
         short apply(short[] a);
     }
 
-    static void assertReductionArraysEquals(short[] a, short[] b, short c,
+    static void assertReductionArraysEquals(short[] r, short rc, short[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -140,17 +140,17 @@ interface FReductionAllMaskedOp {
         short apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(short[] a, short[] b, short c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(short[] r, short rc, short[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -162,17 +162,17 @@ interface FReductionAllOpLong {
         long apply(short[] a);
     }
 
-    static void assertReductionLongArraysEquals(short[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, short[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -184,17 +184,17 @@ interface FReductionAllMaskedOpLong {
         long apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(short[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, short[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -202,37 +202,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(short[] a, short[] b, short element, int index) {
+    static void assertInsertArraysEquals(short[] r, short[] a, short element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -246,7 +246,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -260,7 +260,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -280,7 +280,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -300,7 +300,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(short[]a, short[]r) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -329,7 +329,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -340,7 +340,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -352,7 +352,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -364,11 +364,11 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBi
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -379,11 +379,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -397,11 +397,11 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -415,7 +415,7 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -429,11 +429,11 @@ static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -459,7 +459,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -470,11 +470,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTern
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -486,7 +486,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -499,7 +499,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -512,12 +512,12 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -533,12 +533,12 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -554,7 +554,7 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -569,12 +569,12 @@ static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, s
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -597,7 +597,7 @@ interface FBinArrayOp {
         short apply(short[] a, int b);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FBinArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -612,7 +612,7 @@ interface FGatherScatterOp {
         short[] apply(short[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -639,7 +639,7 @@ interface FScatterMaskedOp {
         short[] apply(short[] r, short[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -649,7 +649,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -660,7 +660,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -670,7 +670,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -687,7 +687,7 @@ interface FLaneOp {
         short[] apply(short[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -697,7 +697,7 @@ static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -707,7 +707,7 @@ interface FLaneBop {
         short[] apply(short[] a, short[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -717,7 +717,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLan
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -728,7 +728,7 @@ interface FLaneMaskedBop {
         short[] apply(short[] a, short[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -738,7 +738,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, bool
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -749,7 +749,7 @@ interface FLanePartBop {
         short[] apply(short[] a, short[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -759,7 +759,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -771,7 +771,7 @@ interface FLanePartMaskedBop {
         short[] apply(short[] a, short[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -781,7 +781,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -790,7 +790,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
     }
 
 
-    static void assertArraysEquals(short[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -803,7 +803,7 @@ static void assertArraysEquals(short[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(short[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -814,7 +814,7 @@ static void assertArraysEquals(short[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(short[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1278,7 +1278,7 @@ static void ADDShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::ADD);
+        assertArraysEquals(r, a, b, Short64VectorTests::ADD);
     }
     static short add(short a, short b) {
         return (short)(a + b);
@@ -1296,7 +1296,7 @@ static void addShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::add);
+        assertArraysEquals(r, a, b, Short64VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1316,7 +1316,7 @@ static void ADDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1334,7 +1334,7 @@ static void addShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::add);
     }
     static short SUB(short a, short b) {
         return (short)(a - b);
@@ -1354,7 +1354,7 @@ static void SUBShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::SUB);
+        assertArraysEquals(r, a, b, Short64VectorTests::SUB);
     }
     static short sub(short a, short b) {
         return (short)(a - b);
@@ -1372,7 +1372,7 @@ static void subShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::sub);
+        assertArraysEquals(r, a, b, Short64VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1392,7 +1392,7 @@ static void SUBShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1410,7 +1410,7 @@ static void subShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::sub);
     }
     static short MUL(short a, short b) {
         return (short)(a * b);
@@ -1430,7 +1430,7 @@ static void MULShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::MUL);
+        assertArraysEquals(r, a, b, Short64VectorTests::MUL);
     }
     static short mul(short a, short b) {
         return (short)(a * b);
@@ -1448,7 +1448,7 @@ static void mulShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::mul);
+        assertArraysEquals(r, a, b, Short64VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1468,7 +1468,7 @@ static void MULShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1486,7 +1486,7 @@ static void mulShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::mul);
     }
 
 
@@ -1511,7 +1511,7 @@ static void DIVShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::DIV);
+        assertArraysEquals(r, a, b, Short64VectorTests::DIV);
     }
     static short div(short a, short b) {
         return (short)(a / b);
@@ -1533,7 +1533,7 @@ static void divShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::div);
+        assertArraysEquals(r, a, b, Short64VectorTests::div);
     }
 
 
@@ -1557,7 +1557,7 @@ static void DIVShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1579,7 +1579,7 @@ static void divShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1600,7 +1600,7 @@ static void FIRST_NONZEROShort64VectorTests(IntFunction<short[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, Short64VectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1620,7 +1620,7 @@ static void FIRST_NONZEROShort64VectorTestsMasked(IntFunction<short[]> fa, IntFu
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -1641,7 +1641,7 @@ static void ANDShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::AND);
+        assertArraysEquals(r, a, b, Short64VectorTests::AND);
     }
     static short and(short a, short b) {
         return (short)(a & b);
@@ -1659,7 +1659,7 @@ static void andShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::and);
+        assertArraysEquals(r, a, b, Short64VectorTests::and);
     }
 
 
@@ -1681,7 +1681,7 @@ static void ANDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::AND);
     }
 
 
@@ -1703,7 +1703,7 @@ static void AND_NOTShort64VectorTests(IntFunction<short[]> fa, IntFunction<short
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, Short64VectorTests::AND_NOT);
     }
 
 
@@ -1725,7 +1725,7 @@ static void AND_NOTShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::AND_NOT);
     }
 
 
@@ -1747,7 +1747,7 @@ static void ORShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> f
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::OR);
+        assertArraysEquals(r, a, b, Short64VectorTests::OR);
     }
     static short or(short a, short b) {
         return (short)(a | b);
@@ -1765,7 +1765,7 @@ static void orShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> f
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::or);
+        assertArraysEquals(r, a, b, Short64VectorTests::or);
     }
 
 
@@ -1787,7 +1787,7 @@ static void ORShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<shor
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::OR);
     }
 
 
@@ -1809,7 +1809,7 @@ static void XORShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::XOR);
+        assertArraysEquals(r, a, b, Short64VectorTests::XOR);
     }
 
 
@@ -1831,7 +1831,7 @@ static void XORShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::XOR);
     }
 
 
@@ -1846,7 +1846,7 @@ static void addShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1863,7 +1863,7 @@ static void addShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1877,7 +1877,7 @@ static void subShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1894,7 +1894,7 @@ static void subShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1908,7 +1908,7 @@ static void mulShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1925,7 +1925,7 @@ static void mulShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::mul);
     }
 
 
@@ -1944,7 +1944,7 @@ static void divShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::div);
     }
 
 
@@ -1965,7 +1965,7 @@ static void divShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::div);
     }
 
 
@@ -1981,7 +1981,7 @@ static void ORShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntF
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1995,7 +1995,7 @@ static void orShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntF
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::or);
     }
 
 
@@ -2014,7 +2014,7 @@ static void ORShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::OR);
     }
 
 
@@ -2030,7 +2030,7 @@ static void ANDShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2044,7 +2044,7 @@ static void andShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::and);
     }
 
 
@@ -2063,7 +2063,7 @@ static void ANDShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, Short64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::AND);
     }
 
 
@@ -2079,7 +2079,7 @@ static void ORShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa,
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, Short64VectorTests::OR);
     }
 
 
@@ -2098,7 +2098,7 @@ static void ORShort64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short64VectorTests::OR);
     }
 
 
@@ -2113,7 +2113,7 @@ static void ADDShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa,
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, Short64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, Short64VectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -2130,7 +2130,7 @@ static void ADDShort64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short64VectorTests::ADD);
     }
 
 
@@ -2155,7 +2155,7 @@ static void LSHLShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, Short64VectorTests::LSHL);
     }
 
 
@@ -2177,7 +2177,7 @@ static void LSHLShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::LSHL);
     }
 
 
@@ -2203,7 +2203,7 @@ static void ASHRShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, Short64VectorTests::ASHR);
     }
 
 
@@ -2225,7 +2225,7 @@ static void ASHRShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::ASHR);
     }
 
 
@@ -2251,7 +2251,7 @@ static void LSHRShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, Short64VectorTests::LSHR);
     }
 
 
@@ -2273,7 +2273,7 @@ static void LSHRShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::LSHR);
     }
 
 
@@ -2298,7 +2298,7 @@ static void LSHLShort64VectorTestsShift(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, Short64VectorTests::LSHL_unary);
     }
 
 
@@ -2319,7 +2319,7 @@ static void LSHLShort64VectorTestsShift(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::LSHL_unary);
     }
 
 
@@ -2344,7 +2344,7 @@ static void LSHRShort64VectorTestsShift(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, Short64VectorTests::LSHR_unary);
     }
 
 
@@ -2365,7 +2365,7 @@ static void LSHRShort64VectorTestsShift(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::LSHR_unary);
     }
 
 
@@ -2390,7 +2390,7 @@ static void ASHRShort64VectorTestsShift(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertShiftArraysEquals(a, b, r, Short64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, Short64VectorTests::ASHR_unary);
     }
 
 
@@ -2411,7 +2411,7 @@ static void ASHRShort64VectorTestsShift(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, Short64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::ASHR_unary);
     }
 
     static short MIN(short a, short b) {
@@ -2432,7 +2432,7 @@ static void MINShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::MIN);
+        assertArraysEquals(r, a, b, Short64VectorTests::MIN);
     }
     static short min(short a, short b) {
         return (short)(Math.min(a, b));
@@ -2450,7 +2450,7 @@ static void minShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::min);
+        assertArraysEquals(r, a, b, Short64VectorTests::min);
     }
     static short MAX(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2470,7 +2470,7 @@ static void MAXShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::MAX);
+        assertArraysEquals(r, a, b, Short64VectorTests::MAX);
     }
     static short max(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2488,7 +2488,7 @@ static void maxShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::max);
+        assertArraysEquals(r, a, b, Short64VectorTests::max);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2502,7 +2502,7 @@ static void MINShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2516,7 +2516,7 @@ static void minShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2530,7 +2530,7 @@ static void MAXShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2544,7 +2544,7 @@ static void maxShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, Short64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::max);
     }
 
     static short ANDReduce(short[] a, int idx) {
@@ -2587,7 +2587,7 @@ static void ANDReduceShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short64VectorTests::ANDReduce, Short64VectorTests::ANDReduceAll);
     }
 
@@ -2635,7 +2635,7 @@ static void ANDReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::ANDReduceMasked, Short64VectorTests::ANDReduceAllMasked);
     }
 
@@ -2680,7 +2680,7 @@ static void ORReduceShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short64VectorTests::ORReduce, Short64VectorTests::ORReduceAll);
     }
 
@@ -2728,7 +2728,7 @@ static void ORReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::ORReduceMasked, Short64VectorTests::ORReduceAllMasked);
     }
 
@@ -2773,7 +2773,7 @@ static void XORReduceShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short64VectorTests::XORReduce, Short64VectorTests::XORReduceAll);
     }
 
@@ -2821,7 +2821,7 @@ static void XORReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::XORReduceMasked, Short64VectorTests::XORReduceAllMasked);
     }
 
@@ -2863,7 +2863,7 @@ static void ADDReduceShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short64VectorTests::ADDReduce, Short64VectorTests::ADDReduceAll);
     }
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2907,7 +2907,7 @@ static void ADDReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::ADDReduceMasked, Short64VectorTests::ADDReduceAllMasked);
     }
     static short MULReduce(short[] a, int idx) {
@@ -2948,7 +2948,7 @@ static void MULReduceShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short64VectorTests::MULReduce, Short64VectorTests::MULReduceAll);
     }
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2992,7 +2992,7 @@ static void MULReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::MULReduceMasked, Short64VectorTests::MULReduceAllMasked);
     }
     static short MINReduce(short[] a, int idx) {
@@ -3033,7 +3033,7 @@ static void MINReduceShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short64VectorTests::MINReduce, Short64VectorTests::MINReduceAll);
     }
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3078,7 +3078,7 @@ static void MINReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::MINReduceMasked, Short64VectorTests::MINReduceAllMasked);
     }
     static short MAXReduce(short[] a, int idx) {
@@ -3119,7 +3119,7 @@ static void MAXReduceShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 Short64VectorTests::MAXReduce, Short64VectorTests::MAXReduceAll);
     }
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3164,7 +3164,7 @@ static void MAXReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::MAXReduceMasked, Short64VectorTests::MAXReduceAllMasked);
     }
 
@@ -3190,7 +3190,7 @@ static void anyTrueShort64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, Short64VectorTests::anyTrue);
     }
 
 
@@ -3216,7 +3216,7 @@ static void allTrueShort64VectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, Short64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, Short64VectorTests::allTrue);
     }
 
 
@@ -3232,7 +3232,7 @@ static void withShort64VectorTests(IntFunction<short []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (short)4, 0);
+        assertInsertArraysEquals(r, a, (short)4, 0);
     }
     static boolean testIS_DEFAULT(short a) {
         return bits(a)==0;
@@ -3781,7 +3781,7 @@ static void blendShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
@@ -3798,7 +3798,7 @@ static void RearrangeShort64VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
@@ -3816,7 +3816,7 @@ static void RearrangeShort64VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "shortUnaryOpProvider")
     static void getShort64VectorTests(IntFunction<short[]> fa) {
@@ -3971,7 +3971,7 @@ static void getShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::get);
+        assertArraysEquals(r, a, Short64VectorTests::get);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -3985,7 +3985,7 @@ static void BroadcastShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4032,7 +4032,7 @@ static void sliceUnaryShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, Short64VectorTests::sliceUnary);
     }
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4061,7 +4061,7 @@ static void sliceBinaryShort64VectorTestsBinary(IntFunction<short[]> fa, IntFunc
             }
         }
 
-        assertArraysEquals(a, b, r, origin, Short64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, Short64VectorTests::sliceBinary);
     }
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4094,7 +4094,7 @@ static void sliceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, Short64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, Short64VectorTests::slice);
     }
     static short[] unsliceUnary(short[] a, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4121,7 +4121,7 @@ static void unsliceUnaryShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, Short64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, Short64VectorTests::unsliceUnary);
     }
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4160,7 +4160,7 @@ static void unsliceBinaryShort64VectorTestsBinary(IntFunction<short[]> fa, IntFu
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, Short64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, Short64VectorTests::unsliceBinary);
     }
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4216,7 +4216,7 @@ static void unsliceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, Short64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, Short64VectorTests::unslice);
     }
 
 
@@ -4265,7 +4265,7 @@ static void BITWISE_BLENDShort64VectorTests(IntFunction<short[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, c, r, Short64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4281,7 +4281,7 @@ static void bitwiseBlendShort64VectorTests(IntFunction<short[]> fa, IntFunction<
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, Short64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
     }
 
 
@@ -4304,7 +4304,7 @@ static void BITWISE_BLENDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFu
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, Short64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4322,7 +4322,7 @@ static void BITWISE_BLENDShort64VectorTestsBroadcastSmokeTest(IntFunction<short[
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4337,7 +4337,7 @@ static void BITWISE_BLENDShort64VectorTestsAltBroadcastSmokeTest(IntFunction<sho
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4351,7 +4351,7 @@ static void bitwiseBlendShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, Short64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4366,7 +4366,7 @@ static void bitwiseBlendShort64VectorTestsAltBroadcastSmokeTest(IntFunction<shor
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, Short64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
     }
 
 
@@ -4386,7 +4386,7 @@ static void BITWISE_BLENDShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, Short64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
@@ -4405,7 +4405,7 @@ static void BITWISE_BLENDShort64VectorTestsAltBroadcastMaskedSmokeTest(IntFuncti
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, Short64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4423,7 +4423,7 @@ static void BITWISE_BLENDShort64VectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShort64VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4437,7 +4437,7 @@ static void bitwiseBlendShort64VectorTestsDoubleBroadcastSmokeTest(IntFunction<s
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, Short64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
     }
 
 
@@ -4456,7 +4456,7 @@ static void BITWISE_BLENDShort64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFun
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, Short64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
     }
 
 
@@ -4480,7 +4480,7 @@ static void NEGShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::NEG);
+        assertArraysEquals(r, a, Short64VectorTests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4495,7 +4495,7 @@ static void negShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::neg);
+        assertArraysEquals(r, a, Short64VectorTests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4513,7 +4513,7 @@ static void NEGMaskedShort64VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, Short64VectorTests::NEG);
     }
 
     static short ABS(short a) {
@@ -4536,7 +4536,7 @@ static void ABSShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::ABS);
+        assertArraysEquals(r, a, Short64VectorTests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4551,7 +4551,7 @@ static void absShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::abs);
+        assertArraysEquals(r, a, Short64VectorTests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4569,7 +4569,7 @@ static void ABSMaskedShort64VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, Short64VectorTests::ABS);
     }
 
 
@@ -4595,7 +4595,7 @@ static void NOTShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::NOT);
+        assertArraysEquals(r, a, Short64VectorTests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4610,7 +4610,7 @@ static void notShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::not);
+        assertArraysEquals(r, a, Short64VectorTests::not);
     }
 
 
@@ -4630,7 +4630,7 @@ static void NOTMaskedShort64VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, Short64VectorTests::NOT);
     }
 
 
@@ -4653,7 +4653,7 @@ static void ZOMOShort64VectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, Short64VectorTests::ZOMO);
+        assertArraysEquals(r, a, Short64VectorTests::ZOMO);
     }
 
 
@@ -4673,7 +4673,7 @@ static void ZOMOMaskedShort64VectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, Short64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, Short64VectorTests::ZOMO);
     }
 
 
@@ -4701,7 +4701,7 @@ static void gatherShort64VectorTests(IntFunction<short[]> fa, BiFunction<Integer
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::gather);
+        assertArraysEquals(r, a, b, Short64VectorTests::gather);
     }
     static short[] gatherMasked(short a[], int ix, boolean[] mask, int[] b, int iy) {
         short[] res = new short[SPECIES.length()];
@@ -4729,7 +4729,7 @@ static void gatherMaskedShort64VectorTests(IntFunction<short[]> fa, BiFunction<I
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::gatherMasked);
     }
 
     static short[] scatter(short a[], int ix, int[] b, int iy) {
@@ -4754,7 +4754,7 @@ static void scatterShort64VectorTests(IntFunction<short[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, Short64VectorTests::scatter);
+        assertArraysEquals(r, a, b, Short64VectorTests::scatter);
     }
 
     static short[] scatterMasked(short r[], short a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4792,7 +4792,7 @@ static void scatterMaskedShort64VectorTests(IntFunction<short[]> fa, IntFunction
             }
         }
 
-        assertArraysEquals(a, b, r, mask, Short64VectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, Short64VectorTests::scatterMasked);
     }
 
 
@@ -4834,8 +4834,8 @@ static void toIntArrayShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4845,8 +4845,8 @@ static void toLongArrayShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4856,8 +4856,8 @@ static void toDoubleArrayShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4923,7 +4923,7 @@ static void ADDReduceLongShort64VectorTests(IntFunction<short[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 Short64VectorTests::ADDReduceLong, Short64VectorTests::ADDReduceAllLong);
     }
 
@@ -4964,7 +4964,7 @@ static void ADDReduceLongShort64VectorTestsMasked(IntFunction<short[]> fa, IntFu
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 Short64VectorTests::ADDReduceLongMasked, Short64VectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4976,7 +4976,7 @@ static void BroadcastLongShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -4994,7 +4994,7 @@ static void blendShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> f
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, Short64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, Short64VectorTests::blend);
     }
 
 
@@ -5011,7 +5011,7 @@ static void SelectFromShort64VectorTests(IntFunction<short[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
@@ -5030,7 +5030,7 @@ static void SelectFromShort64VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5107,7 +5107,7 @@ static void maskEqShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunc
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, Short64VectorTests::beq);
+        assertArraysEquals(r, a, b, Short64VectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java
index 9770eae468e0f..98429a4f088be 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,47 +67,25 @@ static VectorShape getMaxBit() {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * (Max / 8));
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : (short) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int[] im) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(short[] a, short[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : (short) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -410,7 +388,7 @@ static void loadStoreArray(IntFunction<short[]> fa) {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -481,7 +459,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new short[a.length];
@@ -492,7 +470,7 @@ static void loadStoreMaskArray(IntFunction<short[]> fa,
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortMaskProviderForIOOBE")
@@ -565,7 +543,7 @@ static void loadStoreMask(IntFunction<short[]> fa,
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -589,7 +567,7 @@ static void loadStoreByteBuffer(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -676,7 +654,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -691,7 +669,7 @@ static void loadStoreByteBufferMask(IntFunction<short[]> fa,
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -807,7 +785,7 @@ static void loadStoreByteArray(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "shortByteProviderForIOOBE")
@@ -888,7 +866,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -899,7 +877,7 @@ static void loadStoreByteArrayMask(IntFunction<short[]> fa,
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
@@ -976,7 +954,7 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -987,7 +965,7 @@ static void loadStoreShuffle() {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
index f5b497bfa4376..7e4d7e3fa09fd 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ interface FUnOp {
         short apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -88,7 +88,7 @@ interface FUnArrayOp {
         short[] apply(short a);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -98,13 +98,13 @@ static void assertArraysEquals(short[] a, short[] r, FUnArrayOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals(short[] r, short[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -123,17 +123,17 @@ interface FReductionAllOp {
         short apply(short[] a);
     }
 
-    static void assertReductionArraysEquals(short[] a, short[] b, short c,
+    static void assertReductionArraysEquals(short[] r, short rc, short[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -145,17 +145,17 @@ interface FReductionAllMaskedOp {
         short apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked(short[] a, short[] b, short c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked(short[] r, short rc, short[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -167,17 +167,17 @@ interface FReductionAllOpLong {
         long apply(short[] a);
     }
 
-    static void assertReductionLongArraysEquals(short[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, short[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -189,17 +189,17 @@ interface FReductionAllMaskedOpLong {
         long apply(short[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked(short[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, short[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -207,37 +207,37 @@ interface FBoolReductionOp {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals(short[] a, short[] b, short element, int index) {
+    static void assertInsertArraysEquals(short[] r, short[] a, short element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -251,7 +251,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, int v
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -265,7 +265,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, in
         }
     }
 
-    static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals(short[] r, short[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -285,7 +285,7 @@ static void assertRearrangeArraysEquals(short[] a, short[] r, int[] order, boole
         }
     }
 
-    static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals(short[] r, short[] a, short[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -305,7 +305,7 @@ static void assertSelectFromArraysEquals(short[] a, short[] r, short[] order, bo
         }
     }
 
-    static void assertBroadcastArraysEquals(short[]a, short[]r) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -334,7 +334,7 @@ static FBinMaskOp lift(FBinOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -345,7 +345,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -357,7 +357,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, FBinOp
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -369,11 +369,11 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, FBi
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -384,11 +384,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, boolean[] mask,
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -402,11 +402,11 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] r, boolean
         }
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -420,7 +420,7 @@ static void assertBroadcastLongArraysEquals(short[] a, short[] b, short[] r, boo
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -434,11 +434,11 @@ static void assertShiftArraysEquals(short[] a, short[] b, short[] r, FBinOp f) {
         }
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals(short[] a, short[] b, short[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -464,7 +464,7 @@ static FTernMaskOp lift(FTernOp f) {
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -475,11 +475,11 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, FTern
         }
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -491,7 +491,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] c, short[] r, boole
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -504,7 +504,7 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -517,12 +517,12 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -538,12 +538,12 @@ static void assertBroadcastArraysEquals(short[] a, short[] b, short[] c, short[]
         }
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -559,7 +559,7 @@ static void assertAltBroadcastArraysEquals(short[] a, short[] b, short[] c, shor
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -574,12 +574,12 @@ static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, s
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals(short[] a, short[] b, short[] c, short[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals(short[] r, short[] a, short[] b, short[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -602,7 +602,7 @@ interface FBinArrayOp {
         short apply(short[] a, int b);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, FBinArrayOp f) {
+    static void assertArraysEquals(short[] r, short[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -617,7 +617,7 @@ interface FGatherScatterOp {
         short[] apply(short[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, FGatherScatterOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -644,7 +644,7 @@ interface FScatterMaskedOp {
         short[] apply(short[] r, short[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -654,7 +654,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -665,7 +665,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FG
         }
     }
 
-    static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -675,7 +675,7 @@ static void assertArraysEquals(short[] a, int[] b, short[] r, boolean[] mask, FS
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -692,7 +692,7 @@ interface FLaneOp {
         short[] apply(short[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals(short[] r, short[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -702,7 +702,7 @@ static void assertArraysEquals(short[] a, short[] r, int origin, FLaneOp f) {
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -712,7 +712,7 @@ interface FLaneBop {
         short[] apply(short[] a, short[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -722,7 +722,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, FLan
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -733,7 +733,7 @@ interface FLaneMaskedBop {
         short[] apply(short[] a, short[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -743,7 +743,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, bool
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -754,7 +754,7 @@ interface FLanePartBop {
         short[] apply(short[] a, short[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -764,7 +764,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -776,7 +776,7 @@ interface FLanePartMaskedBop {
         short[] apply(short[] a, short[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals(short[] r, short[] a, short[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -786,7 +786,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -795,7 +795,7 @@ static void assertArraysEquals(short[] a, short[] b, short[] r, int origin, int
     }
 
 
-    static void assertArraysEquals(short[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -808,7 +808,7 @@ static void assertArraysEquals(short[] a, int[] r, int offs) {
 
 
 
-    static void assertArraysEquals(short[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -819,7 +819,7 @@ static void assertArraysEquals(short[] a, long[] r, int offs) {
         }
     }
 
-    static void assertArraysEquals(short[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, short[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1283,7 +1283,7 @@ static void ADDShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::ADD);
     }
     static short add(short a, short b) {
         return (short)(a + b);
@@ -1301,7 +1301,7 @@ static void addShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::add);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1321,7 +1321,7 @@ static void ADDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1339,7 +1339,7 @@ static void addShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::add);
     }
     static short SUB(short a, short b) {
         return (short)(a - b);
@@ -1359,7 +1359,7 @@ static void SUBShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::SUB);
     }
     static short sub(short a, short b) {
         return (short)(a - b);
@@ -1377,7 +1377,7 @@ static void subShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1397,7 +1397,7 @@ static void SUBShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1415,7 +1415,7 @@ static void subShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::sub);
     }
     static short MUL(short a, short b) {
         return (short)(a * b);
@@ -1435,7 +1435,7 @@ static void MULShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::MUL);
     }
     static short mul(short a, short b) {
         return (short)(a * b);
@@ -1453,7 +1453,7 @@ static void mulShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1473,7 +1473,7 @@ static void MULShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1491,7 +1491,7 @@ static void mulShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::mul);
     }
 
 
@@ -1516,7 +1516,7 @@ static void DIVShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::DIV);
     }
     static short div(short a, short b) {
         return (short)(a / b);
@@ -1538,7 +1538,7 @@ static void divShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::div);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::div);
     }
 
 
@@ -1562,7 +1562,7 @@ static void DIVShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1584,7 +1584,7 @@ static void divShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1605,7 +1605,7 @@ static void FIRST_NONZEROShortMaxVectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1625,7 +1625,7 @@ static void FIRST_NONZEROShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -1646,7 +1646,7 @@ static void ANDShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::AND);
     }
     static short and(short a, short b) {
         return (short)(a & b);
@@ -1664,7 +1664,7 @@ static void andShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::and);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::and);
     }
 
 
@@ -1686,7 +1686,7 @@ static void ANDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::AND);
     }
 
 
@@ -1708,7 +1708,7 @@ static void AND_NOTShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<shor
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::AND_NOT);
     }
 
 
@@ -1730,7 +1730,7 @@ static void AND_NOTShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::AND_NOT);
     }
 
 
@@ -1752,7 +1752,7 @@ static void ORShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::OR);
     }
     static short or(short a, short b) {
         return (short)(a | b);
@@ -1770,7 +1770,7 @@ static void orShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::or);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::or);
     }
 
 
@@ -1792,7 +1792,7 @@ static void ORShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sho
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::OR);
     }
 
 
@@ -1814,7 +1814,7 @@ static void XORShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::XOR);
     }
 
 
@@ -1836,7 +1836,7 @@ static void XORShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::XOR);
     }
 
 
@@ -1851,7 +1851,7 @@ static void addShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1868,7 +1868,7 @@ static void addShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ShortMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1882,7 +1882,7 @@ static void subShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1899,7 +1899,7 @@ static void subShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ShortMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -1913,7 +1913,7 @@ static void mulShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -1930,7 +1930,7 @@ static void mulShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ShortMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::mul);
     }
 
 
@@ -1949,7 +1949,7 @@ static void divShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::div);
     }
 
 
@@ -1970,7 +1970,7 @@ static void divShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ShortMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::div);
     }
 
 
@@ -1986,7 +1986,7 @@ static void ORShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2000,7 +2000,7 @@ static void orShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, Int
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::or);
     }
 
 
@@ -2019,7 +2019,7 @@ static void ORShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> f
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ShortMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::OR);
     }
 
 
@@ -2035,7 +2035,7 @@ static void ANDShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2049,7 +2049,7 @@ static void andShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::and);
     }
 
 
@@ -2068,7 +2068,7 @@ static void ANDShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]>
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, mask, ShortMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::AND);
     }
 
 
@@ -2084,7 +2084,7 @@ static void ORShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa,
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, ShortMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ShortMaxVectorTests::OR);
     }
 
 
@@ -2103,7 +2103,7 @@ static void ORShortMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, ShortMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortMaxVectorTests::OR);
     }
 
 
@@ -2118,7 +2118,7 @@ static void ADDShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, ShortMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ShortMaxVectorTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -2135,7 +2135,7 @@ static void ADDShortMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(a, b, r, mask, ShortMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortMaxVectorTests::ADD);
     }
 
 
@@ -2160,7 +2160,7 @@ static void LSHLShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::LSHL);
     }
 
 
@@ -2182,7 +2182,7 @@ static void LSHLShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHL);
     }
 
 
@@ -2208,7 +2208,7 @@ static void ASHRShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::ASHR);
     }
 
 
@@ -2230,7 +2230,7 @@ static void ASHRShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::ASHR);
     }
 
 
@@ -2256,7 +2256,7 @@ static void LSHRShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::LSHR);
     }
 
 
@@ -2278,7 +2278,7 @@ static void LSHRShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<s
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHR);
     }
 
 
@@ -2303,7 +2303,7 @@ static void LSHLShortMaxVectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, ShortMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2324,7 +2324,7 @@ static void LSHLShortMaxVectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, ShortMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHL_unary);
     }
 
 
@@ -2349,7 +2349,7 @@ static void LSHRShortMaxVectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, ShortMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2370,7 +2370,7 @@ static void LSHRShortMaxVectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, ShortMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHR_unary);
     }
 
 
@@ -2395,7 +2395,7 @@ static void ASHRShortMaxVectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, ShortMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::ASHR_unary);
     }
 
 
@@ -2416,7 +2416,7 @@ static void ASHRShortMaxVectorTestsShift(IntFunction<short[]> fa, IntFunction<sh
             }
         }
 
-        assertShiftArraysEquals(a, b, r, mask, ShortMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::ASHR_unary);
     }
 
     static short MIN(short a, short b) {
@@ -2437,7 +2437,7 @@ static void MINShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::MIN);
     }
     static short min(short a, short b) {
         return (short)(Math.min(a, b));
@@ -2455,7 +2455,7 @@ static void minShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::min);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::min);
     }
     static short MAX(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2475,7 +2475,7 @@ static void MAXShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::MAX);
     }
     static short max(short a, short b) {
         return (short)(Math.max(a, b));
@@ -2493,7 +2493,7 @@ static void maxShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]>
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::max);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::max);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2507,7 +2507,7 @@ static void MINShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2521,7 +2521,7 @@ static void minShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2535,7 +2535,7 @@ static void MAXShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
@@ -2549,7 +2549,7 @@ static void maxShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, In
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, r, ShortMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::max);
     }
 
     static short ANDReduce(short[] a, int idx) {
@@ -2592,7 +2592,7 @@ static void ANDReduceShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ShortMaxVectorTests::ANDReduce, ShortMaxVectorTests::ANDReduceAll);
     }
 
@@ -2640,7 +2640,7 @@ static void ANDReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::ANDReduceMasked, ShortMaxVectorTests::ANDReduceAllMasked);
     }
 
@@ -2685,7 +2685,7 @@ static void ORReduceShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ShortMaxVectorTests::ORReduce, ShortMaxVectorTests::ORReduceAll);
     }
 
@@ -2733,7 +2733,7 @@ static void ORReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFuncti
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::ORReduceMasked, ShortMaxVectorTests::ORReduceAllMasked);
     }
 
@@ -2778,7 +2778,7 @@ static void XORReduceShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ShortMaxVectorTests::XORReduce, ShortMaxVectorTests::XORReduceAll);
     }
 
@@ -2826,7 +2826,7 @@ static void XORReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::XORReduceMasked, ShortMaxVectorTests::XORReduceAllMasked);
     }
 
@@ -2868,7 +2868,7 @@ static void ADDReduceShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ShortMaxVectorTests::ADDReduce, ShortMaxVectorTests::ADDReduceAll);
     }
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2912,7 +2912,7 @@ static void ADDReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::ADDReduceMasked, ShortMaxVectorTests::ADDReduceAllMasked);
     }
     static short MULReduce(short[] a, int idx) {
@@ -2953,7 +2953,7 @@ static void MULReduceShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ShortMaxVectorTests::MULReduce, ShortMaxVectorTests::MULReduceAll);
     }
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -2997,7 +2997,7 @@ static void MULReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::MULReduceMasked, ShortMaxVectorTests::MULReduceAllMasked);
     }
     static short MINReduce(short[] a, int idx) {
@@ -3038,7 +3038,7 @@ static void MINReduceShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ShortMaxVectorTests::MINReduce, ShortMaxVectorTests::MINReduceAll);
     }
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3083,7 +3083,7 @@ static void MINReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::MINReduceMasked, ShortMaxVectorTests::MINReduceAllMasked);
     }
     static short MAXReduce(short[] a, int idx) {
@@ -3124,7 +3124,7 @@ static void MAXReduceShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 ShortMaxVectorTests::MAXReduce, ShortMaxVectorTests::MAXReduceAll);
     }
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
@@ -3169,7 +3169,7 @@ static void MAXReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunct
             }
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::MAXReduceMasked, ShortMaxVectorTests::MAXReduceAllMasked);
     }
 
@@ -3195,7 +3195,7 @@ static void anyTrueShortMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, ShortMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortMaxVectorTests::anyTrue);
     }
 
 
@@ -3221,7 +3221,7 @@ static void allTrueShortMaxVectorTests(IntFunction<boolean[]> fm) {
             }
         }
 
-        assertReductionBoolArraysEquals(mask, r, ShortMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortMaxVectorTests::allTrue);
     }
 
 
@@ -3237,7 +3237,7 @@ static void withShortMaxVectorTests(IntFunction<short []> fa) {
             }
         }
 
-        assertInsertArraysEquals(a, r, (short)4, 0);
+        assertInsertArraysEquals(r, a, (short)4, 0);
     }
     static boolean testIS_DEFAULT(short a) {
         return bits(a)==0;
@@ -3786,7 +3786,7 @@ static void blendShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
@@ -3803,7 +3803,7 @@ static void RearrangeShortMaxVectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
@@ -3821,7 +3821,7 @@ static void RearrangeShortMaxVectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
     @Test(dataProvider = "shortUnaryOpProvider")
     static void getShortMaxVectorTests(IntFunction<short[]> fa) {
@@ -3976,7 +3976,7 @@ static void getShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::get);
+        assertArraysEquals(r, a, ShortMaxVectorTests::get);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -3990,7 +3990,7 @@ static void BroadcastShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
@@ -4037,7 +4037,7 @@ static void sliceUnaryShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, ShortMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ShortMaxVectorTests::sliceUnary);
     }
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4066,7 +4066,7 @@ static void sliceBinaryShortMaxVectorTestsBinary(IntFunction<short[]> fa, IntFun
             }
         }
 
-        assertArraysEquals(a, b, r, origin, ShortMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ShortMaxVectorTests::sliceBinary);
     }
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4099,7 +4099,7 @@ static void sliceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, origin, mask, ShortMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ShortMaxVectorTests::slice);
     }
     static short[] unsliceUnary(short[] a, int origin, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4126,7 +4126,7 @@ static void unsliceUnaryShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, origin, ShortMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ShortMaxVectorTests::unsliceUnary);
     }
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4165,7 +4165,7 @@ static void unsliceBinaryShortMaxVectorTestsBinary(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, ShortMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ShortMaxVectorTests::unsliceBinary);
     }
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
         short[] res = new short[SPECIES.length()];
@@ -4221,7 +4221,7 @@ static void unsliceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, origin, part, mask, ShortMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ShortMaxVectorTests::unslice);
     }
 
 
@@ -4270,7 +4270,7 @@ static void BITWISE_BLENDShortMaxVectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, c, r, ShortMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4286,7 +4286,7 @@ static void bitwiseBlendShortMaxVectorTests(IntFunction<short[]> fa, IntFunction
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(a, b, c, r, ShortMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4309,7 +4309,7 @@ static void BITWISE_BLENDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntF
             }
         }
 
-        assertArraysEquals(a, b, c, r, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4327,7 +4327,7 @@ static void BITWISE_BLENDShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, ShortMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4342,7 +4342,7 @@ static void BITWISE_BLENDShortMaxVectorTestsAltBroadcastSmokeTest(IntFunction<sh
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, ShortMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4356,7 +4356,7 @@ static void bitwiseBlendShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, ShortMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
@@ -4371,7 +4371,7 @@ static void bitwiseBlendShortMaxVectorTestsAltBroadcastSmokeTest(IntFunction<sho
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, ShortMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4391,7 +4391,7 @@ static void BITWISE_BLENDShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
@@ -4410,7 +4410,7 @@ static void BITWISE_BLENDShortMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunct
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4428,7 +4428,7 @@ static void BITWISE_BLENDShortMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, ShortMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
     }
     @Test(dataProvider = "shortTernaryOpProvider")
     static void bitwiseBlendShortMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
@@ -4442,7 +4442,7 @@ static void bitwiseBlendShortMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, ShortMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
     }
 
 
@@ -4461,7 +4461,7 @@ static void BITWISE_BLENDShortMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFu
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
     }
 
 
@@ -4485,7 +4485,7 @@ static void NEGShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::NEG);
+        assertArraysEquals(r, a, ShortMaxVectorTests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4500,7 +4500,7 @@ static void negShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::neg);
+        assertArraysEquals(r, a, ShortMaxVectorTests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4518,7 +4518,7 @@ static void NEGMaskedShortMaxVectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ShortMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, ShortMaxVectorTests::NEG);
     }
 
     static short ABS(short a) {
@@ -4541,7 +4541,7 @@ static void ABSShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::ABS);
+        assertArraysEquals(r, a, ShortMaxVectorTests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4556,7 +4556,7 @@ static void absShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::abs);
+        assertArraysEquals(r, a, ShortMaxVectorTests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
@@ -4574,7 +4574,7 @@ static void ABSMaskedShortMaxVectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ShortMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, ShortMaxVectorTests::ABS);
     }
 
 
@@ -4600,7 +4600,7 @@ static void NOTShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::NOT);
+        assertArraysEquals(r, a, ShortMaxVectorTests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
@@ -4615,7 +4615,7 @@ static void notShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::not);
+        assertArraysEquals(r, a, ShortMaxVectorTests::not);
     }
 
 
@@ -4635,7 +4635,7 @@ static void NOTMaskedShortMaxVectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ShortMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, ShortMaxVectorTests::NOT);
     }
 
 
@@ -4658,7 +4658,7 @@ static void ZOMOShortMaxVectorTests(IntFunction<short[]> fa) {
             }
         }
 
-        assertArraysEquals(a, r, ShortMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, ShortMaxVectorTests::ZOMO);
     }
 
 
@@ -4678,7 +4678,7 @@ static void ZOMOMaskedShortMaxVectorTests(IntFunction<short[]> fa,
             }
         }
 
-        assertArraysEquals(a, r, mask, ShortMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ShortMaxVectorTests::ZOMO);
     }
 
 
@@ -4706,7 +4706,7 @@ static void gatherShortMaxVectorTests(IntFunction<short[]> fa, BiFunction<Intege
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::gather);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::gather);
     }
     static short[] gatherMasked(short a[], int ix, boolean[] mask, int[] b, int iy) {
         short[] res = new short[SPECIES.length()];
@@ -4734,7 +4734,7 @@ static void gatherMaskedShortMaxVectorTests(IntFunction<short[]> fa, BiFunction<
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::gatherMasked);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::gatherMasked);
     }
 
     static short[] scatter(short a[], int ix, int[] b, int iy) {
@@ -4759,7 +4759,7 @@ static void scatterShortMaxVectorTests(IntFunction<short[]> fa, BiFunction<Integ
             }
         }
 
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::scatter);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::scatter);
     }
 
     static short[] scatterMasked(short r[], short a[], int ix, boolean[] mask, int[] b, int iy) {
@@ -4797,7 +4797,7 @@ static void scatterMaskedShortMaxVectorTests(IntFunction<short[]> fa, IntFunctio
             }
         }
 
-        assertArraysEquals(a, b, r, mask, ShortMaxVectorTests::scatterMasked);
+        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::scatterMasked);
     }
 
 
@@ -4839,8 +4839,8 @@ static void toIntArrayShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4850,8 +4850,8 @@ static void toLongArrayShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4861,8 +4861,8 @@ static void toDoubleArrayShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -4928,7 +4928,7 @@ static void ADDReduceLongShortMaxVectorTests(IntFunction<short[]> fa) {
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 ShortMaxVectorTests::ADDReduceLong, ShortMaxVectorTests::ADDReduceAllLong);
     }
 
@@ -4969,7 +4969,7 @@ static void ADDReduceLongShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntF
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 ShortMaxVectorTests::ADDReduceLongMasked, ShortMaxVectorTests::ADDReduceAllLongMasked);
     }
 
@@ -4981,7 +4981,7 @@ static void BroadcastLongShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             ShortVector.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
@@ -4999,7 +4999,7 @@ static void blendShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]>
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, ShortMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortMaxVectorTests::blend);
     }
 
 
@@ -5016,7 +5016,7 @@ static void SelectFromShortMaxVectorTests(IntFunction<short[]> fa,
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
@@ -5035,7 +5035,7 @@ static void SelectFromShortMaxVectorTestsMaskedSmokeTest(IntFunction<short[]> fa
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -5112,7 +5112,7 @@ static void maskEqShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFun
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, ShortMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/VectorReshapeTests.java b/test/jdk/jdk/incubator/vector/VectorReshapeTests.java
index 422b6f702bf55..01dcc4caf85a0 100644
--- a/test/jdk/jdk/incubator/vector/VectorReshapeTests.java
+++ b/test/jdk/jdk/incubator/vector/VectorReshapeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -416,7 +416,7 @@ else if (partLimit >= 0)
                            ", origin=" + origin);
         System.out.println("expect: "+Arrays.toString(expected));
         System.out.println("output: "+Arrays.toString(output));
-        Assert.assertEquals(expected, output);
+        Assert.assertEquals(output, expected);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Long-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Long-op.template
index 42626dee5967f..364742220cc9f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Long-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Long-op.template
@@ -2,5 +2,5 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$BroadcastLongSmokeTest(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertBroadcastLongArraysEquals(a, b, r, $vectorteststype$::[[TEST]]);
+        assertBroadcastLongArraysEquals(r, a, b, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-Long-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-Long-op.template
index b80ec25be8cda..4e207dafc6408 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-Long-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-Long-op.template
@@ -3,5 +3,5 @@
     static void [[TEST]]$vectorteststype$BroadcastMaskedLongSmokeTest(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb,
                                           IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertBroadcastLongArraysEquals(a, b, r, mask, $vectorteststype$::[[TEST]]);
+        assertBroadcastLongArraysEquals(r, a, b, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-op.template
index 0c79d51ba329a..887e2e5698204 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-Masked-op.template
@@ -3,5 +3,5 @@
     static void [[TEST]]$vectorteststype$BroadcastMaskedSmokeTest(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb,
                                           IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertBroadcastArraysEquals(a, b, r, mask, $vectorteststype$::[[TEST]]);
+        assertBroadcastArraysEquals(r, a, b, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op-math.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op-math.template
index 5abbf1feac3d0..7964661ece795 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op-math.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op-math.template
@@ -1,6 +1,6 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$BroadcastSmokeTest(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertBroadcastArraysEqualsWithinOneUlp(a, b, r, $vectorteststype$::[[TEST]], $vectorteststype$::strict[[TEST]]);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, $vectorteststype$::[[TEST]], $vectorteststype$::strict[[TEST]]);
     }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op.template
index 64c74455b94eb..737d282a62ab5 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Broadcast-op.template
@@ -2,5 +2,5 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$BroadcastSmokeTest(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertBroadcastArraysEquals(a, b, r, $vectorteststype$::[[TEST]]);
+        assertBroadcastArraysEquals(r, a, b, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-op.template
index fe3af3e1fd111..df0a1d55131aa 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-op.template
@@ -3,5 +3,5 @@
     static void [[TEST]]$vectorteststype$Masked(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb,
                                           IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, mask, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op-math.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op-math.template
index 82c141fc32a03..6d845a652e959 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op-math.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op-math.template
@@ -9,6 +9,6 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertArraysEqualsWithinOneUlp(a, b, r, $vectorteststype$::[[TEST]], $vectorteststype$::strict[[TEST]]);
+        assertArraysEqualsWithinOneUlp(r, a, b, $vectorteststype$::[[TEST]], $vectorteststype$::strict[[TEST]]);
     }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op.template
index 9fff3c0751c4a..aa7dc156cfe08 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-op.template
@@ -5,5 +5,5 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Blend-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Blend-op.template
index c048c9c56430b..519ea524ff804 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Blend-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Blend-op.template
@@ -7,5 +7,5 @@
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb,
                                           IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, mask, $vectorteststype$::blend);
+        assertArraysEquals(r, a, b, mask, $vectorteststype$::blend);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-BoolReduction-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-BoolReduction-op.template
index 2c92614fd4bae..b3127c1383c57 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-BoolReduction-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-BoolReduction-op.template
@@ -1,5 +1,5 @@
     @Test(dataProvider = "boolUnaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertReductionBoolArraysEquals(mask, r, $vectorteststype$::[[TEST]]);
+        assertReductionBoolArraysEquals(r, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Broadcast.template b/test/jdk/jdk/incubator/vector/templates/Unit-Broadcast.template
index 5c3d22ab2b446..a5748c3f8ae03 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Broadcast.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Broadcast.template
@@ -2,7 +2,7 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void Broadcast$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Gather-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Gather-Masked-op.template
index 9f25e4edd99b6..1f106214601c3 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Gather-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Gather-Masked-op.template
@@ -12,6 +12,6 @@
     @Test(dataProvider = "$type$UnaryMaskedOpIndexProvider")
     static void [[TEST]][[TEST_TYPE]]$vectorteststype$(IntFunction<$type$[]> fa, BiFunction<Integer,Integer,int[]> fs, IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, mask, $vectorteststype$::[[TEST]][[TEST_TYPE]]);
+        assertArraysEquals(r, a, b, mask, $vectorteststype$::[[TEST]][[TEST_TYPE]]);
     }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Gather-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Gather-op.template
index a44602eb9b6f0..b16472f8a1c3f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Gather-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Gather-op.template
@@ -10,5 +10,5 @@
     @Test(dataProvider = "$type$UnaryOpIndexProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa, BiFunction<Integer,Integer,int[]> fs) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Get-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Get-op.template
index 00f1a8300c06f..9feb403171c76 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Get-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Get-op.template
@@ -1,5 +1,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void get$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertArraysEquals(a, r, $vectorteststype$::get);
+        assertArraysEquals(r, a, $vectorteststype$::get);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Masked-op.template
index c6a97475bca46..551d99d7c83b1 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Masked-op.template
@@ -3,5 +3,5 @@
     static void [[TEST]]Masked$vectorteststype$(IntFunction<$type$[]> fa,
                                                 IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, r, mask, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template b/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
index 059bb42b9390d..6e97d1517d7c9 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
@@ -45,8 +45,8 @@
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-            int [] r = av.toIntArray();
-            assertArraysEquals(a, r, i);
+            int[] r = av.toIntArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -60,8 +60,8 @@
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-            long [] r = av.toLongArray();
-            assertArraysEquals(a, r, i);
+            long[] r = av.toLongArray();
+            assertArraysEquals(r, a, i);
         }
     }
 
@@ -72,8 +72,8 @@
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-            double [] r = av.toDoubleArray();
-            assertArraysEquals(a, r, i);
+            double[] r = av.toDoubleArray();
+            assertArraysEquals(r, a, i);
         }
     }
 #end[!Double]
@@ -115,7 +115,7 @@
             $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
             av.reinterpretAsBytes().intoArray(r, i);
         }
-        assertArraysEquals(a, r, 0);
+        assertArraysEquals(r, a, 0);
     }
 #end[byte]
 
@@ -154,7 +154,7 @@
             ra += r[i];
         }
 
-        assertReductionLongArraysEquals(a, r, ra,
+        assertReductionLongArraysEquals(r, ra, a,
                 $vectorteststype$::ADDReduceLong, $vectorteststype$::ADDReduceAllLong);
     }
 
@@ -195,7 +195,7 @@
             ra += r[i];
         }
 
-        assertReductionLongArraysEqualsMasked(a, r, ra, mask,
+        assertReductionLongArraysEqualsMasked(r, ra, a, mask,
                 $vectorteststype$::ADDReduceLongMasked, $vectorteststype$::ADDReduceAllLongMasked);
     }
 
@@ -211,7 +211,7 @@
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             $abstractvectortype$.broadcast(SPECIES, (long)a[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, r);
+        assertBroadcastArraysEquals(r, a);
     }
 
     @Test(dataProvider = "$type$BinaryOpMaskProvider")
@@ -229,7 +229,7 @@
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(a, b, r, mask, $vectorteststype$::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, $vectorteststype$::blend);
     }
 #end[!Long]
 
@@ -250,7 +250,7 @@
             ra += r[i];
         }
 
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 $vectorteststype$::ADDReduce, $vectorteststype$::ADDReduceAll);
     }
 
@@ -272,7 +272,7 @@
             ra += r[i];
         }
 
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 $vectorteststype$::ADDReduceMasked, $vectorteststype$::ADDReduceAllMasked);
     }
 #end[Long]
@@ -294,7 +294,7 @@
             bv.selectFrom(av).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, SPECIES.length());
     }
 
 #if[Int]
@@ -317,7 +317,7 @@
             bv.selectFrom(av, vmask).intoArray(r, i);
         }
 
-        assertSelectFromArraysEquals(a, r, order, mask, SPECIES.length());
+        assertSelectFromArraysEquals(r, a, order, mask, SPECIES.length());
     }
 
     @Test(dataProvider = "shuffleProvider")
@@ -394,7 +394,7 @@
             var cv = av.eq(bv);
             cv.intoArray(r, i);
         }
-        assertArraysEquals(a, b, r, $vectorteststype$::beq);
+        assertArraysEquals(r, a, b, $vectorteststype$::beq);
     }
 
     @Test(dataProvider = "maskProvider")
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Rearrange.template b/test/jdk/jdk/incubator/vector/templates/Unit-Rearrange.template
index f4feba0efa847..de66f1ae23424 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Rearrange.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Rearrange.template
@@ -3,7 +3,7 @@
     static void Rearrange$vectorteststype$(IntFunction<$type$[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
 [[KERNEL]]
-        assertRearrangeArraysEquals(a, r, order, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, SPECIES.length());
     }
 
     @Test(dataProvider = "$type$UnaryOpShuffleMaskProvider")
@@ -21,5 +21,5 @@
             av.rearrange(VectorShuffle.fromArray(SPECIES, order, i), vmask).intoArray(r, i);
         }
 
-        assertRearrangeArraysEquals(a, r, order, mask, SPECIES.length());
+        assertRearrangeArraysEquals(r, a, order, mask, SPECIES.length());
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Max-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Max-op.template
index 892b99ae92334..70ffa79bf6fbd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Max-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Max-op.template
@@ -1,6 +1,6 @@
     @Test(dataProvider = "$type$UnaryOpMaskProvider")
     static void [[TEST]]Reduce$vectorteststype$Masked(IntFunction<$type$[]> fa, IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 $vectorteststype$::[[TEST]]ReduceMasked, $vectorteststype$::[[TEST]]ReduceAllMasked);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Min-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Min-op.template
index 892b99ae92334..70ffa79bf6fbd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Min-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-Min-op.template
@@ -1,6 +1,6 @@
     @Test(dataProvider = "$type$UnaryOpMaskProvider")
     static void [[TEST]]Reduce$vectorteststype$Masked(IntFunction<$type$[]> fa, IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 $vectorteststype$::[[TEST]]ReduceMasked, $vectorteststype$::[[TEST]]ReduceAllMasked);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template
index 892b99ae92334..70ffa79bf6fbd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template
@@ -1,6 +1,6 @@
     @Test(dataProvider = "$type$UnaryOpMaskProvider")
     static void [[TEST]]Reduce$vectorteststype$Masked(IntFunction<$type$[]> fa, IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertReductionArraysEqualsMasked(a, r, ra, mask,
+        assertReductionArraysEqualsMasked(r, ra, a, mask,
                 $vectorteststype$::[[TEST]]ReduceMasked, $vectorteststype$::[[TEST]]ReduceAllMasked);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Max-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Max-op.template
index 9bd17186aa6a6..b86248f3f09f6 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Max-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Max-op.template
@@ -1,6 +1,6 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]Reduce$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Min-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Min-op.template
index 9bd17186aa6a6..b86248f3f09f6 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Min-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Min-op.template
@@ -1,6 +1,6 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]Reduce$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
index 9bd17186aa6a6..b86248f3f09f6 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
@@ -1,6 +1,6 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]Reduce$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertReductionArraysEquals(a, r, ra,
+        assertReductionArraysEquals(r, ra, a,
                 $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-Masked-op.template
index d08ba62dba09f..e40018bbdfd29 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-Masked-op.template
@@ -21,6 +21,6 @@
     @Test(dataProvider = "scatterMaskedOpIndexProvider")
     static void [[TEST]][[TEST_TYPE]]$vectorteststype$(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb, BiFunction<Integer,Integer,int[]> fs, IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, mask, $vectorteststype$::[[TEST]][[TEST_TYPE]]);
+        assertArraysEquals(r, a, b, mask, $vectorteststype$::[[TEST]][[TEST_TYPE]]);
     }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-op.template
index 2cfda9f730cff..db04500e3e7b6 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Scatter-op.template
@@ -10,6 +10,6 @@
     @Test(dataProvider = "$type$UnaryOpIndexProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa, BiFunction<Integer,Integer,int[]> fs) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, $vectorteststype$::[[TEST]]);
     }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Shift-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Shift-Masked-op.template
index 5787ea68e6828..608217c3571f9 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Shift-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Shift-Masked-op.template
@@ -3,5 +3,5 @@
     static void [[TEST]]$vectorteststype$Shift(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb,
                                           IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertShiftArraysEquals(a, b, r, mask, $vectorteststype$::[[TEST]]_unary);
+        assertShiftArraysEquals(r, a, b, mask, $vectorteststype$::[[TEST]]_unary);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Shift-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Shift-op.template
index e958c459375cc..b225da4b22bbd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Shift-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Shift-op.template
@@ -5,5 +5,5 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$Shift(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertShiftArraysEquals(a, b, r, $vectorteststype$::[[TEST]]_unary);
+        assertShiftArraysEquals(r, a, b, $vectorteststype$::[[TEST]]_unary);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Single-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Single-op.template
index 95ebdd12a6843..5c60e43c4ed5b 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Single-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Single-op.template
@@ -8,5 +8,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertArraysEquals(a, r, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Slice-Masked-bop.template b/test/jdk/jdk/incubator/vector/templates/Unit-Slice-Masked-bop.template
index bb4a5f41e28f2..08ef495038b6f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Slice-Masked-bop.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Slice-Masked-bop.template
@@ -15,5 +15,5 @@
     static void [[TEST]]$vectorteststype$Masked(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb,
     IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, origin, mask, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, origin, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Slice-bop.template b/test/jdk/jdk/incubator/vector/templates/Unit-Slice-bop.template
index 51c9f4ec025dc..7382e86c0467f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Slice-bop.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Slice-bop.template
@@ -14,5 +14,5 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$Binary(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, origin, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, origin, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Slice-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Slice-op.template
index 57357bbae2912..6ee07f388b9b8 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Slice-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Slice-op.template
@@ -12,5 +12,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertArraysEquals(a, r, origin, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, origin, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-Masked-op.template
index 6ea50407f9f29..2bd267d574ee7 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-Masked-op.template
@@ -14,7 +14,7 @@
             av.lanewise(VectorOperators.[[TEST]], bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(a, b, c, r, mask, $vectorteststype$::[[TEST]]);
+        assertBroadcastArraysEquals(r, a, b, c, mask, $vectorteststype$::[[TEST]]);
     }
 
     @Test(dataProvider = "$type$TernaryOpMaskProvider")
@@ -33,5 +33,5 @@
             av.lanewise(VectorOperators.[[TEST]], b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, $vectorteststype$::[[TEST]]);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-op.template
index 7a64b4331c7d3..0815e57c50f62 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Broadcast-op.template
@@ -10,7 +10,7 @@
             $abstractvectortype$ bv = $abstractvectortype$.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.[[TEST]], bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(a, b, c, r, $vectorteststype$::[[TEST]]);
+        assertBroadcastArraysEquals(r, a, b, c, $vectorteststype$::[[TEST]]);
     }
 
     @Test(dataProvider = "$type$TernaryOpProvider")
@@ -25,5 +25,5 @@
             $abstractvectortype$ cv = $abstractvectortype$.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.[[TEST]], b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(a, b, c, r, $vectorteststype$::[[TEST]]);
+        assertAltBroadcastArraysEquals(r, a, b, c, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-Masked-op.template
index 5dc2d9c2c3809..706a39d616a7f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-Masked-op.template
@@ -11,5 +11,5 @@
         final int INVOC_COUNT = count;
 #end[double]
 [[KERNEL]]
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, $vectorteststype$::[[TEST]]);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-op.template
index e828078db06c7..9c2fd9312b42b 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Double-Broadcast-op.template
@@ -10,5 +10,5 @@
         final int INVOC_COUNT = count;
 #end[double]
 [[KERNEL]]
-        assertDoubleBroadcastArraysEquals(a, b, c, r, $vectorteststype$::[[TEST]]);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Masked-op.template
index e852234fbde03..1b079e965d49f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-Masked-op.template
@@ -11,5 +11,5 @@
         final int INVOC_COUNT = count;
 #end[double]
 [[KERNEL]]
-        assertArraysEquals(a, b, c, r, mask, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, c, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-op.template
index d60d65b6ee260..386ceff6a341f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Ternary-op.template
@@ -10,5 +10,5 @@
         final int INVOC_COUNT = count;
 #end[double]
 [[KERNEL]]
-        assertArraysEquals(a, b, c, r, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, c, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Unary-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Unary-Masked-op.template
index c6a97475bca46..551d99d7c83b1 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Unary-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Unary-Masked-op.template
@@ -3,5 +3,5 @@
     static void [[TEST]]Masked$vectorteststype$(IntFunction<$type$[]> fa,
                                                 IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, r, mask, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op-math.template b/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op-math.template
index 9f282f714765d..543ba9a77152b 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op-math.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op-math.template
@@ -9,5 +9,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertArraysEqualsWithinOneUlp(a, r, $vectorteststype$::[[TEST]], $vectorteststype$::strict[[TEST]]);
+        assertArraysEqualsWithinOneUlp(r, a, $vectorteststype$::[[TEST]], $vectorteststype$::strict[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op.template
index fe7b6ef7bdd43..b662fe81c3590 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Unary-op.template
@@ -2,5 +2,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertArraysEquals(a, r, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-Masked-bop.template b/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-Masked-bop.template
index fbe1599694477..760a5393a1111 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-Masked-bop.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-Masked-bop.template
@@ -38,5 +38,5 @@
     static void [[TEST]]$vectorteststype$Masked(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb,
     IntFunction<boolean[]> fm) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, origin, part, mask, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, origin, part, mask, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-bop.template b/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-bop.template
index b162bcfa9b859..e723cfd341c8b 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-bop.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-bop.template
@@ -23,5 +23,5 @@
     @Test(dataProvider = "$type$BinaryOpProvider")
     static void [[TEST]]$vectorteststype$Binary(IntFunction<$type$[]> fa, IntFunction<$type$[]> fb) {
 [[KERNEL]]
-        assertArraysEquals(a, b, r, origin, part, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, b, origin, part, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-op.template
index 78cb4c07bb77a..60e7bba21b6f3 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Unslice-op.template
@@ -14,5 +14,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void [[TEST]]$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        assertArraysEquals(a, r, origin, $vectorteststype$::[[TEST]]);
+        assertArraysEquals(r, a, origin, $vectorteststype$::[[TEST]]);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-With-Op.template b/test/jdk/jdk/incubator/vector/templates/Unit-With-Op.template
index fda74a19e35e1..cb44361c094a7 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-With-Op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-With-Op.template
@@ -2,5 +2,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void with$vectorteststype$(IntFunction<$type$ []> fa) {
 [[KERNEL]]
-        assertInsertArraysEquals(a, r, ($type$)4, 0);
+        assertInsertArraysEquals(r, a, ($type$)4, 0);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-header.template b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
index 656cd3c763127..d7c428fce1203 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-header.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,7 +97,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$ apply($type$ a);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] r, FUnOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -112,7 +112,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$ a);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] r, FUnArrayOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, FUnArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -122,13 +122,13 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a[i]);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] r, boolean[] mask, FUnOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, boolean[] mask, FUnOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -147,17 +147,17 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$ apply($type$[] a);
     }
 
-    static void assertReductionArraysEquals($type$[] a, $type$[] b, $type$ c,
+    static void assertReductionArraysEquals($type$[] r, $type$ rc, $type$[] a,
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -169,17 +169,17 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$ apply($type$[] a, boolean[] mask);
     }
 
-    static void assertReductionArraysEqualsMasked($type$[] a, $type$[] b, $type$ c, boolean[] mask,
+    static void assertReductionArraysEqualsMasked($type$[] r, $type$ rc, $type$[] a, boolean[] mask,
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -192,17 +192,17 @@ public class $vectorteststype$ extends AbstractVectorTest {
         long apply($type$[] a);
     }
 
-    static void assertReductionLongArraysEquals($type$[] a, long[] b, long c,
+    static void assertReductionLongArraysEquals(long[] r, long rc, $type$[] a,
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a));
+            Assert.assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -214,17 +214,17 @@ public class $vectorteststype$ extends AbstractVectorTest {
         long apply($type$[] a, boolean[] mask);
     }
 
-    static void assertReductionLongArraysEqualsMasked($type$[] a, long[] b, long c, boolean[] mask,
+    static void assertReductionLongArraysEqualsMasked(long[] r, long rc, $type$[] a, boolean[] mask,
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(c, fa.apply(a, mask));
+            Assert.assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i, mask));
+                Assert.assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(c, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(b[i], f.apply(a, i, mask), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 #end[!Long]
@@ -233,37 +233,37 @@ public class $vectorteststype$ extends AbstractVectorTest {
         boolean apply(boolean[] a, int idx);
     }
 
-    static void assertReductionBoolArraysEquals(boolean[] a, boolean[] b, FBoolReductionOp f) {
+    static void assertReductionBoolArraysEquals(boolean[] r, boolean[] a, FBoolReductionOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(b[i], f.apply(a, i));
+                Assert.assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(b[i], f.apply(a, i), "at index #" + i);
+            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
-    static void assertInsertArraysEquals($type$[] a, $type$[] b, $type$ element, int index) {
+    static void assertInsertArraysEquals($type$[] r, $type$[] a, $type$ element, int index) {
         int i = 0;
         try {
             for (; i < a.length; i += 1) {
                 if(i%SPECIES.length() == index) {
-                    Assert.assertEquals(b[i], element);
+                    Assert.assertEquals(r[i], element);
                 } else {
-                    Assert.assertEquals(b[i], a[i]);
+                    Assert.assertEquals(r[i], a[i]);
                 }
             }
         } catch (AssertionError e) {
             if (i%SPECIES.length() == index) {
-                Assert.assertEquals(b[i], element, "at index #" + i);
+                Assert.assertEquals(r[i], element, "at index #" + i);
             } else {
-                Assert.assertEquals(b[i], a[i], "at index #" + i);
+                Assert.assertEquals(r[i], a[i], "at index #" + i);
             }
         }
     }
 
-    static void assertRearrangeArraysEquals($type$[] a, $type$[] r, int[] order, int vector_len) {
+    static void assertRearrangeArraysEquals($type$[] r, $type$[] a, int[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -277,7 +277,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertSelectFromArraysEquals($type$[] a, $type$[] r, $type$[] order, int vector_len) {
+    static void assertSelectFromArraysEquals($type$[] r, $type$[] a, $type$[] order, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -291,7 +291,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertRearrangeArraysEquals($type$[] a, $type$[] r, int[] order, boolean[] mask, int vector_len) {
+    static void assertRearrangeArraysEquals($type$[] r, $type$[] a, int[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -311,7 +311,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertSelectFromArraysEquals($type$[] a, $type$[] r, $type$[] order, boolean[] mask, int vector_len) {
+    static void assertSelectFromArraysEquals($type$[] r, $type$[] a, $type$[] order, boolean[] mask, int vector_len) {
         int i = 0, j = 0;
         try {
             for (; i < a.length; i += vector_len) {
@@ -331,7 +331,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastArraysEquals($type$[]a, $type$[]r) {
+    static void assertBroadcastArraysEquals($type$[] r, $type$[] a) {
         int i = 0;
         for (; i < a.length; i += SPECIES.length()) {
             int idx = i;
@@ -360,7 +360,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] r, FBinOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -371,7 +371,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] r, FBinOp f) {
+    static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -383,7 +383,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastLongArraysEquals($type$[] a, $type$[] b, $type$[] r, FBinOp f) {
+    static void assertBroadcastLongArraysEquals($type$[] r, $type$[] a, $type$[] b, FBinOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -395,11 +395,11 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinOp f) {
-        assertArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -410,11 +410,11 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -428,11 +428,11 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastLongArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinOp f) {
-        assertBroadcastLongArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertBroadcastLongArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinOp f) {
+        assertBroadcastLongArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertBroadcastLongArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertBroadcastLongArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -446,7 +446,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertShiftArraysEquals($type$[] a, $type$[] b, $type$[] r, FBinOp f) {
+    static void assertShiftArraysEquals($type$[] r, $type$[] a, $type$[] b, FBinOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -460,11 +460,11 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertShiftArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinOp f) {
-        assertShiftArraysEquals(a, b, r, mask, FBinMaskOp.lift(f));
+    static void assertShiftArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinOp f) {
+        assertShiftArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
 
-    static void assertShiftArraysEquals($type$[] a, $type$[] b, $type$[] r, boolean[] mask, FBinMaskOp f) {
+    static void assertShiftArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinMaskOp f) {
         int i = 0;
         int j = 0;
         try {
@@ -490,7 +490,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, FTernOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -501,11 +501,11 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask, FTernOp f) {
-        assertArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask, FTernOp f) {
+        assertArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask, FTernMaskOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask, FTernMaskOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -517,7 +517,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, FTernOp f) {
+    static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -530,7 +530,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertAltBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, FTernOp f) {
+    static void assertAltBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -543,12 +543,12 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask,
                                             FTernOp f) {
-        assertBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask,
+    static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -564,12 +564,12 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertAltBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask,
                                             FTernOp f) {
-        assertAltBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertAltBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask,
+    static void assertAltBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask,
                                             FTernMaskOp f) {
         int i = 0;
         try {
@@ -585,7 +585,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, FTernOp f) {
+    static void assertDoubleBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, FTernOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -600,12 +600,12 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertDoubleBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask,
                                                   FTernOp f) {
-        assertDoubleBroadcastArraysEquals(a, b, c, r, mask, FTernMaskOp.lift(f));
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FTernMaskOp.lift(f));
     }
 
-    static void assertDoubleBroadcastArraysEquals($type$[] a, $type$[] b, $type$[] c, $type$[] r, boolean[] mask,
+    static void assertDoubleBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, $type$[] c, boolean[] mask,
                                                   FTernMaskOp f) {
         int i = 0;
         try {
@@ -645,7 +645,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         return true;
     }
 
-    static void assertArraysEqualsWithinOneUlp($type$[] a, $type$[] r, FUnOp mathf, FUnOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp($type$[] r, $type$[] a, FUnOp mathf, FUnOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -659,7 +659,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertArraysEqualsWithinOneUlp($type$[] a, $type$[] b, $type$[] r, FBinOp mathf, FBinOp strictmathf) {
+    static void assertArraysEqualsWithinOneUlp($type$[] r, $type$[] a, $type$[] b, FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
             // Check that result is within 1 ulp of strict math or equivalent to math implementation.
@@ -673,7 +673,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertBroadcastArraysEqualsWithinOneUlp($type$[] a, $type$[] b, $type$[] r,
+    static void assertBroadcastArraysEqualsWithinOneUlp($type$[] r, $type$[] a, $type$[] b,
                                                         FBinOp mathf, FBinOp strictmathf) {
         int i = 0;
         try {
@@ -704,7 +704,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$ apply($type$[] a, int b);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] r, FBinArrayOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, FBinArrayOp f) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
@@ -719,7 +719,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$[] a, int ix, int[] b, int iy);
     }
 
-    static void assertArraysEquals($type$[] a, int[] b, $type$[] r, FGatherScatterOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, int[] b, FGatherScatterOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -746,7 +746,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$[] r, $type$[] a, int ix, boolean[] mask, int[] b, int iy);
     }
 
-    static void assertArraysEquals($type$[] a, int[] b, $type$[] r, boolean[] mask, FGatherMaskedOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, int[] b, boolean[] mask, FGatherMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -756,7 +756,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, i, mask, b, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -767,7 +767,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         }
     }
 
-    static void assertArraysEquals($type$[] a, int[] b, $type$[] r, boolean[] mask, FScatterMaskedOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, int[] b, boolean[] mask, FScatterMaskedOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -777,7 +777,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(r, a, i, mask, b, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res,
+            Assert.assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -794,7 +794,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$[] a, int origin, int idx);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] r, int origin, FLaneOp f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, int origin, FLaneOp f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -804,7 +804,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, origin, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -814,7 +814,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$[] a, $type$[] b, int origin, int idx);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] r, int origin, FLaneBop f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, int origin, FLaneBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -824,7 +824,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -835,7 +835,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$[] a, $type$[] b, int origin, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] r, int origin, boolean[] mask, FLaneMaskedBop f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, int origin, boolean[] mask, FLaneMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -845,7 +845,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, mask, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -856,7 +856,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$[] a, $type$[] b, int origin, int part, int idx);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] r, int origin, int part, FLanePartBop f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, int origin, int part, FLanePartBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -866,7 +866,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, part, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -878,7 +878,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         $type$[] apply($type$[] a, $type$[] b, int origin, int part, boolean[] mask, int idx);
     }
 
-    static void assertArraysEquals($type$[] a, $type$[] b, $type$[] r, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$[] b, int origin, int part, boolean[] mask, FLanePartMaskedBop f) {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
@@ -888,7 +888,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, part, mask, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(ref, res, "(ref: " + Arrays.toString(ref)
+            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -934,7 +934,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
 #end[!byteOrShort]
 #end[!Int]
 
-    static void assertArraysEquals($type$[] a, int[] r, int offs) {
+    static void assertArraysEquals(int[] r, $type$[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -984,7 +984,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
 #end[!Long]
 
 #if[byte]
-    static void assertArraysEquals($type$[] a, $type$[] r, int offs) {
+    static void assertArraysEquals($type$[] r, $type$[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -996,7 +996,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
     }
 #end[byte]
 
-    static void assertArraysEquals($type$[] a, long[] r, int offs) {
+    static void assertArraysEquals(long[] r, $type$[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
@@ -1008,7 +1008,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
     }
 
 #if[!Double]
-    static void assertArraysEquals($type$[] a, double[] r, int offs) {
+    static void assertArraysEquals(double[] r, $type$[] a, int offs) {
         int i = 0;
         try {
             for (; i < r.length; i++) {
diff --git a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
index 1b44e8fc7504b..5596ac33a2dd1 100644
--- a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
+++ b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,48 +84,26 @@ public class $vectorteststype$ extends AbstractVectorTest {
 
     static final int BUFFER_SIZE = Integer.getInteger("jdk.incubator.vector.test.buffer-size", BUFFER_REPS * ($bits$ / 8));
 
-    static void assertArraysEquals($type$[] a, $type$[] r, boolean[] mask) {
+    static void assertArraysEquals($type$[] r, $type$[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : ($type$) 0, r[i]);
+                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : ($type$) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[i] : ($type$) 0, r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals($type$[] a, $type$[] r, int[] im) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(a[im[i]], r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(a[im[i]], r[i], "at index #" + i);
-        }
-    }
-
-    static void assertArraysEquals($type$[] a, $type$[] r, int[] im, boolean[] mask) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : ($type$) 0, r[i]);
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(mask[i % SPECIES.length()] ? a[im[i]] : ($type$) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : ($type$) 0, "at index #" + i);
         }
     }
 
 #if[!byte]
-    static void assertArraysEquals(byte[] a, byte[] r, boolean[] mask) {
+    static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i]);
+                Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, r[i], "at index #" + i);
+            Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 #end[!byte]
@@ -433,7 +411,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test(dataProvider = "$type$ProviderForIOOBE")
@@ -504,7 +482,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
                 av.intoArray(r, i);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new $type$[a.length];
@@ -515,7 +493,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
                 av.intoArray(r, i, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "$type$MaskProviderForIOOBE")
@@ -588,7 +566,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(mask, r);
+        Assert.assertEquals(r, mask);
     }
 
 
@@ -612,7 +590,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        Assert.assertEquals(a, r, "Buffers not equal");
+        Assert.assertEquals(r, a, "Buffers not equal");
     }
 
     @Test(dataProvider = "$type$ByteProviderForIOOBE")
@@ -699,7 +677,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
 
 
         r = fb.apply(a.limit());
@@ -714,7 +692,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-        assertArraysEquals(_a, bufferToArray(r), mask);
+        assertArraysEquals(bufferToArray(r), _a, mask);
     }
 
     @Test(dataProvider = "$type$ByteMaskProviderForIOOBE")
@@ -830,7 +808,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
                 av.intoByteArray(r, i, bo);
             }
         }
-        Assert.assertEquals(a, r, "Byte arrays not equal");
+        Assert.assertEquals(r, a, "Byte arrays not equal");
     }
 
     @Test(dataProvider = "$type$ByteProviderForIOOBE")
@@ -911,7 +889,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
               av.intoByteArray(r, i, bo);
           }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
 
 
         r = new byte[a.length];
@@ -922,7 +900,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
                 av.intoByteArray(r, i, bo, vmask);
             }
         }
-        assertArraysEquals(a, r, mask);
+        assertArraysEquals(r, a, mask);
     }
 
     @Test(dataProvider = "$type$ByteMaskProviderForIOOBE")
@@ -999,7 +977,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
                 vmask.intoArray(r, i);
             }
         }
-        Assert.assertEquals(a, r);
+        Assert.assertEquals(r, a);
     }
 
     @Test
@@ -1010,7 +988,7 @@ public class $vectorteststype$ extends AbstractVectorTest {
             int [] r = shuffle.toArray();
 
             int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(a, r);
+            Assert.assertEquals(r, a);
        }
     }
 }

From 554e60c400746746bb55469e61fad84af365dbf5 Mon Sep 17 00:00:00 2001
From: Wang Huang <whuang@openjdk.org>
Date: Wed, 6 Jan 2021 01:49:15 +0000
Subject: [PATCH 034/129] 8258989: JVM is failed to inline in
 jdk.internal.vm.vector.VectorSupport::convert

Co-authored-by: He Xuejin <hexuejin2@huawei.com>
Reviewed-by: vlivanov, thartmann
---
 src/hotspot/share/opto/vectorIntrinsics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 07036d2ca7b7e..bf6db23e1b9eb 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -1435,7 +1435,7 @@ bool LibraryCallKit::inline_vector_convert() {
     } else if (num_elem_from > num_elem_to) {
       // Since number elements from input is larger than output, simply reduce size of input (we are supposed to
       // drop top elements anyway).
-      int num_elem_for_resize = MAX2(num_elem_to, Matcher::min_vector_size(elem_bt_to));
+      int num_elem_for_resize = MAX2(num_elem_to, Matcher::min_vector_size(elem_bt_from));
 
       // It is possible that arch does not support this intermediate vector size
       // TODO More complex logic required here to handle this corner case for the sizes.

From 80110dac91767b01de35c583af7b370a36a03c18 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Wed, 6 Jan 2021 06:36:29 +0000
Subject: [PATCH 035/129] 8259007: This test printed a blank page

Reviewed-by: prr, serb
---
 .../sun/awt/windows/WPathGraphics.java        |   4 +-
 .../classes/sun/awt/windows/WPrinterJob.java  | 118 +-------
 .../native/libawt/windows/awt_PrintJob.cpp    | 105 --------
 .../PathPrecisionScaleFactorTest.java         | 254 ------------------
 4 files changed, 11 insertions(+), 470 deletions(-)
 delete mode 100644 test/jdk/java/awt/print/PathPrecisionScaleFactor/PathPrecisionScaleFactorTest.java

diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java b/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
index d642f73143383..6de773eb52e42 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPathGraphics.java
@@ -1760,8 +1760,8 @@ private void convertToWPath(PathIterator pathIter) {
             /* Convert the quad path to a bezier.
              */
              case PathIterator.SEG_QUADTO:
-                float lastX = wPrinterJob.getPenX();
-                float lastY = wPrinterJob.getPenY();
+                int lastX = wPrinterJob.getPenX();
+                int lastY = wPrinterJob.getPenY();
                 float c1x = lastX + (segment[0] - lastX) * 2 / 3;
                 float c1y = lastY + (segment[1] - lastY) * 2 / 3;
                 float c2x = segment[2] - (segment[2] - segment[0]) * 2/ 3;
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
index 403f960ffe730..c0f5bba3d210a 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
@@ -362,10 +362,6 @@ public void dispose() {
 
     private java.awt.peer.ComponentPeer dialogOwnerPeer = null;
 
-    private static final float precisionScale = 1000.0f;
-    private int graphicsMode;
-    private double[] worldTransform = new double[6];
-
  /* Static Initializations */
 
     static {
@@ -957,33 +953,11 @@ private void setDevNames(long mPrintHDevNames) {
     }
 
     protected void beginPath() {
-        precisionScaleBegin();
         beginPath(getPrintDC());
     }
 
     protected void endPath() {
         endPath(getPrintDC());
-        precisionScaleEnd();
-    }
-
-    protected float precisionScaleUp(float value) {
-        return value * precisionScale;
-    }
-
-    protected float precisionScaleDown(float value) {
-        return value / precisionScale;
-    }
-
-    protected void precisionScaleBegin() {
-        graphicsMode = setAdvancedGraphicsMode();
-        getWorldTransform(worldTransform);
-        float invPrecisionScale = 1.0f / precisionScale;
-        scale(invPrecisionScale, invPrecisionScale);
-    }
-
-    protected void precisionScaleEnd() {
-        setWorldTransform(worldTransform);
-        setGraphicsMode(graphicsMode);
     }
 
     protected void closeFigure() {
@@ -995,23 +969,20 @@ protected void fillPath() {
     }
 
     protected void moveTo(float x, float y) {
-        moveTo(getPrintDC(),
-               precisionScaleUp(x), precisionScaleUp(y));
+        moveTo(getPrintDC(), x, y);
     }
 
     protected void lineTo(float x, float y) {
-        lineTo(getPrintDC(),
-               precisionScaleUp(x), precisionScaleUp(y));
+        lineTo(getPrintDC(), x, y);
     }
 
     protected void polyBezierTo(float control1x, float control1y,
                                 float control2x, float control2y,
                                 float endX, float endY) {
 
-        polyBezierTo(getPrintDC(),
-                     precisionScaleUp(control1x), precisionScaleUp(control1y),
-                     precisionScaleUp(control2x), precisionScaleUp(control2y),
-                     precisionScaleUp(endX), precisionScaleUp(endY));
+        polyBezierTo(getPrintDC(),  control1x, control1y,
+                               control2x, control2y,
+                               endX, endY);
     }
 
     /**
@@ -1024,44 +995,6 @@ protected void setPolyFillMode(int fillRule) {
         setPolyFillMode(getPrintDC(), fillRule);
     }
 
-    /**
-     * Set the GDI graphics mode to {@code GM_ADVANCED}.
-     */
-    private int setAdvancedGraphicsMode() {
-        return setAdvancedGraphicsMode(getPrintDC());
-    }
-
-    /**
-     * Set the GDI graphics mode.
-     * The {@code mode} should
-     * be one of the following Windows constants:
-     * {@code GM_COMPATIBLE} or {@code GM_ADVANCED}.
-     */
-    private int setGraphicsMode(int mode) {
-        return setGraphicsMode(getPrintDC(), mode);
-    }
-
-    /**
-     * Scale the GDI World Transform.
-     */
-    private void scale(double scaleX, double scaleY) {
-        scale(getPrintDC(), scaleX, scaleY);
-    }
-
-    /**
-     * Get the GDI World Transform.
-     */
-    private void getWorldTransform(double[] transform) {
-        getWorldTransform(getPrintDC(), transform);
-    }
-
-    /**
-     * Set the GDI World Transform.
-     */
-    private void setWorldTransform(double[] transform) {
-        setWorldTransform(getPrintDC(), transform);
-    }
-
     /*
      * Create a Window's solid brush for the color specified
      * by {@code (red, green, blue)}. Once the brush
@@ -1087,9 +1020,9 @@ protected void selectSolidBrush(Color color) {
      * Return the x coordinate of the current pen
      * position in the print device context.
      */
-    protected float getPenX() {
+    protected int getPenX() {
 
-        return precisionScaleDown(getPenX(getPrintDC()));
+        return getPenX(getPrintDC());
     }
 
 
@@ -1097,9 +1030,9 @@ protected float getPenX() {
      * Return the y coordinate of the current pen
      * position in the print device context.
      */
-    protected float getPenY() {
+    protected int getPenY() {
 
-        return precisionScaleDown(getPenY(getPrintDC()));
+        return getPenY(getPrintDC());
     }
 
     /**
@@ -1537,39 +1470,6 @@ protected native void polyBezierTo(long printDC,
      */
     protected native void setPolyFillMode(long printDC, int fillRule);
 
-    /**
-     * Set the GDI graphics mode to {@code GM_ADVANCED}
-     * into the device context {@code printDC}.
-     */
-    protected native int setAdvancedGraphicsMode(long printDC);
-
-    /**
-     * Set the GDI graphics mode to {@code GM_ADVANCED}
-     * into the device context {@code printDC}.
-     * The {@code mode} should
-     * be one of the following Windows constants:
-     * {@code GM_COMPATIBLE} or {@code GM_ADVANCED}.
-     */
-    protected native int setGraphicsMode(long printDC, int mode);
-
-    /**
-     * Scale the GDI World Transform
-     * of the device context {@code printDC}.
-     */
-    protected native void scale(long printDC, double scaleX, double scaleY);
-
-    /**
-     * Get the GDI World Transform
-     * from the device context {@code printDC}.
-     */
-    protected native void getWorldTransform(long printDC, double[] transform);
-
-    /**
-     * Set the GDI World Transform
-     * into the device context {@code printDC}.
-     */
-    protected native void setWorldTransform(long printDC, double[] transform);
-
     /**
      * Create a Window's solid brush for the color specified
      * by {@code (red, green, blue)}. Once the brush
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
index 925000c256b0e..618ae9e1a827a 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
@@ -1932,111 +1932,6 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_setPolyFillMode
     CATCH_BAD_ALLOC;
 }
 
-/*
- * Class:     sun_awt_windows_WPrinterJob
- * Method:    setAdvancedGraphicsMode
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_setAdvancedGraphicsMode
-(JNIEnv *env, jobject self, jlong printDC) {
-    TRY;
-
-    return (jint) ::SetGraphicsMode((HDC)printDC, GM_ADVANCED);
-
-    CATCH_BAD_ALLOC_RET(0);
-}
-
-/*
- * Class:     sun_awt_windows_WPrinterJob
- * Method:    setGraphicsMode
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_setGraphicsMode
-(JNIEnv *env, jobject self, jlong printDC, jint mode) {
-    TRY;
-
-    return (jint) ::SetGraphicsMode((HDC)printDC, mode);
-
-    CATCH_BAD_ALLOC_RET(0);
-}
-
-/*
- * Class:     sun_awt_windows_WPrinterJob
- * Method:    scale
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_scale
-(JNIEnv *env, jobject self, jlong printDC, jdouble scaleX, jdouble scaleY) {
-    TRY;
-
-    XFORM xForm;
-
-    xForm.eM11 = (FLOAT) scaleX;
-    xForm.eM12 = (FLOAT) 0;
-    xForm.eM21 = (FLOAT) 0;
-    xForm.eM22 = (FLOAT) scaleY;
-    xForm.eDx  = (FLOAT) 0;
-    xForm.eDy  = (FLOAT) 0;
-
-    ::ModifyWorldTransform((HDC)printDC, &xForm, MWT_RIGHTMULTIPLY);
-
-    CATCH_BAD_ALLOC;
-}
-
-/*
- * Class:     sun_awt_windows_WPrinterJob
- * Method:    getWorldTransform
- * Signature: (J[D)V
- */
-JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_getWorldTransform
-(JNIEnv* env, jobject self, jlong printDC, jdoubleArray transform) {
-    TRY;
-
-    double elems[6];
-    XFORM xForm;
-
-    ::GetWorldTransform((HDC)printDC, &xForm);
-
-    elems[0] = (double) xForm.eM11;
-    elems[1] = (double) xForm.eM12;
-    elems[2] = (double) xForm.eM21;
-    elems[3] = (double) xForm.eM22;
-    elems[4] = (double) xForm.eDx;
-    elems[5] = (double) xForm.eDy;
-
-    env->SetDoubleArrayRegion(transform, 0, 6, elems);
-
-    CATCH_BAD_ALLOC;
-}
-
-/*
- * Class:     sun_awt_windows_WPrinterJob
- * Method:    setWorldTransform
- * Signature: (J[D)V
- */
-JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_setWorldTransform
-(JNIEnv* env, jobject self, jlong printDC, jdoubleArray transform) {
-    TRY;
-
-    double *elems;
-    XFORM xForm;
-
-    elems = env->GetDoubleArrayElements(transform, 0);
-
-    xForm.eM11 = (FLOAT) elems[0];
-    xForm.eM12 = (FLOAT) elems[1];
-    xForm.eM21 = (FLOAT) elems[2];
-    xForm.eM22 = (FLOAT) elems[3];
-    xForm.eDx  = (FLOAT) elems[4];
-    xForm.eDy  = (FLOAT) elems[5];
-
-    ::SetWorldTransform((HDC)printDC, &xForm);
-
-    env->ReleaseDoubleArrayElements(transform, elems, 0);
-
-    CATCH_BAD_ALLOC;
-}
-
 /*
  * Class:     sun_awt_windows_WPrinterJob
  * Method:    selectSolidBrush
diff --git a/test/jdk/java/awt/print/PathPrecisionScaleFactor/PathPrecisionScaleFactorTest.java b/test/jdk/java/awt/print/PathPrecisionScaleFactor/PathPrecisionScaleFactorTest.java
deleted file mode 100644
index 2bf2e8e391ec2..0000000000000
--- a/test/jdk/java/awt/print/PathPrecisionScaleFactor/PathPrecisionScaleFactorTest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, BELLSOFT. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8256264
- * @requires (os.family == "windows")
- * @summary Check that a GlyphVector outline is printed with good quility on low dpi printers
- * @run main/othervm/manual PathPrecisionScaleFactorTest
- */
-
-import javax.print.PrintServiceLookup;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.print.PageFormat;
-import java.awt.print.Printable;
-import java.awt.print.PrinterException;
-import java.awt.print.PrinterJob;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class PathPrecisionScaleFactorTest {
-
-    private static final String DESCRIPTION =
-            " 1. Setup 'Microsoft Print to PDF' printer on Windows.\n" +
-                    " 2. Press Print button to print the text to PDF.\n" +
-                    " 3. Choose 'Microsoft Print to PDF' on the print dialog and press OK\n" +
-                    "    Two strings should be printed." +
-                    "    The first line is printed using drawString() method" +
-                    "    and the second line is printed using filling glyph vector outline.\n" +
-                    " 3. Open the PDF file, zoom in the text and check that chars on the second line " +
-                    "    (especially 'a' and 's') are not distorted and have the similar quality" +
-                    "     as on the first line.\n" +
-                    " 4. If so, press PASS button, otherwise press FAIL button.\n";
-
-    private static final CountDownLatch testEndedSignal = new CountDownLatch(1);
-    private static final int testTimeout = 300000;
-    private static volatile String testFailureMsg;
-    private static volatile boolean testPassed;
-    private static volatile boolean testFinished;
-
-    public static void main(String[] args) throws Exception {
-
-        SwingUtilities.invokeLater(() -> createAndShowTestDialog());
-
-        try {
-            if (!testEndedSignal.await(testTimeout, TimeUnit.MILLISECONDS)) {
-                throw new RuntimeException(String.format(
-                        "Test timeout '%d ms' elapsed.", testTimeout));
-            }
-            if (!testPassed) {
-                String failureMsg = testFailureMsg;
-                if ((failureMsg != null) && (!failureMsg.trim().isEmpty())) {
-                    throw new RuntimeException(failureMsg);
-                } else {
-                    throw new RuntimeException("Test failed.");
-                }
-            }
-        } catch (InterruptedException ie) {
-            throw new RuntimeException(ie);
-        } finally {
-            testFinished = true;
-        }
-    }
-
-    private static void pass() {
-        testPassed = true;
-        testEndedSignal.countDown();
-    }
-
-    private static void fail(String failureMsg) {
-        testFailureMsg = failureMsg;
-        testPassed = false;
-        testEndedSignal.countDown();
-    }
-
-    private static String convertMillisToTimeStr(int millis) {
-        if (millis < 0) {
-            return "00:00:00";
-        }
-        int hours = millis / 3600000;
-        int minutes = (millis - hours * 3600000) / 60000;
-        int seconds = (millis - hours * 3600000 - minutes * 60000) / 1000;
-        return String.format("%02d:%02d:%02d", hours, minutes, seconds);
-    }
-
-    private static void createAndShowTestDialog() {
-
-        final JDialog dialog = new JDialog();
-        dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        dialog.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                dialog.dispose();
-                fail("Main dialog was closed.");
-            }
-        });
-
-        final JLabel testTimeoutLabel = new JLabel(String.format(
-                "Test timeout: %s", convertMillisToTimeStr(testTimeout)));
-        final long startTime = System.currentTimeMillis();
-        final Timer timer = new Timer(0, null);
-        timer.setDelay(1000);
-        timer.addActionListener((e) -> {
-            int leftTime = testTimeout - (int) (System.currentTimeMillis() - startTime);
-            if ((leftTime < 0) || testFinished) {
-                timer.stop();
-                dialog.dispose();
-            }
-            testTimeoutLabel.setText(String.format(
-                    "Test timeout: %s", convertMillisToTimeStr(leftTime)));
-        });
-        timer.start();
-
-        JTextArea textArea = new JTextArea(DESCRIPTION);
-        textArea.setEditable(false);
-
-        final JButton testButton = new JButton("Print");
-        final JButton passButton = new JButton("PASS");
-        final JButton failButton = new JButton("FAIL");
-        testButton.addActionListener((e) -> {
-            testButton.setEnabled(false);
-            new Thread(() -> {
-                try {
-                    doTest();
-
-                    SwingUtilities.invokeLater(() -> {
-                        passButton.setEnabled(true);
-                        failButton.setEnabled(true);
-                    });
-                } catch (Throwable t) {
-                    t.printStackTrace();
-                    dialog.dispose();
-                    fail("Exception occurred in a thread executing the test.");
-                }
-            }).start();
-        });
-        passButton.setEnabled(false);
-        passButton.addActionListener((e) -> {
-            dialog.dispose();
-            pass();
-        });
-        failButton.setEnabled(false);
-        failButton.addActionListener((e) -> {
-            dialog.dispose();
-            fail("TitledBorder label is cut off");
-        });
-
-        JPanel mainPanel = new JPanel(new BorderLayout());
-        JPanel labelPanel = new JPanel(new FlowLayout());
-        labelPanel.add(testTimeoutLabel);
-        mainPanel.add(labelPanel, BorderLayout.NORTH);
-        mainPanel.add(textArea, BorderLayout.CENTER);
-        JPanel buttonPanel = new JPanel(new FlowLayout());
-        buttonPanel.add(testButton);
-        buttonPanel.add(passButton);
-        buttonPanel.add(failButton);
-        mainPanel.add(buttonPanel, BorderLayout.SOUTH);
-        dialog.add(mainPanel);
-
-        dialog.pack();
-        dialog.setVisible(true);
-    }
-
-    private static void doTest() throws Exception {
-        SwingUtilities.invokeAndWait(() -> {
-            try {
-                new PathPrecisionScaleFactorPrintable();
-            } catch (PrinterException e) {
-                throw new RuntimeException(e);
-            }
-        });
-    }
-
-    private static class PathPrecisionScaleFactorPrintable implements Printable {
-
-        PathPrecisionScaleFactorPrintable() throws PrinterException {
-            PrinterJob job = PrinterJob.getPrinterJob();
-            job.setPrintService(PrintServiceLookup.lookupDefaultPrintService());
-            job.setPrintable(this);
-
-            if (job.printDialog()) {
-                job.print();
-            } else {
-                throw new RuntimeException("Printing was canceled!");
-            }
-        }
-
-        void paint(Graphics2D g) {
-
-            String text = "abcdefghijklmnopqrstuvwxyz";
-            Font font = new Font("Times New Roman", Font.PLAIN, 8);
-            drawText(g, font, text);
-        }
-
-        private static void drawText(Graphics2D g, Font font, String text) {
-
-            g.setFont(font);
-            FontRenderContext frc = new FontRenderContext(new AffineTransform(), false, true);
-
-            Rectangle clip = g.getClipBounds();
-            int cx = (int) clip.getCenterX();
-            int cy = (int) clip.getCenterY();
-
-            FontMetrics metrics = g.getFontMetrics();
-            int w = metrics.stringWidth(text);
-            int h = metrics.getHeight();
-
-            int x = cx - w / 2;
-            int y = cy - h / 2;
-
-            g.drawString(text + " [draw string]", x, y);
-            GlyphVector gv = font.createGlyphVector(frc, text + " [glyph vector]");
-            g.fill(gv.getOutline(x, y + h));
-        }
-
-        @Override
-        public int print(Graphics graphics, PageFormat pageFormat, int index) {
-            if (index == 0) {
-                paint((Graphics2D) graphics);
-                return PAGE_EXISTS;
-            } else {
-                return NO_SUCH_PAGE;
-            }
-        }
-    }
-}

From 32538b5b1d403b5d6b0e48bceef97a47cf9ddbe7 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Wed, 6 Jan 2021 06:45:48 +0000
Subject: [PATCH 036/129] 8193942: Regression automated test
 '/open/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java'
 fails

Reviewed-by: serb
---
 test/jdk/ProblemList.txt                                   | 1 -
 .../swing/JFrame/8175301/ScaledFrameBackgroundTest.java    | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 269b7162070a4..bb51afe42a133 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -740,7 +740,6 @@ javax/swing/JTree/4633594/JTreeFocusTest.java 8173125 macosx-all
 javax/swing/AbstractButton/6711682/bug6711682.java 8060765 windows-all,macosx-all
 javax/swing/JFileChooser/4524490/bug4524490.java 8042380 generic-all
 javax/swing/JFileChooser/6396844/TwentyThousandTest.java 8198003 generic-all
-javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java 8193942 generic-all
 javax/swing/JPopupMenu/6580930/bug6580930.java 7124313 macosx-all
 javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all
 javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all
diff --git a/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java b/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java
index 1eb664130e38e..806f247a3ea0a 100644
--- a/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java
+++ b/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java
@@ -44,7 +44,7 @@ public class ScaledFrameBackgroundTest {
     public static void main(String[] args) throws Exception {
         try {
             Robot robot = new Robot();
-            robot.setAutoDelay(50);
+            robot.setAutoDelay(100);
 
             SwingUtilities.invokeAndWait(() -> {
                 frame = new JFrame();
@@ -54,10 +54,11 @@ public static void main(String[] args) throws Exception {
                 panel.setBackground(BACKGROUND);
                 frame.getContentPane().add(panel);
                 frame.setVisible(true);
+                frame.setLocationRelativeTo(null);
             });
 
             robot.waitForIdle();
-            Thread.sleep(200);
+            robot.delay(1000);
 
             Rectangle[] rects = new Rectangle[1];
             SwingUtilities.invokeAndWait(() -> {
@@ -81,7 +82,7 @@ public static void main(String[] args) throws Exception {
             color = robot.getPixelColor(x, y);
 
             if (!BACKGROUND.equals(color)) {
-                throw new RuntimeException("Wrong backgound color!");
+                throw new RuntimeException("Wrong backgound color!!");
             }
         } finally {
             if (frame != null) SwingUtilities.invokeAndWait(() -> frame.dispose());

From e3b9da145645d10e10fa6d8c21590899a342cfc9 Mon Sep 17 00:00:00 2001
From: Xin Liu <xliu@openjdk.org>
Date: Wed, 6 Jan 2021 09:51:18 +0000
Subject: [PATCH 037/129] 8259287: AbstractCompiler marks const in wrong
 position for is_c1/is_c2/is_jvmci

Reviewed-by: thartmann, chagedorn, shade
---
 src/hotspot/share/compiler/abstractCompiler.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/compiler/abstractCompiler.hpp b/src/hotspot/share/compiler/abstractCompiler.hpp
index f3ed18ec39731..5d900de39ba67 100644
--- a/src/hotspot/share/compiler/abstractCompiler.hpp
+++ b/src/hotspot/share/compiler/abstractCompiler.hpp
@@ -149,10 +149,10 @@ class AbstractCompiler : public CHeapObj<mtCompiler> {
   }
 
   // Compiler type queries.
-  const bool is_c1()                             { return _type == compiler_c1; }
-  const bool is_c2()                             { return _type == compiler_c2; }
-  const bool is_jvmci()                          { return _type == compiler_jvmci; }
-  const CompilerType type()                      { return _type; }
+  bool is_c1() const                     { return _type == compiler_c1; }
+  bool is_c2() const                     { return _type == compiler_c2; }
+  bool is_jvmci() const                  { return _type == compiler_jvmci; }
+  CompilerType type() const              { return _type; }
 
   // Customization
   virtual void initialize () = 0;

From 8a05d6053211549d15ba469a18b497a3f8ec2b8c Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 6 Jan 2021 10:07:03 +0000
Subject: [PATCH 038/129] 8259042: Inconsistent use of general primitives loops

Reviewed-by: prr
---
 .../share/classes/sun/java2d/loops/Blit.java  | 10 ++---
 .../classes/sun/java2d/loops/BlitBg.java      | 19 ++++-----
 .../sun/java2d/loops/DrawGlyphList.java       | 13 +++---
 .../sun/java2d/loops/DrawGlyphListAA.java     | 13 +++---
 .../sun/java2d/loops/DrawGlyphListLCD.java    | 22 +---------
 .../classes/sun/java2d/loops/DrawLine.java    | 12 +-----
 .../sun/java2d/loops/DrawParallelogram.java   | 12 +-----
 .../classes/sun/java2d/loops/DrawPath.java    | 14 ++-----
 .../sun/java2d/loops/DrawPolygons.java        | 12 +-----
 .../classes/sun/java2d/loops/DrawRect.java    | 12 +-----
 .../sun/java2d/loops/FillParallelogram.java   | 12 +-----
 .../classes/sun/java2d/loops/FillPath.java    | 14 ++-----
 .../classes/sun/java2d/loops/FillRect.java    |  9 ++--
 .../classes/sun/java2d/loops/FillSpans.java   | 14 +------
 .../sun/java2d/loops/GraphicsPrimitive.java   | 42 +++++++++++--------
 .../java2d/loops/GraphicsPrimitiveMgr.java    |  6 +++
 .../java2d/loops/GraphicsPrimitiveProxy.java  |  9 +---
 .../classes/sun/java2d/loops/MaskBlit.java    | 10 ++---
 .../classes/sun/java2d/loops/MaskFill.java    | 10 ++---
 .../classes/sun/java2d/loops/ScaledBlit.java  | 21 +---------
 .../sun/java2d/loops/TransformBlit.java       | 23 +---------
 .../sun/java2d/loops/TransformHelper.java     | 11 +----
 22 files changed, 93 insertions(+), 227 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/java2d/loops/Blit.java b/src/java.desktop/share/classes/sun/java2d/loops/Blit.java
index 516c162f30352..0d3a4ac4f2455 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/Blit.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/Blit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.lang.ref.WeakReference;
-import sun.java2d.loops.GraphicsPrimitive;
+
 import sun.java2d.SurfaceData;
 import sun.java2d.pipe.Region;
 import sun.java2d.pipe.SpanIterator;
@@ -114,9 +114,9 @@ public native void Blit(SurfaceData src, SurfaceData dst,
         GraphicsPrimitiveMgr.registerGeneral(new Blit(null, null, null));
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype)
     {
         /*
         System.out.println("Constructing general blit for:");
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java b/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java
index 427850aef5831..ffe5901a57dc8 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/BlitBg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,17 @@
 
 package sun.java2d.loops;
 
-import java.awt.Font;
+import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Composite;
-import java.awt.AlphaComposite;
-import java.awt.Transparency;
+import java.awt.Font;
+import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.WritableRaster;
-import java.awt.image.BufferedImage;
+
 import sun.awt.image.BufImgSurfaceData;
-import sun.java2d.loops.GraphicsPrimitive;
-import sun.java2d.SurfaceData;
 import sun.java2d.SunGraphics2D;
+import sun.java2d.SurfaceData;
 import sun.java2d.pipe.Region;
 
 /**
@@ -118,9 +117,9 @@ public native void BlitBg(SurfaceData src, SurfaceData dst,
         GraphicsPrimitiveMgr.registerGeneral(new BlitBg(null, null, null));
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype)
     {
         /*
         System.out.println("Constructing general blitbg for:");
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
index e711b549b1fe9..42a1c947c3ac1 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
-import sun.java2d.pipe.Region;
+import sun.font.GlyphList;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
-import sun.font.GlyphList;
+import sun.java2d.pipe.Region;
 
 /**
  *   DrawGlyphList - loops for SolidTextRenderer pipe.
@@ -77,9 +76,9 @@ public native void DrawGlyphList(SunGraphics2D sg2d, SurfaceData dest,
                                 new DrawGlyphList(null, null, null));
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype) {
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype) {
         return new General(srctype, comptype, dsttype);
     }
 
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
index ee22d1e45839e..9aa2fcbb26635 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
-import sun.java2d.pipe.Region;
+import sun.font.GlyphList;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
-import sun.font.GlyphList;
+import sun.java2d.pipe.Region;
 
 /**
  *   DrawGlyphListAA - loops for AATextRenderer pipe
@@ -75,9 +74,9 @@ public native void DrawGlyphListAA(SunGraphics2D sg2d, SurfaceData dest,
                                    new DrawGlyphListAA(null, null, null));
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype) {
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype) {
         return new General(srctype, comptype, dsttype);
     }
 
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
index 89ed93ad59ba3..ac4dd7957ca32 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
+import sun.font.GlyphList;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
-import sun.font.GlyphList;
 
 /**
  *   DrawGlyphListLCD- loops for LCDTextRenderer pipe
@@ -71,23 +70,6 @@ public DrawGlyphListLCD(long pNativePrim,
     public native void DrawGlyphListLCD(SunGraphics2D sg2d, SurfaceData dest,
                                          GlyphList srcData);
 
-    static {
-        GraphicsPrimitiveMgr.registerGeneral(
-                                   new DrawGlyphListLCD(null, null, null));
-    }
-
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype) {
-        /* Do not return a General loop. SunGraphics2D determines whether
-         * to use LCD or standard AA text based on whether there is an
-         * installed loop.
-         * This can be uncommented once there is a General loop which can
-         * handle one byte per colour component masks properly.
-         */
-        return null;
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceDrawGlyphListLCD(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
index 684f2422a7176..8a47b36936d2a 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 
@@ -74,15 +73,6 @@ public DrawLine(long pNativePrim,
     public native void DrawLine(SunGraphics2D sg2d, SurfaceData dest,
                                 int x1, int y1, int x2, int y2);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        // REMIND: use FillSpans or converter object?
-        throw new InternalError("DrawLine not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceDrawLine(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
index 6d16e06794320..ca5899a06959b 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawParallelogram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 
@@ -82,15 +81,6 @@ public native void DrawParallelogram(SunGraphics2D sg, SurfaceData dest,
                                          double dx2, double dy2,
                                          double lw1, double lw2);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        // REMIND: iterate with a FillRect primitive?
-        throw new InternalError("DrawParallelogram not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceDrawParallelogram(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
index 571a01a91f87c..192ea9277e647 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,10 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
+import java.awt.geom.Path2D;
+
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
-import java.awt.geom.Path2D;
 
 /**
  *   DrawPath
@@ -77,14 +77,6 @@ public native void DrawPath(SunGraphics2D sg2d, SurfaceData sData,
                                 int transX, int transY,
                                 Path2D.Float p2df);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        throw new InternalError("DrawPath not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceDrawPath(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
index 54e12ed9a4ad9..577637c3dd2f7 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 
@@ -78,15 +77,6 @@ public native void DrawPolygons(SunGraphics2D sg2d, SurfaceData sData,
                                     int transX, int transY,
                                     boolean close);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        // REMIND: use FillSpans or converter object?
-        throw new InternalError("DrawPolygons not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceDrawPolygons(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java b/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
index 8dcf16edf06f4..67d275607dfc8 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 
@@ -75,15 +74,6 @@ public DrawRect(long pNativePrim,
     public native void DrawRect(SunGraphics2D sg2d, SurfaceData dest,
                                 int x1, int y1, int w, int h);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        // REMIND: use FillSpans or converter object?
-        throw new InternalError("DrawRect not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceDrawRect(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java b/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
index b895c0b8737de..a216fa4035664 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/FillParallelogram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 
@@ -79,15 +78,6 @@ public native void FillParallelogram(SunGraphics2D sg2d, SurfaceData dest,
                                          double dx1, double dy1,
                                          double dx2, double dy2);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        // REMIND: iterate with a FillRect primitive?
-        throw new InternalError("FillParallelogram not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceFillParallelogram(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java b/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
index 524240ed4d1ae..93dea16de59af 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/FillPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,10 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
+import java.awt.geom.Path2D;
+
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
-import java.awt.geom.Path2D;
 
 /**
  *   FillPath
@@ -77,14 +77,6 @@ public native void FillPath(SunGraphics2D sg2d, SurfaceData sData,
                                 int transX, int transY,
                                 Path2D.Float p2df);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        throw new InternalError("FillPath not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceFillPath(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java b/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
index 2a12dda94e98b..e12a05da0abbc 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 
@@ -79,9 +78,9 @@ public native void FillRect(SunGraphics2D sg2d, SurfaceData dest,
         GraphicsPrimitiveMgr.registerGeneral(new FillRect(null, null, null));
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype)
     {
         return new General(srctype, comptype, dsttype);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java b/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
index cb218f954f588..07686384204d5 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,9 @@
 
 package sun.java2d.loops;
 
-import sun.java2d.loops.GraphicsPrimitive;
-import sun.java2d.pipe.SpanIterator;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
+import sun.java2d.pipe.SpanIterator;
 
 /**
  * FillSpans
@@ -82,15 +81,6 @@ public void FillSpans(SunGraphics2D sg2d, SurfaceData dest,
         FillSpans(sg2d, dest, sg2d.pixel, si.getNativeIterator(), si);
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        // REMIND: iterate with a FillRect primitive?
-        throw new InternalError("FillSpans not implemented for "+
-                                srctype+" with "+comptype);
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceFillSpans(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
index a71978a10ac38..de3ffc21b22d8 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,25 +29,24 @@
 
 package sun.java2d.loops;
 
-import java.awt.image.BufferedImage;
 import java.awt.AlphaComposite;
 import java.awt.Rectangle;
-import sun.awt.image.BufImgSurfaceData;
-import sun.awt.util.ThreadGroupUtils;
-import sun.java2d.SurfaceData;
-import sun.java2d.pipe.Region;
-import java.lang.reflect.Field;
-import java.util.StringTokenizer;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Map;
-import java.io.PrintStream;
-import java.io.OutputStream;
-import java.io.FileOutputStream;
+import java.awt.image.BufferedImage;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Field;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
 
+import sun.awt.image.BufImgSurfaceData;
+import sun.awt.util.ThreadGroupUtils;
+import sun.java2d.SurfaceData;
+import sun.java2d.pipe.Region;
 import sun.security.action.GetPropertyAction;
 
 /**
@@ -312,9 +311,18 @@ final boolean satisfiesSameAs(GraphicsPrimitive other) {
                 destType.equals(other.destType));
     }
 
-    public abstract GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                                    CompositeType comptype,
-                                                    SurfaceType dsttype);
+    /**
+     * Produces specific primitive loop if the current object is registered as a
+     * general loop, otherwise the {@code InternalError} is thrown.
+     *
+     * @see GraphicsPrimitiveMgr#registerGeneral
+     */
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype) {
+        throw new InternalError("%s not implemented for %s, comp: %s, dst: %s".
+                formatted(getClass().getName(), srctype, comptype, dsttype));
+    }
 
     public abstract GraphicsPrimitive traceWrap();
 
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
index 66a8e7905be8c..dadfbeb540c0d 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java
@@ -121,6 +121,12 @@ public static synchronized void register(GraphicsPrimitive[] newPrimitives)
         primitives = temp;
     }
 
+    /**
+     * Registers the general loop which will be used to produce specific
+     * primitives by the {@link GraphicsPrimitive#makePrimitive} function.
+     *
+     * @param gen the graphics primitive to be registered as the general loop
+     */
     public static synchronized void registerGeneral(GraphicsPrimitive gen) {
         if (generalPrimitives == null) {
             generalPrimitives = new GraphicsPrimitive[] {gen};
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java
index 1644b8c3be7d8..cf416f747754d 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,13 +65,6 @@ public GraphicsPrimitiveProxy(Class<?> owner, String relativeClassName,
         this.relativeClassName = relativeClassName;
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype) {
-        // This should never happen.
-        throw new InternalError("makePrimitive called on a Proxy!");
-    }
-
     //
     // Come up with the real instance.  Called from
     // GraphicsPrimitiveMgr.locate()
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java b/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java
index 99fbdf5eadcab..414e800dd1b95 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 import java.awt.Composite;
 import java.lang.ref.WeakReference;
-import sun.java2d.loops.GraphicsPrimitive;
+
 import sun.java2d.SurfaceData;
 import sun.java2d.pipe.Region;
 
@@ -112,9 +112,9 @@ public native void MaskBlit(SurfaceData src, SurfaceData dst,
         GraphicsPrimitiveMgr.registerGeneral(new MaskBlit(null, null, null));
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype)
     {
         /*
         new Throwable().printStackTrace();
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java b/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java
index 561fa9bff5ba9..108b235d585d9 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
 
 import java.awt.Composite;
 import java.awt.image.BufferedImage;
+
 import sun.awt.image.BufImgSurfaceData;
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 import sun.java2d.pipe.Region;
@@ -144,9 +144,9 @@ public boolean canDoParallelograms() {
         GraphicsPrimitiveMgr.registerGeneral(new MaskFill(null, null, null));
     }
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
+    protected GraphicsPrimitive makePrimitive(SurfaceType srctype,
+                                              CompositeType comptype,
+                                              SurfaceType dsttype)
     {
         if (SurfaceType.OpaqueColor.equals(srctype) ||
             SurfaceType.AnyColor.equals(srctype))
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java b/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java
index 066b0a9b8f5d9..4717839e25da9 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 package sun.java2d.loops;
 
 import java.awt.Composite;
-import sun.java2d.loops.GraphicsPrimitive;
+
 import sun.java2d.SurfaceData;
 import sun.java2d.pipe.Region;
 
@@ -104,23 +104,6 @@ public native void Scale(SurfaceData src, SurfaceData dst,
                              double dx1, double dy1,
                              double dx2, double dy2);
 
-    static {
-        GraphicsPrimitiveMgr.registerGeneral(new ScaledBlit(null, null, null));
-    }
-
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        /*
-        System.out.println("Constructing general blit for:");
-        System.out.println("src:  "+srctype);
-        System.out.println("comp: "+comptype);
-        System.out.println("dst:  "+dsttype);
-        */
-        return null;
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceScaledBlit(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java b/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java
index 290596ff9ff8d..6b8ad98ad06e5 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
 
 import java.awt.Composite;
 import java.awt.geom.AffineTransform;
+
 import sun.java2d.SurfaceData;
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.pipe.Region;
 
 /**
@@ -105,25 +105,6 @@ public native void Transform(SurfaceData src, SurfaceData dst,
                                  int srcx, int srcy, int dstx, int dsty,
                                  int width, int height);
 
-    // REMIND: do we have a general loop?
-    static {
-        GraphicsPrimitiveMgr.registerGeneral(new TransformBlit(null, null,
-                                                               null));
-    }
-
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        /*
-        System.out.println("Constructing general blit for:");
-        System.out.println("src:  "+srctype);
-        System.out.println("comp: "+comptype);
-        System.out.println("dst:  "+dsttype);
-        */
-        return null;
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceTransformBlit(this);
     }
diff --git a/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java b/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java
index e00ac6d43dbca..450a76f241750 100644
--- a/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java
+++ b/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
 
 import java.awt.Composite;
 import java.awt.geom.AffineTransform;
+
 import sun.java2d.SurfaceData;
-import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.pipe.Region;
 
 /**
@@ -98,13 +98,6 @@ public native void Transform(MaskBlit output,
                                  int dx1, int dy1, int dx2, int dy2,
                                  int[] edges, int dxoff, int dyoff);
 
-    public GraphicsPrimitive makePrimitive(SurfaceType srctype,
-                                           CompositeType comptype,
-                                           SurfaceType dsttype)
-    {
-        return null;
-    }
-
     public GraphicsPrimitive traceWrap() {
         return new TraceTransformHelper(this);
     }

From 7e01bc967d00dce1791ef5cd31b8083751eb52e6 Mon Sep 17 00:00:00 2001
From: Mat Carter <macarte@microsoft.com>
Date: Wed, 6 Jan 2021 10:39:07 +0000
Subject: [PATCH 039/129] 8255264: Support for identifying the full range of
 IPv4 localhost addresses on Windows

Reviewed-by: alanb
---
 .../windows/native/libnet/net_util_md.h       | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/java.base/windows/native/libnet/net_util_md.h b/src/java.base/windows/native/libnet/net_util_md.h
index b76935db3de8e..2f873b6295e32 100644
--- a/src/java.base/windows/native/libnet/net_util_md.h
+++ b/src/java.base/windows/native/libnet/net_util_md.h
@@ -90,24 +90,30 @@ struct ipv6bind {
 /**
  * With dual socket implementation the
  * IPv4 addresseses might be mapped as IPv6.
- * The IPv4 loopback adapter address will
- * be mapped as the following IPv6 ::ffff:127.0.0.1.
+ * The IPv4 loopback adapter address ranges (127.0.0.0 through 127.255.255.255) will
+ * be mapped as the following IPv6 ::ffff:127.0.0.0 through ::ffff:127.255.255.255.
  * For example, this is done by NET_InetAddressToSockaddr.
  */
 #define IN6_IS_ADDR_V4MAPPED_LOOPBACK(x) ( \
-    (((x)->s6_words[0] == 0)      &&  \
-     ((x)->s6_words[1] == 0)      &&  \
-     ((x)->s6_words[2] == 0)      &&  \
-     ((x)->s6_words[3] == 0)      &&  \
-     ((x)->s6_words[4] == 0)      &&  \
-     ((x)->s6_words[5] == 0xFFFF) &&  \
-     ((x)->s6_words[6] == 0x007F) &&  \
-     ((x)->s6_words[7] == 0x0100))    \
+    (((x)->s6_words[0] == 0)               &&  \
+     ((x)->s6_words[1] == 0)               &&  \
+     ((x)->s6_words[2] == 0)               &&  \
+     ((x)->s6_words[3] == 0)               &&  \
+     ((x)->s6_words[4] == 0)               &&  \
+     ((x)->s6_words[5] == 0xFFFF)          &&  \
+     (((x)->s6_words[6] & 0x00FF) == 0x007F)) \
+)
+
+/**
+ * Check for IPv4 loopback adapter address ranges (127.0.0.0 through 127.255.255.255)
+ */
+#define IN4_IS_ADDR_NETLONG_LOOPBACK(l) ( \
+    ((l & 0xFF000000) == 0x7F000000) \
 )
 
 #define IS_LOOPBACK_ADDRESS(x) ( \
     ((x)->sa.sa_family == AF_INET) ? \
-        (ntohl((x)->sa4.sin_addr.s_addr) == INADDR_LOOPBACK) : \
+        (IN4_IS_ADDR_NETLONG_LOOPBACK(ntohl((x)->sa4.sin_addr.s_addr))) : \
         ((IN6_IS_ADDR_LOOPBACK(&(x)->sa6.sin6_addr)) || \
          (IN6_IS_ADDR_V4MAPPED_LOOPBACK(&(x)->sa6.sin6_addr))) \
 )

From e66187d885b6b6b29a812007d6b6283313954591 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Wed, 6 Jan 2021 12:18:43 +0000
Subject: [PATCH 040/129] 8259032: MappedMemorySegmentImpl#makeMappedSegment()
 ignores Unmapper#pagePosition

Co-authored-by: Uwe Schindler <uschindler@openjdk.org>
Reviewed-by: alanb
---
 .../classes/sun/nio/ch/FileChannelImpl.java   |  2 +-
 test/jdk/java/foreign/TestByteBuffer.java     | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
index aee76b374a208..f19d4226c126a 100644
--- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
@@ -889,7 +889,7 @@ private Unmapper(long address, long size, long cap,
 
         @Override
         public long address() {
-            return address;
+            return address + pagePosition;
         }
 
         @Override
diff --git a/test/jdk/java/foreign/TestByteBuffer.java b/test/jdk/java/foreign/TestByteBuffer.java
index 241a7eefed50a..46e288a2ece4c 100644
--- a/test/jdk/java/foreign/TestByteBuffer.java
+++ b/test/jdk/java/foreign/TestByteBuffer.java
@@ -464,6 +464,28 @@ public void testBadMapNegativeOffset() throws IOException {
         MemorySegment.mapFile(f.toPath(), -1, 1, FileChannel.MapMode.READ_WRITE);
     }
 
+    @Test
+    public void testMapOffset() throws IOException {
+        File f = new File("testMapOffset.out");
+        f.createNewFile();
+        f.deleteOnExit();
+
+        int SIZE = Byte.MAX_VALUE;
+
+        try (MemorySegment segment = MemorySegment.mapFile(f.toPath(), 0, SIZE, FileChannel.MapMode.READ_WRITE)) {
+            for (byte offset = 0; offset < SIZE; offset++) {
+                MemoryAccess.setByteAtOffset(segment, offset, offset);
+            }
+            MappedMemorySegments.force(segment);
+        }
+
+        for (int offset = 0 ; offset < SIZE ; offset++) {
+            try (MemorySegment segment = MemorySegment.mapFile(f.toPath(), offset, SIZE - offset, FileChannel.MapMode.READ_ONLY)) {
+                assertEquals(MemoryAccess.getByte(segment), offset);
+            }
+        }
+    }
+
     @Test
     public void testMapZeroSize() throws IOException {
         File f = new File("testPos1.out");

From ad456787192c84e1a974394f2066dd7a2cd30900 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 6 Jan 2021 13:27:57 +0000
Subject: [PATCH 041/129] 8258558: Revert changes for JDK-8252505 and related
 issues

Reviewed-by: kvn
---
 src/hotspot/share/c1/c1_Compiler.cpp          |   2 -
 src/hotspot/share/c1/c1_GraphBuilder.cpp      |   2 +-
 src/hotspot/share/c1/c1_LIRGenerator.cpp      |  21 --
 src/hotspot/share/c1/c1_LIRGenerator.hpp      |   1 -
 src/hotspot/share/ci/ciMethod.cpp             |   4 -
 src/hotspot/share/ci/ciMethod.hpp             |   9 -
 .../share/classfile/classFileParser.cpp       |   5 -
 src/hotspot/share/classfile/vmIntrinsics.cpp  |   1 -
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   3 -
 src/hotspot/share/classfile/vmSymbols.hpp     |   1 -
 src/hotspot/share/compiler/compilerOracle.cpp |  18 -
 src/hotspot/share/compiler/compilerOracle.hpp |   4 -
 src/hotspot/share/opto/c2compiler.cpp         |   2 -
 src/hotspot/share/opto/classes.hpp            |   1 -
 src/hotspot/share/opto/compile.cpp            |   2 -
 src/hotspot/share/opto/library_call.cpp       |  35 +-
 src/hotspot/share/opto/library_call.hpp       |   2 -
 src/hotspot/share/opto/memnode.cpp            |  23 --
 src/hotspot/share/opto/memnode.hpp            |  20 --
 src/hotspot/share/opto/node.hpp               |   1 -
 src/hotspot/share/opto/regmask.cpp            |   7 -
 src/hotspot/share/opto/regmask.hpp            |   1 -
 src/hotspot/share/runtime/vmStructs.cpp       |   1 -
 test/hotspot/jtreg/ProblemList-Xcomp.txt      |  23 --
 test/hotspot/jtreg/TEST.groups                |   1 -
 .../BlackholeDiagnosticUnlockTest.java        | 109 ------
 .../BlackholeInstanceReturnTest.java          | 183 ----------
 .../blackhole/BlackholeInstanceTest.java      | 314 ------------------
 .../BlackholeNonVoidWarningTest.java          |  98 ------
 .../blackhole/BlackholeNullCheckTest.java     | 173 ----------
 .../blackhole/BlackholeStaticReturnTest.java  | 174 ----------
 .../blackhole/BlackholeStaticTest.java        | 287 ----------------
 .../compiler/blackhole/BlackholeTarget.java   | 136 --------
 33 files changed, 2 insertions(+), 1662 deletions(-)
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeDiagnosticUnlockTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceReturnTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeNonVoidWarningTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeNullCheckTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeStaticReturnTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeStaticTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/blackhole/BlackholeTarget.java

diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index a3ffcdb785f92..f245594c5a689 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -230,8 +230,6 @@ bool Compiler::is_intrinsic_supported(const methodHandle& method) {
     break;
   case vmIntrinsics::_getObjectSize:
     break;
-  case vmIntrinsics::_blackhole:
-    break;
   default:
     return false; // Intrinsics not on the previous list are not available.
   }
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index a981c1fd461be..102333cea3244 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -3415,7 +3415,7 @@ bool GraphBuilder::try_inline(ciMethod* callee, bool holder_known, bool ignore_r
 
   // handle intrinsics
   if (callee->intrinsic_id() != vmIntrinsics::_none &&
-      callee->check_intrinsic_candidate()) {
+      (CheckIntrinsics ? callee->intrinsic_candidate() : true)) {
     if (try_inline_intrinsics(callee, ignore_return)) {
       print_inlining(callee, "intrinsic");
       if (callee->has_reserved_stack_access()) {
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp
index ef57876273dfe..c6e23d3ce17df 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp
@@ -3206,10 +3206,6 @@ void LIRGenerator::do_Intrinsic(Intrinsic* x) {
     do_vectorizedMismatch(x);
     break;
 
-  case vmIntrinsics::_blackhole:
-    do_blackhole(x);
-    break;
-
   default: ShouldNotReachHere(); break;
   }
 }
@@ -3629,23 +3625,6 @@ void LIRGenerator::do_RangeCheckPredicate(RangeCheckPredicate *x) {
   }
 }
 
-void LIRGenerator::do_blackhole(Intrinsic *x) {
-  // If we have a receiver, then null-check and handle it separately
-  bool handle_receiver = x->needs_null_check();
-  if (handle_receiver) {
-    CodeEmitInfo* info = state_for(x);
-    LIRItem vitem(x->receiver(), this);
-    vitem.load_item();
-    __ null_check(vitem.result(), info);
-  }
-
-  for (int c = (handle_receiver ? 1 : 0); c < x->number_of_arguments(); c++) {
-    // Load the argument
-    LIRItem vitem(x->argument_at(c), this);
-    vitem.load_item();
-    // ...and leave it unused.
-  }
-}
 
 LIR_Opr LIRGenerator::call_runtime(Value arg1, address entry, ValueType* result_type, CodeEmitInfo* info) {
   LIRItemList args(1);
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.hpp b/src/hotspot/share/c1/c1_LIRGenerator.hpp
index 8817efc148c7a..f1b89e542fc02 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.hpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.hpp
@@ -265,7 +265,6 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
   void do_update_CRC32(Intrinsic* x);
   void do_update_CRC32C(Intrinsic* x);
   void do_vectorizedMismatch(Intrinsic* x);
-  void do_blackhole(Intrinsic* x);
 
  public:
   LIR_Opr call_runtime(BasicTypeArray* signature, LIRItemList* args, address entry, ValueType* result_type, CodeEmitInfo* info);
diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index bdfe57a8b81be..7c60456f7019b 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -155,10 +155,6 @@ ciMethod::ciMethod(const methodHandle& h_m, ciInstanceKlass* holder) :
     ciReplay::initialize(this);
   }
 #endif
-
-  if (CompilerOracle::should_blackhole(h_m)) {
-    h_m->set_intrinsic_id(vmIntrinsics::_blackhole);
-  }
 }
 
 
diff --git a/src/hotspot/share/ci/ciMethod.hpp b/src/hotspot/share/ci/ciMethod.hpp
index ae79a4e0e8d21..4507598afbf24 100644
--- a/src/hotspot/share/ci/ciMethod.hpp
+++ b/src/hotspot/share/ci/ciMethod.hpp
@@ -201,15 +201,6 @@ class ciMethod : public ciMetadata {
   bool intrinsic_candidate()   const { return get_Method()->intrinsic_candidate();   }
   bool is_static_initializer() const { return get_Method()->is_static_initializer(); }
 
-  bool check_intrinsic_candidate() const {
-    if (intrinsic_id() == vmIntrinsics::_blackhole) {
-      // This is the intrinsic without an associated method, so no intrinsic_candidate
-      // flag is set. The intrinsic is still correct.
-      return true;
-    }
-    return (CheckIntrinsics ? intrinsic_candidate() : true);
-  }
-
   int highest_osr_comp_level();
 
   Bytecodes::Code java_code_at_bci(int bci) {
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 1282b373f06e4..d4de4c7ca1ffd 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -5308,11 +5308,6 @@ static void check_methods_for_intrinsics(const InstanceKlass* ik,
           // is defined for it.
           continue;
         }
-        if (vmIntrinsics::_blackhole == id) {
-          // The _blackhole intrinsic is a special marker. No explicit method
-          // is defined for it.
-          continue;
-        }
 
         if (vmIntrinsics::class_for(id) == klass_id) {
           // Check if the current class contains a method with the same
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index a686c05022463..ae1e5249fa358 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -151,7 +151,6 @@ bool vmIntrinsics::should_be_pinned(vmIntrinsics::ID id) {
 #endif
   case vmIntrinsics::_currentTimeMillis:
   case vmIntrinsics::_nanoTime:
-  case vmIntrinsics::_blackhole:
     return true;
   default:
     return false;
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index d36b3867a885c..f3523d1620b9f 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -534,9 +534,6 @@ class methodHandle;
    do_name(     getObjectSize_name,                               "getObjectSize0")                                     \
    do_alias(    getObjectSize_signature,                          long_object_long_signature)                           \
                                                                                                                         \
-  /* special marker for blackholed methods: */                                                                          \
-  do_intrinsic(_blackhole,                java_lang_Object,       blackhole_name, star_name, F_S)                       \
-                                                                                                                        \
   /* unsafe memory references (there are a lot of them...) */                                                           \
   do_signature(getReference_signature,    "(Ljava/lang/Object;J)Ljava/lang/Object;")                                    \
   do_signature(putReference_signature,    "(Ljava/lang/Object;JLjava/lang/Object;)V")                                   \
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index 4fe2054390ffb..88502d04ca344 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -283,7 +283,6 @@
   template(signature_name,                            "signature")                                \
   template(slot_name,                                 "slot")                                     \
   template(trusted_final_name,                        "trustedFinal")                             \
-  template(blackhole_name,                            "<blackhole>")  /*fake name*/               \
                                                                                                   \
   /* Support for annotations (JDK 1.5 and above) */                                               \
                                                                                                   \
diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index e0d7b2883780c..193c791df7457 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -286,11 +286,6 @@ static void register_command(TypedMethodOptionMatcher* matcher,
   }
   assert(CompilerOracle::option_matches_type(option, value), "Value must match option type");
 
-  if (option == CompileCommand::Blackhole && !UnlockDiagnosticVMOptions) {
-    warning("Blackhole compile option is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions");
-    return;
-  }
-
   matcher->init(option, option_list);
   matcher->set_value<T>(value);
   option_list = matcher;
@@ -414,19 +409,6 @@ bool CompilerOracle::should_break_at(const methodHandle& method) {
   return check_predicate(CompileCommand::Break, method);
 }
 
-bool CompilerOracle::should_blackhole(const methodHandle& method) {
-  if (!check_predicate(CompileCommand::Blackhole, method)) {
-    return false;
-  }
-  guarantee(UnlockDiagnosticVMOptions, "Checked during initial parsing");
-  if (method->result_type() != T_VOID) {
-    warning("Blackhole compile option only works for methods with void type: %s",
-            method->name_and_sig_as_C_string());
-    return false;
-  }
-  return true;
-}
-
 static enum CompileCommand parse_option_name(const char* line, int* bytes_read, char* errorbuf, int bufsize) {
   assert(ARRAY_SIZE(option_names) == static_cast<int>(CompileCommand::Count), "option_names size mismatch");
 
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 0ca960d9eba52..23cfde6f0625b 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -51,7 +51,6 @@ class methodHandle;
   option(Print, "print", Bool) \
   option(Inline,  "inline", Bool) \
   option(DontInline,  "dontinline", Bool) \
-  option(Blackhole,  "blackhole", Bool) \
   option(CompileOnly, "compileonly", Bool)\
   option(Exclude, "exclude", Bool) \
   option(Break, "break", Bool) \
@@ -142,9 +141,6 @@ class CompilerOracle : AllStatic {
   // Tells whether to break when compiling method
   static bool should_break_at(const methodHandle& method);
 
-  // Tells whether to blackhole when compiling method
-  static bool should_blackhole(const methodHandle& method);
-
   // Tells whether there are any methods to print for print_method_statistics()
   static bool should_print_methods();
 
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 4becb5bedc169..36ab93124d99e 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -675,8 +675,6 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt
   case vmIntrinsics::_VectorInsert:
   case vmIntrinsics::_VectorExtract:
     return EnableVectorSupport;
-  case vmIntrinsics::_blackhole:
-    break;
 
   default:
     return false;
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 74be3d0e08c38..7359df5689515 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -44,7 +44,6 @@ macro(ArrayCopy)
 macro(AryEq)
 macro(AtanD)
 macro(Binary)
-macro(Blackhole)
 macro(Bool)
 macro(BoxLock)
 macro(ReverseBytesI)
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 3468593932499..1d997b1e206d2 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -3561,8 +3561,6 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
     }
     break;
   }
-  case Op_Blackhole:
-    break;
   case Op_RangeCheck: {
     RangeCheckNode* rc = n->as_RangeCheck();
     Node* iff = new IfNode(rc->in(0), rc->in(1), rc->_prob, rc->_fcnt);
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index e51fa2c76852b..77363b1592b70 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -110,7 +110,7 @@ JVMState* LibraryIntrinsic::generate(JVMState* jvms) {
   const int bci    = kit.bci();
 
   // Try to inline the intrinsic.
-  if (callee->check_intrinsic_candidate() &&
+  if ((CheckIntrinsics ? callee->intrinsic_candidate() : true) &&
       kit.try_to_inline(_last_predicate)) {
     const char *inline_msg = is_virtual() ? "(intrinsic, virtual)"
                                           : "(intrinsic)";
@@ -667,9 +667,6 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_getObjectSize:
     return inline_getObjectSize();
 
-  case vmIntrinsics::_blackhole:
-    return inline_blackhole();
-
   default:
     // If you get here, it may be that someone has added a new intrinsic
     // to the list in vmSymbols.hpp without implementing it here.
@@ -6851,33 +6848,3 @@ bool LibraryCallKit::inline_getObjectSize() {
 
   return true;
 }
-
-//------------------------------- inline_blackhole --------------------------------------
-//
-// Make sure all arguments to this node are alive.
-// This matches methods that were requested to be blackholed through compile commands.
-//
-bool LibraryCallKit::inline_blackhole() {
-  // To preserve the semantics of Java call, we need to null-check the receiver,
-  // if present. Shortcut if receiver is unconditionally null.
-  Node* receiver = NULL;
-  bool has_receiver = !callee()->is_static();
-  if (has_receiver) {
-    receiver = null_check_receiver();
-    if (stopped()) {
-      return true;
-    }
-  }
-
-  // Bind call arguments as blackhole arguments to keep them alive
-  Node* bh = insert_mem_bar(Op_Blackhole);
-  if (has_receiver) {
-    bh->add_req(receiver);
-  }
-  uint nargs = callee()->arg_size();
-  for (uint i = has_receiver ? 1 : 0; i < nargs; i++) {
-    bh->add_req(argument(i));
-  }
-
-  return true;
-}
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 6395a29f38e4b..021f7dd79d0a6 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -344,7 +344,5 @@ class LibraryCallKit : public GraphKit {
   }
 
   bool inline_getObjectSize();
-
-  bool inline_blackhole();
 };
 
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index dbec14a171dc0..90d221964cd34 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -33,7 +33,6 @@
 #include "opto/addnode.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/cfgnode.hpp"
-#include "opto/regalloc.hpp"
 #include "opto/compile.hpp"
 #include "opto/connode.hpp"
 #include "opto/convertnode.hpp"
@@ -3222,7 +3221,6 @@ MemBarNode* MemBarNode::make(Compile* C, int opcode, int atp, Node* pn) {
   case Op_OnSpinWait:        return new OnSpinWaitNode(C, atp, pn);
   case Op_Initialize:        return new InitializeNode(C, atp, pn);
   case Op_MemBarStoreStore:  return new MemBarStoreStoreNode(C, atp, pn);
-  case Op_Blackhole:         return new BlackholeNode(C, atp, pn);
   default: ShouldNotReachHere(); return NULL;
   }
 }
@@ -3457,27 +3455,6 @@ MemBarNode* MemBarNode::leading_membar() const {
   return mb;
 }
 
-#ifndef PRODUCT
-void BlackholeNode::format(PhaseRegAlloc* ra, outputStream* st) const {
-  st->print("blackhole ");
-  bool first = true;
-  for (uint i = 0; i < req(); i++) {
-    Node* n = in(i);
-    if (n != NULL && OptoReg::is_valid(ra->get_reg_first(n))) {
-      if (first) {
-        first = false;
-      } else {
-        st->print(", ");
-      }
-      char buf[128];
-      ra->dump_register(n, buf);
-      st->print("%s", buf);
-    }
-  }
-  st->cr();
-}
-#endif
-
 //===========================InitializeNode====================================
 // SUMMARY:
 // This node acts as a memory barrier on raw memory, after some raw stores.
diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
index 275165c75f046..b9ee30fe30c55 100644
--- a/src/hotspot/share/opto/memnode.hpp
+++ b/src/hotspot/share/opto/memnode.hpp
@@ -1335,26 +1335,6 @@ class OnSpinWaitNode: public MemBarNode {
   virtual int Opcode() const;
 };
 
-//------------------------------BlackholeNode----------------------------
-// Blackhole all arguments. This node would survive through the compiler
-// the effects on its arguments, and would be finally matched to nothing.
-class BlackholeNode : public MemBarNode {
-public:
-  BlackholeNode(Compile* C, int alias_idx, Node* precedent)
-    : MemBarNode(C, alias_idx, precedent) {}
-  virtual int   Opcode() const;
-  virtual uint ideal_reg() const { return 0; } // not matched in the AD file
-  const RegMask &in_RegMask(uint idx) const {
-    // Fake the incoming arguments mask for blackholes: accept all registers
-    // and all stack slots. This would avoid moving the arguments for the
-    // call that never happens.
-    return RegMask::All;
-  }
-#ifndef PRODUCT
-  virtual void format(PhaseRegAlloc* ra, outputStream* st) const;
-#endif
-};
-
 // Isolation of object setup after an AllocateNode and before next safepoint.
 // (See comment in memnode.cpp near InitializeNode::InitializeNode for semantics.)
 class InitializeNode: public MemBarNode {
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 32f1cc02cadce..35192e27f7005 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -44,7 +44,6 @@ class AllocateNode;
 class ArrayCopyNode;
 class BaseCountedLoopNode;
 class BaseCountedLoopEndNode;
-class BlackholeNode;
 class Block;
 class BoolNode;
 class BoxLockNode;
diff --git a/src/hotspot/share/opto/regmask.cpp b/src/hotspot/share/opto/regmask.cpp
index 9710ed3cb22c9..88a744f9f7f30 100644
--- a/src/hotspot/share/opto/regmask.cpp
+++ b/src/hotspot/share/opto/regmask.cpp
@@ -51,13 +51,6 @@ void OptoReg::dump(int r, outputStream *st) {
 //=============================================================================
 const RegMask RegMask::Empty;
 
-const RegMask RegMask::All(
-# define BODY(I) -1,
-  FORALL_BODY
-# undef BODY
-  0
-);
-
 //=============================================================================
 bool RegMask::is_vector(uint ireg) {
   return (ireg == Op_VecA || ireg == Op_VecS || ireg == Op_VecD ||
diff --git a/src/hotspot/share/opto/regmask.hpp b/src/hotspot/share/opto/regmask.hpp
index 8d862eb128cf0..2d4d19caf107a 100644
--- a/src/hotspot/share/opto/regmask.hpp
+++ b/src/hotspot/share/opto/regmask.hpp
@@ -356,7 +356,6 @@ class RegMask {
 #endif
 
   static const RegMask Empty;   // Common empty mask
-  static const RegMask All;     // Common all mask
 
   static bool can_represent(OptoReg::Name reg) {
     // NOTE: -1 in computation reflects the usage of the last
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 9956cc40e8e4b..384977e107a02 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -1596,7 +1596,6 @@ typedef HashtableEntry<InstanceKlass*, mtClass>  KlassHashtableEntry;
   declare_c2_type(MemBarVolatileNode, MemBarNode)                         \
   declare_c2_type(MemBarCPUOrderNode, MemBarNode)                         \
   declare_c2_type(OnSpinWaitNode, MemBarNode)                             \
-  declare_c2_type(BlackholeNode, MemBarNode)                              \
   declare_c2_type(InitializeNode, MemBarNode)                             \
   declare_c2_type(ThreadLocalNode, Node)                                  \
   declare_c2_type(Opaque1Node, Node)                                      \
diff --git a/test/hotspot/jtreg/ProblemList-Xcomp.txt b/test/hotspot/jtreg/ProblemList-Xcomp.txt
index d69c9d02eb4ff..35cc36d97e0ac 100644
--- a/test/hotspot/jtreg/ProblemList-Xcomp.txt
+++ b/test/hotspot/jtreg/ProblemList-Xcomp.txt
@@ -28,26 +28,3 @@
 #############################################################################
 
 vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/TestDescription.java 8205957 generic-all
-
-compiler/blackhole/BlackholeDiagnosticUnlockTest.java           8258101 generic-all
-compiler/blackhole/BlackholeInstanceReturnTest.java#c1          8258101 generic-all
-compiler/blackhole/BlackholeInstanceReturnTest.java#c1-no-coops 8258101 generic-all
-compiler/blackhole/BlackholeInstanceReturnTest.java#c2          8258101 generic-all
-compiler/blackhole/BlackholeInstanceReturnTest.java#c2-no-coops 8258101 generic-all
-compiler/blackhole/BlackholeInstanceTest.java#c1                8258101 generic-all
-compiler/blackhole/BlackholeInstanceTest.java#c1-no-coops       8258101 generic-all
-compiler/blackhole/BlackholeInstanceTest.java#c2                8258101 generic-all
-compiler/blackhole/BlackholeInstanceTest.java#c2-no-coops       8258101 generic-all
-compiler/blackhole/BlackholeNonVoidWarningTest.java             8258101 generic-all
-compiler/blackhole/BlackholeNullCheckTest.java#c1               8258101 generic-all
-compiler/blackhole/BlackholeNullCheckTest.java#c1-no-coops      8258101 generic-all
-compiler/blackhole/BlackholeNullCheckTest.java#c2               8258101 generic-all
-compiler/blackhole/BlackholeNullCheckTest.java#c2-no-coops      8258101 generic-all
-compiler/blackhole/BlackholeStaticReturnTest.java#c1            8258101 generic-all
-compiler/blackhole/BlackholeStaticReturnTest.java#c1-no-coops   8258101 generic-all
-compiler/blackhole/BlackholeStaticReturnTest.java#c2            8258101 generic-all
-compiler/blackhole/BlackholeStaticReturnTest.java#c2-no-coops   8258101 generic-all
-compiler/blackhole/BlackholeStaticTest.java#c1                  8258101 generic-all
-compiler/blackhole/BlackholeStaticTest.java#c1-no-coops         8258101 generic-all
-compiler/blackhole/BlackholeStaticTest.java#c2                  8258101 generic-all
-compiler/blackhole/BlackholeStaticTest.java#c2-no-coops         8258101 generic-all
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index a2b4b409c7c6a..1cd45d79eeb66 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -97,7 +97,6 @@ hotspot_slow_compiler = \
 
 tier1_compiler_1 = \
   compiler/arraycopy/ \
-  compiler/blackhole/ \
   compiler/c1/ \
   compiler/c2/ \
   -compiler/c2/Test6850611.java \
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeDiagnosticUnlockTest.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeDiagnosticUnlockTest.java
deleted file mode 100644
index 45eb8022fcf97..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeDiagnosticUnlockTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @library /test/lib
- * @build compiler.blackhole.BlackholeTarget
- * @run driver compiler.blackhole.BlackholeDiagnosticUnlockTest
- */
-
-package compiler.blackhole;
-
-import java.io.IOException;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class BlackholeDiagnosticUnlockTest {
-
-    private static final int CYCLES = 1_000_000;
-    private static final int TRIES = 10;
-
-    public static void main(String[] args) throws IOException {
-        if (args.length == 0) {
-            driver();
-        } else {
-            runner();
-        }
-    }
-
-    public static void driver() throws IOException {
-       final String msg = "Blackhole compile option is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions";
-
-       if (!Platform.isDebugBuild()) { // UnlockDiagnosticVMOptions is true in debug
-           ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-               "-Xmx128m",
-               "-Xbatch",
-               "-XX:CompileCommand=quiet",
-               "-XX:CompileCommand=option,compiler/blackhole/BlackholeTarget.bh_*,Blackhole",
-               "compiler.blackhole.BlackholeDiagnosticUnlockTest",
-               "run"
-           );
-           OutputAnalyzer output = new OutputAnalyzer(pb.start());
-           output.shouldHaveExitValue(0);
-           output.shouldContain(msg);
-       }
-
-       {
-           ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-               "-Xmx128m",
-               "-XX:-PrintWarnings",
-               "-XX:CompileCommand=quiet",
-               "-XX:CompileCommand=option,compiler/blackhole/BlackholeTarget.bh_*,Blackhole",
-               "compiler.blackhole.BlackholeDiagnosticUnlockTest",
-               "run"
-           );
-           OutputAnalyzer output = new OutputAnalyzer(pb.start());
-           output.shouldHaveExitValue(0);
-           output.shouldNotContain(msg);
-       }
-
-       {
-           ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-               "-Xmx128m",
-               "-XX:+UnlockDiagnosticVMOptions",
-               "-XX:CompileCommand=quiet",
-               "-XX:CompileCommand=option,compiler/blackhole/BlackholeTarget.bh_*,Blackhole",
-               "compiler.blackhole.BlackholeDiagnosticUnlockTest",
-               "run"
-           );
-           OutputAnalyzer output = new OutputAnalyzer(pb.start());
-           output.shouldHaveExitValue(0);
-           output.shouldNotContain(msg);
-       }
-    }
-
-    public static void runner() {
-        for (int t = 0; t < TRIES; t++) {
-            run();
-        }
-    }
-
-    public static void run() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_int_1(c);
-        }
-    }
-
-}
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceReturnTest.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceReturnTest.java
deleted file mode 100644
index 35cb7b467e884..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceReturnTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test id=c1
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceReturnTest
- */
-
-/**
- * @test id=c2
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceReturnTest
- */
-
-/**
- * @test id=c1-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceReturnTest
- */
-
-/**
- * @test id=c2-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceReturnTest
- */
-
-package compiler.blackhole;
-
-public class BlackholeInstanceReturnTest {
-
-    public static void main(String[] args) {
-        runTries(BlackholeInstanceReturnTest::test_boolean);
-        runTries(BlackholeInstanceReturnTest::test_byte);
-        runTries(BlackholeInstanceReturnTest::test_char);
-        runTries(BlackholeInstanceReturnTest::test_short);
-        runTries(BlackholeInstanceReturnTest::test_int);
-        runTries(BlackholeInstanceReturnTest::test_float);
-        runTries(BlackholeInstanceReturnTest::test_long);
-        runTries(BlackholeInstanceReturnTest::test_double);
-        runTries(BlackholeInstanceReturnTest::test_Object);
-    }
-
-    private static final int CYCLES = 1_000_000;
-    private static final int TRIES = 10;
-
-    public static void runTries(Runnable r) {
-        for (int t = 0; t < TRIES; t++) {
-            BlackholeTarget.clear();
-            r.run();
-            BlackholeTarget.shouldBeEntered();
-        }
-    }
-
-    private static void test_boolean() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_boolean((c & 0x1) == 0) != false) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_byte() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_byte((byte)c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_char() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_char((char)c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_short() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_short((short)c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_int() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_int(c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_float() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_float(c) != 0F) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_long() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_long(c) != 0L) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_double() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            if (t.bh_ir_double(c) != 0D) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_Object() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            Object o = new Object();
-            if (t.bh_ir_Object(o) != null) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-}
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceTest.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceTest.java
deleted file mode 100644
index b832ae15c75e2..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceTest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test id=c1
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceTest
- */
-
-/**
- * @test id=c2
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceTest
- */
-
-/**
- * @test id=c1-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceTest
- */
-
-/**
- * @test id=c2-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeInstanceTest
- */
-
-package compiler.blackhole;
-
-public class BlackholeInstanceTest {
-
-    public static void main(String[] args) {
-        runTries(BlackholeInstanceTest::test_boolean_0);
-        runTries(BlackholeInstanceTest::test_byte_0);
-        runTries(BlackholeInstanceTest::test_char_0);
-        runTries(BlackholeInstanceTest::test_short_0);
-        runTries(BlackholeInstanceTest::test_int_0);
-        runTries(BlackholeInstanceTest::test_float_0);
-        runTries(BlackholeInstanceTest::test_long_0);
-        runTries(BlackholeInstanceTest::test_double_0);
-        runTries(BlackholeInstanceTest::test_Object_0);
-
-        runTries(BlackholeInstanceTest::test_boolean_1);
-        runTries(BlackholeInstanceTest::test_byte_1);
-        runTries(BlackholeInstanceTest::test_char_1);
-        runTries(BlackholeInstanceTest::test_short_1);
-        runTries(BlackholeInstanceTest::test_int_1);
-        runTries(BlackholeInstanceTest::test_float_1);
-        runTries(BlackholeInstanceTest::test_long_1);
-        runTries(BlackholeInstanceTest::test_double_1);
-        runTries(BlackholeInstanceTest::test_Object_1);
-
-        runTries(BlackholeInstanceTest::test_boolean_2);
-        runTries(BlackholeInstanceTest::test_byte_2);
-        runTries(BlackholeInstanceTest::test_char_2);
-        runTries(BlackholeInstanceTest::test_short_2);
-        runTries(BlackholeInstanceTest::test_int_2);
-        runTries(BlackholeInstanceTest::test_float_2);
-        runTries(BlackholeInstanceTest::test_long_2);
-        runTries(BlackholeInstanceTest::test_double_2);
-        runTries(BlackholeInstanceTest::test_Object_2);
-    }
-
-    private static final int CYCLES = 1_000_000;
-    private static final int TRIES = 10;
-
-    public static void runTries(Runnable r) {
-        for (int t = 0; t < TRIES; t++) {
-            BlackholeTarget.clear();
-            r.run();
-            if (t == TRIES - 1) {
-               BlackholeTarget.shouldNotBeEntered();
-            }
-        }
-    }
-
-    private static void test_boolean_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_boolean_0();
-        }
-    }
-
-    private static void test_byte_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_byte_0();
-        }
-    }
-
-    private static void test_char_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_char_0();
-        }
-    }
-
-    private static void test_short_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_short_0();
-        }
-    }
-
-    private static void test_int_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_int_0();
-        }
-    }
-
-    private static void test_float_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_float_0();
-        }
-    }
-
-    private static void test_long_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_long_0();
-        }
-    }
-
-    private static void test_double_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_double_0();
-        }
-    }
-
-    private static void test_Object_0() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_Object_0();
-        }
-    }
-
-    private static void test_boolean_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_boolean_1((c & 0x1) == 0);
-        }
-    }
-
-    private static void test_byte_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_byte_1((byte)c);
-        }
-    }
-
-    private static void test_char_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_char_1((char)c);
-        }
-    }
-
-    private static void test_short_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_short_1((short)c);
-        }
-    }
-
-    private static void test_int_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_int_1(c);
-        }
-    }
-
-    private static void test_float_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_float_1(c);
-        }
-    }
-
-    private static void test_long_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_long_1(c);
-        }
-    }
-
-    private static void test_double_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_double_1(c);
-        }
-    }
-
-    private static void test_Object_1() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            Object o = new Object();
-            t.bh_i_Object_1(o);
-        }
-    }
-
-    private static void test_boolean_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_boolean_2((c & 0x1) == 0, (c & 0x2) == 0);
-        }
-    }
-
-    private static void test_byte_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_byte_2((byte)c, (byte)(c + 1));
-        }
-    }
-
-    private static void test_char_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_char_2((char)c, (char)(c + 1));
-        }
-    }
-
-    private static void test_short_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_short_2((short)c, (short)(c + 1));
-        }
-    }
-
-    private static void test_int_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_int_2(c, c + 1);
-        }
-    }
-
-    private static void test_float_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_float_2(c, c + 1);
-        }
-    }
-
-    private static void test_long_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_long_2(c, c + 1);
-        }
-    }
-
-    private static void test_double_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            t.bh_i_double_2(c, c + 1);
-        }
-    }
-
-    private static void test_Object_2() {
-        BlackholeTarget t = new BlackholeTarget();
-        for (int c = 0; c < CYCLES; c++) {
-            Object o1 = new Object();
-            Object o2 = new Object();
-            t.bh_i_Object_2(o1, o2);
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeNonVoidWarningTest.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeNonVoidWarningTest.java
deleted file mode 100644
index 671ab705234ca..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeNonVoidWarningTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @library /test/lib
- * @build compiler.blackhole.BlackholeTarget
- * @run driver compiler.blackhole.BlackholeNonVoidWarningTest
- */
-
-package compiler.blackhole;
-
-import java.io.IOException;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class BlackholeNonVoidWarningTest {
-
-    private static final int CYCLES = 1_000_000;
-    private static final int TRIES = 10;
-
-    public static void main(String[] args) throws IOException {
-        if (args.length == 0) {
-            driver();
-        } else {
-            runner();
-        }
-    }
-
-    public static void driver() throws IOException {
-       final String msg = "Blackhole compile option only works for methods with void type: compiler.blackhole.BlackholeTarget.bh_sr_int(I)I";
-
-       {
-           ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-               "-Xmx128m",
-               "-Xbatch",
-               "-XX:+UnlockDiagnosticVMOptions",
-               "-XX:CompileCommand=quiet",
-               "-XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*",
-               "compiler.blackhole.BlackholeNonVoidWarningTest",
-               "run"
-           );
-           OutputAnalyzer output = new OutputAnalyzer(pb.start());
-           output.shouldHaveExitValue(0);
-           output.shouldContain(msg);
-       }
-
-       {
-           ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-               "-Xmx128m",
-               "-XX:-PrintWarnings",
-               "-XX:+UnlockDiagnosticVMOptions",
-               "-XX:CompileCommand=quiet",
-               "-XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*",
-               "compiler.blackhole.BlackholeNonVoidWarningTest",
-               "run"
-           );
-           OutputAnalyzer output = new OutputAnalyzer(pb.start());
-           output.shouldHaveExitValue(0);
-           output.shouldNotContain(msg);
-       }
-    }
-
-    public static void runner() {
-        for (int t = 0; t < TRIES; t++) {
-            run();
-        }
-    }
-
-    public static void run() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_int(c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-}
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeNullCheckTest.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeNullCheckTest.java
deleted file mode 100644
index 645fcd61dfc8b..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeNullCheckTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test id=c1
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeNullCheckTest
- */
-
-/**
- * @test id=c2
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeNullCheckTest
- */
-
-/**
- * @test id=c1-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeNullCheckTest
- */
-
-/**
- * @test id=c2-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeNullCheckTest
- */
-
-package compiler.blackhole;
-
-public class BlackholeNullCheckTest {
-
-    public static void main(String[] args) {
-        BlackholeNullCheckTest t = new BlackholeNullCheckTest();
-        runTries(t::test_local_sf);
-        runTries(t::test_local_s);
-        runTries(t::test_local);
-        runTries(t::test_field_sf);
-        runTries(t::test_field_s);
-        runTries(t::test_field);
-    }
-
-    private static final int CYCLES = 1_000_000;
-    private static final int TRIES = 10;
-
-    public static void runTries(Runnable r) {
-        for (int t = 0; t < TRIES; t++) {
-            r.run();
-        }
-    }
-
-    static final BlackholeTarget BH_SF_TARGET = null;
-    static       BlackholeTarget BH_S_TARGET = null;
-                 BlackholeTarget BH_TARGET = null;
-
-    private void test_local_sf() {
-        test_with(BH_SF_TARGET);
-    }
-
-    private void test_local_s() {
-        test_with(BH_S_TARGET);
-    }
-
-    private void test_local() {
-        test_with(BH_TARGET);
-    }
-
-    private void test_with(BlackholeTarget t) {
-        try {
-            t.bh_i_boolean_1(false);
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-        }
-
-        try {
-            t.call_for_null_check();
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-            // Expected
-        }
-    }
-
-    private void test_field_sf() {
-        try {
-            BH_SF_TARGET.bh_i_boolean_1(false);
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-        }
-
-        try {
-            BH_SF_TARGET.call_for_null_check();
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-            // Expected
-        }
-    }
-
-    private void test_field_s() {
-        try {
-            BH_S_TARGET.bh_i_boolean_1(false);
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-        }
-
-        try {
-            BH_S_TARGET.call_for_null_check();
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-            // Expected
-        }
-    }
-
-    private void test_field() {
-        try {
-            BH_TARGET.bh_i_boolean_1(false);
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-        }
-
-        try {
-            BH_TARGET.call_for_null_check();
-            throw new IllegalStateException("Expected NPE");
-        } catch (NullPointerException npe) {
-            // Expected
-        }
-    }
-
-}
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeStaticReturnTest.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeStaticReturnTest.java
deleted file mode 100644
index 722ba0b327908..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeStaticReturnTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test id=c1
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticReturnTest
- */
-
-/**
- * @test id=c2
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticReturnTest
- */
-
-/**
- * @test id=c1-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticReturnTest
- */
-
-/**
- * @test id=c2-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticReturnTest
- */
-
-package compiler.blackhole;
-
-public class BlackholeStaticReturnTest {
-
-    public static void main(String[] args) {
-        runTries(BlackholeStaticReturnTest::test_boolean);
-        runTries(BlackholeStaticReturnTest::test_byte);
-        runTries(BlackholeStaticReturnTest::test_char);
-        runTries(BlackholeStaticReturnTest::test_short);
-        runTries(BlackholeStaticReturnTest::test_int);
-        runTries(BlackholeStaticReturnTest::test_float);
-        runTries(BlackholeStaticReturnTest::test_long);
-        runTries(BlackholeStaticReturnTest::test_double);
-        runTries(BlackholeStaticReturnTest::test_Object);
-    }
-
-    private static final int CYCLES = 1_000_000;
-    private static final int TRIES = 10;
-
-    public static void runTries(Runnable r) {
-        for (int t = 0; t < TRIES; t++) {
-            BlackholeTarget.clear();
-            r.run();
-            BlackholeTarget.shouldBeEntered();
-        }
-    }
-
-    private static void test_boolean() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_boolean((c & 0x1) == 0) != false) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_byte() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_byte((byte)c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_char() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_char((char)c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_short() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_short((short)c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_int() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_int(c) != 0) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_float() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_float(c) != 0F) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_long() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_long(c) != 0L) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_double() {
-        for (int c = 0; c < CYCLES; c++) {
-            if (BlackholeTarget.bh_sr_double(c) != 0D) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-    private static void test_Object() {
-        for (int c = 0; c < CYCLES; c++) {
-            Object o = new Object();
-            if (BlackholeTarget.bh_sr_Object(o) != null) {
-                throw new AssertionError("Return value error");
-            }
-        }
-    }
-
-}
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeStaticTest.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeStaticTest.java
deleted file mode 100644
index 9ef4d3923371c..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeStaticTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test id=c1
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticTest
- */
-
-/**
- * @test id=c2
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticTest
- */
-
-/**
- * @test id=c1-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:TieredStopAtLevel=1
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticTest
- */
-
-/**
- * @test id=c2-no-coops
- * @requires vm.bits == "64"
- * @build compiler.blackhole.BlackholeTarget
- *
- * @run main/othervm
- *      -Xmx1g -XX:-UseCompressedOops
- *      -Xbatch -XX:-TieredCompilation
- *      -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *      -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
- *      compiler.blackhole.BlackholeStaticTest
- */
-
-package compiler.blackhole;
-
-public class BlackholeStaticTest {
-
-    public static void main(String[] args) {
-        runTries(BlackholeStaticTest::test_boolean_0);
-        runTries(BlackholeStaticTest::test_byte_0);
-        runTries(BlackholeStaticTest::test_char_0);
-        runTries(BlackholeStaticTest::test_short_0);
-        runTries(BlackholeStaticTest::test_int_0);
-        runTries(BlackholeStaticTest::test_float_0);
-        runTries(BlackholeStaticTest::test_long_0);
-        runTries(BlackholeStaticTest::test_double_0);
-        runTries(BlackholeStaticTest::test_Object_0);
-
-        runTries(BlackholeStaticTest::test_boolean_1);
-        runTries(BlackholeStaticTest::test_byte_1);
-        runTries(BlackholeStaticTest::test_char_1);
-        runTries(BlackholeStaticTest::test_short_1);
-        runTries(BlackholeStaticTest::test_int_1);
-        runTries(BlackholeStaticTest::test_float_1);
-        runTries(BlackholeStaticTest::test_long_1);
-        runTries(BlackholeStaticTest::test_double_1);
-        runTries(BlackholeStaticTest::test_Object_1);
-
-        runTries(BlackholeStaticTest::test_boolean_2);
-        runTries(BlackholeStaticTest::test_byte_2);
-        runTries(BlackholeStaticTest::test_char_2);
-        runTries(BlackholeStaticTest::test_short_2);
-        runTries(BlackholeStaticTest::test_int_2);
-        runTries(BlackholeStaticTest::test_float_2);
-        runTries(BlackholeStaticTest::test_long_2);
-        runTries(BlackholeStaticTest::test_double_2);
-        runTries(BlackholeStaticTest::test_Object_2);
-    }
-
-    private static final int CYCLES = 1_000_000;
-    private static final int TRIES = 10;
-
-    public static void runTries(Runnable r) {
-        for (int t = 0; t < TRIES; t++) {
-            BlackholeTarget.clear();
-            r.run();
-            if (t == TRIES - 1) {
-               BlackholeTarget.shouldNotBeEntered();
-            }
-        }
-    }
-
-    private static void test_boolean_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_boolean_0();
-        }
-    }
-
-    private static void test_byte_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_byte_0();
-        }
-    }
-
-    private static void test_char_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_char_0();
-        }
-    }
-
-    private static void test_short_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_short_0();
-        }
-    }
-
-    private static void test_int_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_int_0();
-        }
-    }
-
-    private static void test_float_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_float_0();
-        }
-    }
-
-    private static void test_long_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_long_0();
-        }
-    }
-
-    private static void test_double_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_double_0();
-        }
-    }
-
-    private static void test_Object_0() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_Object_0();
-        }
-    }
-
-    private static void test_boolean_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_boolean_1((c & 0x1) == 0);
-        }
-    }
-
-    private static void test_byte_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_byte_1((byte)c);
-        }
-    }
-
-    private static void test_char_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_char_1((char)c);
-        }
-    }
-
-    private static void test_short_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_short_1((short)c);
-        }
-    }
-
-    private static void test_int_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_int_1(c);
-        }
-    }
-
-    private static void test_float_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_float_1(c);
-        }
-    }
-
-    private static void test_long_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_long_1(c);
-        }
-    }
-
-    private static void test_double_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_double_1(c);
-        }
-    }
-
-    private static void test_Object_1() {
-        for (int c = 0; c < CYCLES; c++) {
-            Object o = new Object();
-            BlackholeTarget.bh_s_Object_1(o);
-        }
-    }
-
-    private static void test_boolean_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_boolean_2((c & 0x1) == 0, (c & 0x2) == 0);
-        }
-    }
-
-    private static void test_byte_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_byte_2((byte)c, (byte)(c + 1));
-        }
-    }
-
-    private static void test_char_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_char_2((char)c, (char)(c + 1));
-        }
-    }
-
-    private static void test_short_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_short_2((short)c, (short)(c + 1));
-        }
-    }
-
-    private static void test_int_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_int_2(c, c + 1);
-        }
-    }
-
-    private static void test_float_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_float_2(c, c + 1);
-        }
-    }
-
-    private static void test_long_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_long_2(c, c + 1);
-        }
-    }
-
-    private static void test_double_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            BlackholeTarget.bh_s_double_2(c, c + 1);
-        }
-    }
-
-    private static void test_Object_2() {
-        for (int c = 0; c < CYCLES; c++) {
-            Object o1 = new Object();
-            Object o2 = new Object();
-            BlackholeTarget.bh_s_Object_2(o1, o2);
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/compiler/blackhole/BlackholeTarget.java b/test/hotspot/jtreg/compiler/blackhole/BlackholeTarget.java
deleted file mode 100644
index 3d2c888210239..0000000000000
--- a/test/hotspot/jtreg/compiler/blackhole/BlackholeTarget.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package compiler.blackhole;
-
-import java.lang.reflect.*;
-
-public class BlackholeTarget {
-    private static String entered;
-
-    private static void registerEntered(String label) {
-        if (entered == null) {
-           entered = label;
-        } else if (!entered.equals(label)) {
-           throw new IllegalStateException("Trying to register enter with overwrite: " + entered + " -> " + label);
-        }
-    }
-
-    public static void clear() {
-        entered = null;
-    }
-
-    public static void shouldBeEntered() {
-        if (entered == null) {
-            throw new IllegalStateException("Should have been entered");
-        }
-    }
-
-    public static void shouldNotBeEntered() {
-        if (entered != null) {
-            throw new IllegalStateException("Should not have been entered: " + entered);
-        }
-    }
-
-    public void call_for_null_check() {}
-
-    public static void    bh_s_boolean_0()           { registerEntered("bh_s_boolean_0"); }
-    public static void    bh_s_byte_0()              { registerEntered("bh_s_byte_0");    }
-    public static void    bh_s_short_0()             { registerEntered("bh_s_short_0");   }
-    public static void    bh_s_char_0()              { registerEntered("bh_s_char_0");    }
-    public static void    bh_s_int_0()               { registerEntered("bh_s_int_0");     }
-    public static void    bh_s_float_0()             { registerEntered("bh_s_float_0");   }
-    public static void    bh_s_long_0()              { registerEntered("bh_s_long_0");    }
-    public static void    bh_s_double_0()            { registerEntered("bh_s_double_0");  }
-    public static void    bh_s_Object_0()            { registerEntered("bh_s_Object_0");  }
-
-    public        void    bh_i_boolean_0()           { registerEntered("bh_i_boolean_0"); }
-    public        void    bh_i_byte_0()              { registerEntered("bh_i_byte_0");    }
-    public        void    bh_i_short_0()             { registerEntered("bh_i_short_0");   }
-    public        void    bh_i_char_0()              { registerEntered("bh_i_char_0");    }
-    public        void    bh_i_int_0()               { registerEntered("bh_i_int_0");     }
-    public        void    bh_i_float_0()             { registerEntered("bh_i_float_0");   }
-    public        void    bh_i_long_0()              { registerEntered("bh_i_long_0");    }
-    public        void    bh_i_double_0()            { registerEntered("bh_i_double_0");  }
-    public        void    bh_i_Object_0()            { registerEntered("bh_i_Object_0");  }
-
-    public static void    bh_s_boolean_1(boolean v)  { registerEntered("bh_s_boolean_1"); }
-    public static void    bh_s_byte_1(byte v)        { registerEntered("bh_s_byte_1");    }
-    public static void    bh_s_short_1(short v)      { registerEntered("bh_s_short_1");   }
-    public static void    bh_s_char_1(char v)        { registerEntered("bh_s_char_1");    }
-    public static void    bh_s_int_1(int v)          { registerEntered("bh_s_int_1");     }
-    public static void    bh_s_float_1(float v)      { registerEntered("bh_s_float_1");   }
-    public static void    bh_s_long_1(long v)        { registerEntered("bh_s_long_1");    }
-    public static void    bh_s_double_1(double v)    { registerEntered("bh_s_double_1");  }
-    public static void    bh_s_Object_1(Object v)    { registerEntered("bh_s_Object_1");  }
-
-    public        void    bh_i_boolean_1(boolean v)  { registerEntered("bh_i_boolean_1"); }
-    public        void    bh_i_byte_1(byte v)        { registerEntered("bh_i_byte_1");    }
-    public        void    bh_i_short_1(short v)      { registerEntered("bh_i_short_1");   }
-    public        void    bh_i_char_1(char v)        { registerEntered("bh_i_char_1");    }
-    public        void    bh_i_int_1(int v)          { registerEntered("bh_i_int_1");     }
-    public        void    bh_i_float_1(float v)      { registerEntered("bh_i_float_1");   }
-    public        void    bh_i_long_1(long v)        { registerEntered("bh_i_long_1");    }
-    public        void    bh_i_double_1(double v)    { registerEntered("bh_i_double_1");  }
-    public        void    bh_i_Object_1(Object v)    { registerEntered("bh_i_Object_1");  }
-
-    public static void    bh_s_boolean_2(boolean v1, boolean v2) { registerEntered("bh_s_boolean_2"); }
-    public static void    bh_s_byte_2(byte v1, byte v2)          { registerEntered("bh_s_byte_2");    }
-    public static void    bh_s_short_2(short v1, short v2)       { registerEntered("bh_s_short_2");   }
-    public static void    bh_s_char_2(char v1, char v2)          { registerEntered("bh_s_char_2");    }
-    public static void    bh_s_int_2(int v1, int v2)             { registerEntered("bh_s_int_2");     }
-    public static void    bh_s_float_2(float v1, float v2)       { registerEntered("bh_s_float_2");   }
-    public static void    bh_s_long_2(long v1, long v2)          { registerEntered("bh_s_long_2");    }
-    public static void    bh_s_double_2(double v1, double v2)    { registerEntered("bh_s_double_2");  }
-    public static void    bh_s_Object_2(Object v1, Object v2)    { registerEntered("bh_s_Object_2");  }
-
-    public        void    bh_i_boolean_2(boolean v1, boolean v2) { registerEntered("bh_i_boolean_2"); }
-    public        void    bh_i_byte_2(byte v1, byte v2)          { registerEntered("bh_i_byte_2");    }
-    public        void    bh_i_short_2(short v1, short v2)       { registerEntered("bh_i_short_2");   }
-    public        void    bh_i_char_2(char v1, char v2)          { registerEntered("bh_i_char_2");    }
-    public        void    bh_i_int_2(int v1, int v2)             { registerEntered("bh_i_int_2");     }
-    public        void    bh_i_float_2(float v1, float v2)       { registerEntered("bh_i_float_2");   }
-    public        void    bh_i_long_2(long v1, long v2)          { registerEntered("bh_i_long_2");    }
-    public        void    bh_i_double_2(double v1, double v2)    { registerEntered("bh_i_double_2");  }
-    public        void    bh_i_Object_2(Object v1, Object v2)    { registerEntered("bh_i_Object_2");  }
-
-    public static boolean bh_sr_boolean(boolean v) { registerEntered("bh_sr_boolean"); return false; }
-    public static byte    bh_sr_byte(byte v)       { registerEntered("bh_sr_byte");    return 0;     }
-    public static short   bh_sr_short(short v)     { registerEntered("bh_sr_short");   return 0;     }
-    public static char    bh_sr_char(char v)       { registerEntered("bh_sr_char");    return 0;     }
-    public static int     bh_sr_int(int v)         { registerEntered("bh_sr_int");     return 0;     }
-    public static float   bh_sr_float(float v)     { registerEntered("bh_sr_float");   return 0;     }
-    public static long    bh_sr_long(long v)       { registerEntered("bh_sr_long");    return 0;     }
-    public static double  bh_sr_double(double v)   { registerEntered("bh_sr_double");  return 0;     }
-    public static Object  bh_sr_Object(Object v)   { registerEntered("bh_sr_Object");  return null;  }
-
-    public        boolean bh_ir_boolean(boolean v) { registerEntered("bh_ir_boolean"); return false; }
-    public        byte    bh_ir_byte(byte v)       { registerEntered("bh_ir_byte");    return 0;     }
-    public        short   bh_ir_short(short v)     { registerEntered("bh_ir_short");   return 0;     }
-    public        char    bh_ir_char(char v)       { registerEntered("bh_ir_char");    return 0;     }
-    public        int     bh_ir_int(int v)         { registerEntered("bh_ir_int");     return 0;     }
-    public        float   bh_ir_float(float v)     { registerEntered("bh_ir_float");   return 0;     }
-    public        long    bh_ir_long(long v)       { registerEntered("bh_ir_long");    return 0;     }
-    public        double  bh_ir_double(double v)   { registerEntered("bh_ir_double");  return 0;     }
-    public        Object  bh_ir_Object(Object v)   { registerEntered("bh_ir_Object");  return null;  }
-}

From c0540ffda9c0afe6d890ddef10cfca90d64eb433 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Wed, 6 Jan 2021 14:34:55 +0000
Subject: [PATCH 042/129] 8231627: ThreadsListHandleInErrorHandlingTest.java
 fails in printing all threads

Reviewed-by: eosterlund, coleenp, pchilanomate, sspitsyn
---
 src/hotspot/share/runtime/threadSMR.cpp       | 135 ++++++++++--------
 ...dThreadsListHandleInErrorHandlingTest.java |   8 +-
 .../ThreadsListHandleInErrorHandlingTest.java |   6 +-
 3 files changed, 86 insertions(+), 63 deletions(-)

diff --git a/src/hotspot/share/runtime/threadSMR.cpp b/src/hotspot/share/runtime/threadSMR.cpp
index fa420e8e412d0..9b70bdf753c90 100644
--- a/src/hotspot/share/runtime/threadSMR.cpp
+++ b/src/hotspot/share/runtime/threadSMR.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1106,70 +1106,87 @@ void ThreadsSMRSupport::print_info_on(const Thread* thread, outputStream* st) {
 
 // Print Threads class SMR info.
 void ThreadsSMRSupport::print_info_on(outputStream* st) {
-  // Only grab the Threads_lock if we don't already own it and if we
-  // are not reporting an error.
-  // Note: Not grabbing the Threads_lock during error reporting is
-  // dangerous because the data structures we want to print can be
-  // freed concurrently. However, grabbing the Threads_lock during
-  // error reporting can be equally dangerous since this thread might
-  // block during error reporting or a nested error could leave the
-  // Threads_lock held. The classic no win scenario.
-  //
-  MutexLocker ml((Threads_lock->owned_by_self() || VMError::is_error_reported()) ? NULL : Threads_lock);
-
-  st->print_cr("Threads class SMR info:");
-  st->print_cr("_java_thread_list=" INTPTR_FORMAT ", length=%u, "
-               "elements={", p2i(_java_thread_list),
-               _java_thread_list->length());
-  print_info_elements_on(st, _java_thread_list);
-  st->print_cr("}");
-  if (_to_delete_list != NULL) {
-    st->print_cr("_to_delete_list=" INTPTR_FORMAT ", length=%u, "
-                 "elements={", p2i(_to_delete_list),
-                 _to_delete_list->length());
-    print_info_elements_on(st, _to_delete_list);
+  bool needs_unlock = false;
+  if (Threads_lock->try_lock()) {
+    // We were able to grab the Threads_lock which makes things safe for
+    // this call, but if we are error reporting, then a nested error
+    // could happen with the Threads_lock held.
+    needs_unlock = true;
+  }
+
+  ThreadsList* saved_threads_list = NULL;
+  {
+    ThreadsListHandle tlh;  // make the current ThreadsList safe for reporting
+    saved_threads_list = tlh.list();  // save for later comparison
+
+    st->print_cr("Threads class SMR info:");
+    st->print_cr("_java_thread_list=" INTPTR_FORMAT ", length=%u, elements={",
+                 p2i(saved_threads_list), saved_threads_list->length());
+    print_info_elements_on(st, saved_threads_list);
     st->print_cr("}");
-    for (ThreadsList *t_list = _to_delete_list->next_list();
-         t_list != NULL; t_list = t_list->next_list()) {
-      st->print("next-> " INTPTR_FORMAT ", length=%u, "
-                "elements={", p2i(t_list), t_list->length());
-      print_info_elements_on(st, t_list);
+  }
+
+  if (_to_delete_list != NULL) {
+    if (Threads_lock->owned_by_self()) {
+      // Only safe if we have the Threads_lock.
+      st->print_cr("_to_delete_list=" INTPTR_FORMAT ", length=%u, elements={",
+                   p2i(_to_delete_list), _to_delete_list->length());
+      print_info_elements_on(st, _to_delete_list);
       st->print_cr("}");
+      for (ThreadsList *t_list = _to_delete_list->next_list();
+           t_list != NULL; t_list = t_list->next_list()) {
+        st->print("next-> " INTPTR_FORMAT ", length=%u, elements={",
+                  p2i(t_list), t_list->length());
+        print_info_elements_on(st, t_list);
+        st->print_cr("}");
+      }
+    } else {
+      st->print_cr("_to_delete_list=" INTPTR_FORMAT, p2i(_to_delete_list));
+      st->print_cr("Skipping _to_delete_list fields and contents for safety.");
     }
   }
-  if (!EnableThreadSMRStatistics) {
-    return;
-  }
-  st->print_cr("_java_thread_list_alloc_cnt=" UINT64_FORMAT ", "
-               "_java_thread_list_free_cnt=" UINT64_FORMAT ", "
-               "_java_thread_list_max=%u, "
-               "_nested_thread_list_max=%u",
-               _java_thread_list_alloc_cnt,
-               _java_thread_list_free_cnt,
-               _java_thread_list_max,
-               _nested_thread_list_max);
-  if (_tlh_cnt > 0) {
-    st->print_cr("_tlh_cnt=%u"
-                 ", _tlh_times=%u"
-                 ", avg_tlh_time=%0.2f"
-                 ", _tlh_time_max=%u",
-                 _tlh_cnt, _tlh_times,
-                 ((double) _tlh_times / _tlh_cnt),
-                 _tlh_time_max);
+  if (EnableThreadSMRStatistics) {
+    st->print_cr("_java_thread_list_alloc_cnt=" UINT64_FORMAT ", "
+                 "_java_thread_list_free_cnt=" UINT64_FORMAT ", "
+                 "_java_thread_list_max=%u, "
+                 "_nested_thread_list_max=%u",
+                 _java_thread_list_alloc_cnt,
+                 _java_thread_list_free_cnt,
+                 _java_thread_list_max,
+                 _nested_thread_list_max);
+    if (_tlh_cnt > 0) {
+      st->print_cr("_tlh_cnt=%u"
+                   ", _tlh_times=%u"
+                   ", avg_tlh_time=%0.2f"
+                   ", _tlh_time_max=%u",
+                   _tlh_cnt, _tlh_times,
+                   ((double) _tlh_times / _tlh_cnt),
+                   _tlh_time_max);
+    }
+    if (_deleted_thread_cnt > 0) {
+      st->print_cr("_deleted_thread_cnt=%u"
+                   ", _deleted_thread_times=%u"
+                   ", avg_deleted_thread_time=%0.2f"
+                   ", _deleted_thread_time_max=%u",
+                   _deleted_thread_cnt, _deleted_thread_times,
+                   ((double) _deleted_thread_times / _deleted_thread_cnt),
+                   _deleted_thread_time_max);
+    }
+    st->print_cr("_delete_lock_wait_cnt=%u, _delete_lock_wait_max=%u",
+                 _delete_lock_wait_cnt, _delete_lock_wait_max);
+    st->print_cr("_to_delete_list_cnt=%u, _to_delete_list_max=%u",
+                 _to_delete_list_cnt, _to_delete_list_max);
   }
-  if (_deleted_thread_cnt > 0) {
-    st->print_cr("_deleted_thread_cnt=%u"
-                 ", _deleted_thread_times=%u"
-                 ", avg_deleted_thread_time=%0.2f"
-                 ", _deleted_thread_time_max=%u",
-                 _deleted_thread_cnt, _deleted_thread_times,
-                 ((double) _deleted_thread_times / _deleted_thread_cnt),
-                 _deleted_thread_time_max);
+  if (needs_unlock) {
+    Threads_lock->unlock();
+  } else {
+    if (_java_thread_list != saved_threads_list) {
+      st->print_cr("The _java_thread_list has changed from " INTPTR_FORMAT
+                   " to " INTPTR_FORMAT
+                   " so some of the above information may be stale.",
+                   p2i(saved_threads_list), p2i(_java_thread_list));
+    }
   }
-  st->print_cr("_delete_lock_wait_cnt=%u, _delete_lock_wait_max=%u",
-               _delete_lock_wait_cnt, _delete_lock_wait_max);
-  st->print_cr("_to_delete_list_cnt=%u, _to_delete_list_max=%u",
-               _to_delete_list_cnt, _to_delete_list_max);
 }
 
 // Print ThreadsList elements (4 per line).
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
index 6c99215128fc9..23c133e4952fd 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,8 +93,10 @@ public static void main(String[] args) throws Exception {
         Pattern.compile("Current thread .* _threads_hazard_ptr=0x[0-9A-Fa-f][0-9A-Fa-f]*, _nested_threads_hazard_ptr_cnt=1, _nested_threads_hazard_ptr=0x[0-9A-Fa-f][0-9A-Fa-f]*.*"),
         // We should have a section of Threads class SMR info:
         Pattern.compile("Threads class SMR info:"),
-        // We should have one nested ThreadsListHandle:
-        Pattern.compile(".*, _nested_thread_list_max=1"),
+        // We should have had a double nested ThreadsListHandle since
+        // ThreadsSMRSupport::print_info_on() now protects itself with
+        // a ThreadsListHandle in addition to what the test creates:
+        Pattern.compile(".*, _nested_thread_list_max=2"),
         // The current thread (marked with '=>') in the threads list
         // should show a hazard ptr and a nested hazard ptr:
         Pattern.compile("=>.* JavaThread \"main\" .* _threads_hazard_ptr=0x[0-9A-Fa-f][0-9A-Fa-f]*, _nested_threads_hazard_ptr_cnt=1, _nested_threads_hazard_ptr=0x[0-9A-Fa-f][0-9A-Fa-f]*.*"),
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
index 5bf766389b09c..ceadd67afecbb 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,10 @@ public static void main(String[] args) throws Exception {
         Pattern.compile("Current thread .* _threads_hazard_ptr=0x[0-9A-Fa-f][0-9A-Fa-f]*, _nested_threads_hazard_ptr_cnt=0.*"),
         // We should have a section of Threads class SMR info:
         Pattern.compile("Threads class SMR info:"),
+        // We should have had a single nested ThreadsListHandle since
+        // ThreadsSMRSupport::print_info_on() now protects itself with
+        // a ThreadsListHandle:
+        Pattern.compile(".*, _nested_thread_list_max=1"),
         // The current thread (marked with '=>') in the threads list
         // should show a hazard ptr and no nested hazard ptrs:
         Pattern.compile("=>.* JavaThread \"main\" .* _threads_hazard_ptr=0x[0-9A-Fa-f][0-9A-Fa-f]*, _nested_threads_hazard_ptr_cnt=0.*"),

From f6cb8c558b03dcd7dfa4261406eac7317ed9ed53 Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Wed, 6 Jan 2021 15:11:52 +0000
Subject: [PATCH 043/129] 8258908: Remove JVM option CleanChunkPoolAsync

Reviewed-by: coleenp
---
 src/hotspot/share/gc/serial/defNewGeneration.cpp | 6 +-----
 src/hotspot/share/gc/shared/genCollectedHeap.cpp | 6 +-----
 src/hotspot/share/memory/arena.cpp               | 7 +------
 src/hotspot/share/memory/arena.hpp               | 4 +---
 src/hotspot/share/runtime/globals.hpp            | 3 ---
 src/hotspot/share/runtime/thread.cpp             | 4 +---
 6 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 296415542ad67..227f00fa916a3 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -864,10 +864,6 @@ void DefNewGeneration::gc_epilogue(bool full) {
     to()->check_mangled_unused_area_complete();
   }
 
-  if (!CleanChunkPoolAsync) {
-    Chunk::clean_chunk_pool();
-  }
-
   // update the generation and space performance counters
   update_counters();
   gch->counters()->update_counters();
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
index 884a5bf89026a..4a7f03203c202 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1267,10 +1267,6 @@ void GenCollectedHeap::gc_epilogue(bool full) {
   GenGCEpilogueClosure blk(full);
   generation_iterate(&blk, false);  // not old-to-young.
 
-  if (!CleanChunkPoolAsync) {
-    Chunk::clean_chunk_pool();
-  }
-
   MetaspaceCounters::update_performance_counters();
   CompressedClassSpaceCounters::update_performance_counters();
 };
diff --git a/src/hotspot/share/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp
index 504a1e5214a96..e7939d6f29e3a 100644
--- a/src/hotspot/share/memory/arena.cpp
+++ b/src/hotspot/share/memory/arena.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,11 +154,6 @@ void chunkpool_init() {
   ChunkPool::initialize();
 }
 
-void
-Chunk::clean_chunk_pool() {
-  ChunkPool::clean();
-}
-
 
 //--------------------------------------------------------------------------------------
 // ChunkPoolCleaner implementation
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index 621ce54e40cf8..89493b5f86399 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,8 +85,6 @@ class Chunk: CHeapObj<mtChunk> {
 
   // Start the chunk_pool cleaner task
   static void start_chunk_pool_cleaner_task();
-
-  static void clean_chunk_pool();
 };
 
 //------------------------------Arena------------------------------------------
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 096f1943d6f32..7a9419ca9d5b1 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -167,9 +167,6 @@ const intx ObjectAlignmentInBytes = 8;
           "region.")                                                        \
           range(1, max_uintx)                                               \
                                                                             \
-  develop(bool, CleanChunkPoolAsync, true,                                  \
-          "Clean the chunk pool asynchronously")                            \
-                                                                            \
   product(uint, HandshakeTimeout, 0, DIAGNOSTIC,                            \
           "If nonzero set a timeout in milliseconds for handshakes")        \
                                                                             \
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 980cd730afad3..b245926d6cf4b 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -3676,9 +3676,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     create_vm_init_libraries();
   }
 
-  if (CleanChunkPoolAsync) {
-    Chunk::start_chunk_pool_cleaner_task();
-  }
+  Chunk::start_chunk_pool_cleaner_task();
 
   // Start the service thread
   // The service thread enqueues JVMTI deferred events and does various hashtable

From 722f23610e128991e21ba1b56ddf2b7eec99e5c2 Mon Sep 17 00:00:00 2001
From: Lehua Ding <lehuading@tencent.com>
Date: Wed, 6 Jan 2021 15:36:57 +0000
Subject: [PATCH 044/129] 8259231: Epsilon: improve performance under
 contention during virtual space expansion

Reviewed-by: shade
---
 src/hotspot/share/gc/epsilon/epsilonHeap.cpp | 57 ++++++++++++--------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
index 7e77026ac5a1b..bd937cffca474 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -106,31 +106,44 @@ EpsilonHeap* EpsilonHeap::heap() {
 HeapWord* EpsilonHeap::allocate_work(size_t size) {
   assert(is_object_aligned(size), "Allocation size should be aligned: " SIZE_FORMAT, size);
 
-  HeapWord* res = _space->par_allocate(size);
+  HeapWord* res = NULL;
+  while (true) {
+    // Try to allocate, assume space is available
+    res = _space->par_allocate(size);
+    if (res != NULL) {
+      break;
+    }
 
-  while (res == NULL) {
     // Allocation failed, attempt expansion, and retry:
-    MutexLocker ml(Heap_lock);
-
-    size_t space_left = max_capacity() - capacity();
-    size_t want_space = MAX2(size, EpsilonMinHeapExpand);
-
-    if (want_space < space_left) {
-      // Enough space to expand in bulk:
-      bool expand = _virtual_space.expand_by(want_space);
-      assert(expand, "Should be able to expand");
-    } else if (size < space_left) {
-      // No space to expand in bulk, and this allocation is still possible,
-      // take all the remaining space:
-      bool expand = _virtual_space.expand_by(space_left);
-      assert(expand, "Should be able to expand");
-    } else {
-      // No space left:
-      return NULL;
-    }
+    {
+      MutexLocker ml(Heap_lock);
 
-    _space->set_end((HeapWord *) _virtual_space.high());
-    res = _space->par_allocate(size);
+      // Try to allocate under the lock, assume another thread was able to expand
+      res = _space->par_allocate(size);
+      if (res != NULL) {
+        break;
+      }
+
+      // Expand and loop back if space is available
+      size_t space_left = max_capacity() - capacity();
+      size_t want_space = MAX2(size, EpsilonMinHeapExpand);
+
+      if (want_space < space_left) {
+        // Enough space to expand in bulk:
+        bool expand = _virtual_space.expand_by(want_space);
+        assert(expand, "Should be able to expand");
+      } else if (size < space_left) {
+        // No space to expand in bulk, and this allocation is still possible,
+        // take all the remaining space:
+        bool expand = _virtual_space.expand_by(space_left);
+        assert(expand, "Should be able to expand");
+      } else {
+        // No space left:
+        return NULL;
+      }
+
+      _space->set_end((HeapWord *) _virtual_space.high());
+    }
   }
 
   size_t used = _space->used();

From d25a1bed5636bf983a3d464e16f06e1867d8fd12 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <winterhalter@openjdk.org>
Date: Wed, 6 Jan 2021 15:46:33 +0000
Subject: [PATCH 045/129] 8259224: (ann) getAnnotatedReceiverType should not
 parameterize owner(s) of statically nested classes

Reviewed-by: jfranck
---
 .../classes/java/lang/reflect/Executable.java |  4 +-
 .../TestReceiverTypeOwnerType.java            | 67 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/lang/annotation/typeAnnotations/TestReceiverTypeOwnerType.java

diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
index 3c4be628983ba..9375aa18fe734 100644
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -707,7 +707,9 @@ Type parameterize(Class<?> c) {
         Class<?> ownerClass = c.getDeclaringClass();
         TypeVariable<?>[] typeVars = c.getTypeParameters();
 
-        if (ownerClass == null) { // base case
+        // base case, static nested classes, according to JLS 8.1.3, has no
+        // enclosing instance, therefore its owner is not generified.
+        if (ownerClass == null || Modifier.isStatic(c.getModifiers())) {
             if (typeVars.length == 0)
                 return c;
             else
diff --git a/test/jdk/java/lang/annotation/typeAnnotations/TestReceiverTypeOwnerType.java b/test/jdk/java/lang/annotation/typeAnnotations/TestReceiverTypeOwnerType.java
new file mode 100644
index 0000000000000..964d9ac5eaf65
--- /dev/null
+++ b/test/jdk/java/lang/annotation/typeAnnotations/TestReceiverTypeOwnerType.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8259224
+ * @summary A receiver type's owner type is of the correct type for nested classes.
+ */
+
+import java.lang.reflect.AnnotatedParameterizedType;
+import java.lang.reflect.AnnotatedType;
+
+public class TestReceiverTypeOwnerType<T> {
+
+    public static void main(String[] args) throws Exception {
+        AnnotatedType nested = Class.forName(TestReceiverTypeOwnerType.class.getTypeName() + "$Nested").getMethod("method").getAnnotatedReceiverType();
+        if (!(nested instanceof AnnotatedParameterizedType)) {
+            throw new AssertionError();
+        } else if (!(nested.getAnnotatedOwnerType() instanceof AnnotatedParameterizedType)) {
+            throw new AssertionError();
+        }
+        AnnotatedType inner = Inner.class.getMethod("method").getAnnotatedReceiverType();
+        if (inner instanceof AnnotatedParameterizedType) {
+            throw new AssertionError();
+        } else if (inner.getAnnotatedOwnerType() instanceof AnnotatedParameterizedType) {
+            throw new AssertionError();
+        }
+        AnnotatedType nestedInner = GenericInner.class.getMethod("method").getAnnotatedReceiverType();
+        if (!(nestedInner instanceof AnnotatedParameterizedType)) {
+            throw new AssertionError();
+        } else if (nestedInner.getAnnotatedOwnerType() instanceof AnnotatedParameterizedType) {
+            throw new AssertionError();
+        }
+    }
+
+    public class Nested {
+        public void method(TestReceiverTypeOwnerType<T>.Nested this) { }
+    }
+
+    public static class Inner {
+        public void method(TestReceiverTypeOwnerType.Inner this) { }
+    }
+
+    public static class GenericInner<S> {
+        public void method(TestReceiverTypeOwnerType.GenericInner<S> this) { }
+    }
+}

From 3be6e06958c4304cafee707a29d06d6b2cc5b76b Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 6 Jan 2021 16:20:24 +0000
Subject: [PATCH 046/129] 8259312: VerifyCACerts.java fails as soneraclass2ca
 cert will expire in 90 days

Reviewed-by: mullan
---
 test/jdk/sun/security/lib/cacerts/VerifyCACerts.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index 9178e5047ad51..814ded8a4f856 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -27,7 +27,7 @@
  * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
  *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
  *      8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
- *      8243559 8225072 8258630
+ *      8243559 8225072 8258630 8259312
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -262,6 +262,8 @@ public class VerifyCACerts {
             add("luxtrustglobalrootca [jdk]");
             // Valid until: Wed Mar 17 11:33:33 PDT 2021
             add("quovadisrootca [jdk]");
+            // Valid until: Tue Apr 06 00:29:40 PDT 2021
+            add("soneraclass2ca [jdk]");
         }
     };
 

From d20d2fa957fb1a4a0655dd3d2357cb34d97ab021 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 6 Jan 2021 16:26:23 +0000
Subject: [PATCH 047/129] 8258143: Update --release 16 symbol information for
 JDK 16 build 30 or later

Reviewed-by: iris, erikj
---
 make/data/symbols/java.desktop-G.sym.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/make/data/symbols/java.desktop-G.sym.txt b/make/data/symbols/java.desktop-G.sym.txt
index 5b20574914328..186b90ac482ae 100644
--- a/make/data/symbols/java.desktop-G.sym.txt
+++ b/make/data/symbols/java.desktop-G.sym.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -769,6 +769,9 @@ class name javax/swing/JList$AccessibleJList$AccessibleJListChild
 -method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction;
 method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
 
+class name javax/swing/JPasswordField
+method name setText descriptor (Ljava/lang/String;)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(bound=Zfalse,description="the\u005C;u0020;text\u005C;u0020;of\u005C;u0020;this\u005C;u0020;component")
+
 class name javax/swing/JSlider$AccessibleJSlider
 header extends javax/swing/JComponent$AccessibleJComponent implements javax/accessibility/AccessibleValue,javax/swing/event/ChangeListener nestHost javax/swing/JSlider flags 21
 innerclass innerClass javax/swing/JSlider$AccessibleJSlider outerClass javax/swing/JSlider innerClassName AccessibleJSlider flags 4

From 4a5786b5532782e80c4f769bab9b127e261bade3 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 6 Jan 2021 16:30:30 +0000
Subject: [PATCH 048/129] 8259075: Update the copyright notice in the files
 generated by CLDR Converter tool

Reviewed-by: joehw
---
 .../tools/cldrconverter/CopyrightHeaders.java | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java b/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
index 89c7e0f41aa02..16062de116fc1 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,14 +41,13 @@ class CopyrightHeaders {
         " * Copyright (c) 2012, %d, Oracle and/or its affiliates. All rights reserved.\n" +
         " */\n";
 
-    // Last updated:  - 6/06/2016, 1:42:31 PM
+    // Last updated:  - 1/04/2021
     private static final String UNICODE =
         "/*\n" +
         " * COPYRIGHT AND PERMISSION NOTICE\n" +
         " *\n" +
-        " * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.\n" +
-        " * Distributed under the Terms of Use in \n" +
-        " * http://www.unicode.org/copyright.html.\n" +
+        " * Copyright (c) 1991-2020 Unicode, Inc. All rights reserved.\n" +
+        " * Distributed under the Terms of Use in https://www.unicode.org/copyright.html.\n" +
         " *\n" +
         " * Permission is hereby granted, free of charge, to any person obtaining\n" +
         " * a copy of the Unicode data files and any associated documentation\n" +
@@ -57,14 +56,11 @@ class CopyrightHeaders {
         " * without restriction, including without limitation the rights to use,\n" +
         " * copy, modify, merge, publish, distribute, and/or sell copies of\n" +
         " * the Data Files or Software, and to permit persons to whom the Data Files\n" +
-        " * or Software are furnished to do so, provided that\n" +
-        " * (a) this copyright and permission notice appear with all copies \n" +
-        " * of the Data Files or Software,\n" +
-        " * (b) this copyright and permission notice appear in associated \n" +
-        " * documentation, and\n" +
-        " * (c) there is clear notice in each modified Data File or in the Software\n" +
-        " * as well as in the documentation associated with the Data File(s) or\n" +
-        " * Software that the data or software has been modified.\n" +
+        " * or Software are furnished to do so, provided that either\n" +
+        " * (a) this copyright and permission notice appear with all copies\n" +
+        " * of the Data Files or Software, or\n" +
+        " * (b) this copyright and permission notice appear in associated\n" +
+        " * Documentation.\n" +
         " *\n" +
         " * THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF\n" +
         " * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" +

From f1bc4e05a44b9054f2387977c6f362ccb304df1c Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 6 Jan 2021 16:39:08 +0000
Subject: [PATCH 049/129] 8259312: VerifyCACerts.java fails as soneraclass2ca
 cert will expire in 90 days

Backport-of: 3be6e06958c4304cafee707a29d06d6b2cc5b76b
---
 test/jdk/sun/security/lib/cacerts/VerifyCACerts.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index 9178e5047ad51..814ded8a4f856 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -27,7 +27,7 @@
  * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
  *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
  *      8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
- *      8243559 8225072 8258630
+ *      8243559 8225072 8258630 8259312
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -262,6 +262,8 @@ public class VerifyCACerts {
             add("luxtrustglobalrootca [jdk]");
             // Valid until: Wed Mar 17 11:33:33 PDT 2021
             add("quovadisrootca [jdk]");
+            // Valid until: Tue Apr 06 00:29:40 PDT 2021
+            add("soneraclass2ca [jdk]");
         }
     };
 

From df721f0c69d143e13ff025ec9c305fcce2e0b925 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Wed, 6 Jan 2021 16:57:17 +0000
Subject: [PATCH 050/129] 8259291: Cleanup unnecessary local variables

Reviewed-by: mullan
---
 .../share/classes/sun/security/ssl/Finished.java          | 6 ++----
 .../share/classes/sun/security/ssl/OutputRecord.java      | 7 +++----
 .../share/classes/sun/security/ssl/SSLExtension.java      | 5 ++---
 .../classes/sun/security/ssl/SSLSocketOutputRecord.java   | 8 +++-----
 .../classes/sun/security/ssl/ServerNameExtension.java     | 3 +--
 .../sun/security/ssl/SignatureAlgorithmsExtension.java    | 3 +--
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 01fdf4766415e..2e52d30992cf3 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -265,8 +265,7 @@ public byte[] createVerifyData(HandshakeContext context,
                         "Invalid PRF output, format must be RAW. " +
                         "Format received: " + prfKey.getFormat());
                 }
-                byte[] finished = prfKey.getEncoded();
-                return finished;
+                return prfKey.getEncoded();
             } catch (GeneralSecurityException e) {
                 throw new RuntimeException("PRF failed", e);
             }
@@ -317,8 +316,7 @@ public byte[] createVerifyData(HandshakeContext context,
                         "Invalid PRF output, format must be RAW. " +
                         "Format received: " + prfKey.getFormat());
                 }
-                byte[] finished = prfKey.getEncoded();
-                return finished;
+                return prfKey.getEncoded();
             } catch (GeneralSecurityException e) {
                 throw new RuntimeException("PRF failed", e);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
index 41cf0bc24129b..9aa7f95876591 100644
--- a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -474,8 +474,7 @@ private long t13Encrypt(
         }
 
         byte[] sequenceNumber = encCipher.authenticator.sequenceNumber();
-        int position = headerSize;
-        int contentLen = count - position;
+        int contentLen = count - headerSize;
 
         // ensure the capacity
         int requiredPacketSize =
@@ -495,7 +494,7 @@ private long t13Encrypt(
             pv = ProtocolVersion.TLS12;
         }
 
-        ByteBuffer destination = ByteBuffer.wrap(buf, position, contentLen);
+        ByteBuffer destination = ByteBuffer.wrap(buf, headerSize, contentLen);
         count = headerSize + encCipher.encrypt(contentType, destination);
 
         // Fill out the header, write it and the message.
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
index 05ee5ff399fbf..fe4a1f77e4469 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -674,8 +674,7 @@ public String toString(
         String extData;
         if (stringizer == null) {
             HexDumpEncoder hexEncoder = new HexDumpEncoder();
-            String encoded = hexEncoder.encode(byteBuffer.duplicate());
-            extData = encoded;
+            extData = hexEncoder.encode(byteBuffer.duplicate());
         } else {
             extData = stringizer.toString(handshakeContext, byteBuffer);
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
index 97a65ba987d72..db8b7ad84d93c 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,7 @@ void encodeAlert(byte level, byte description) throws IOException {
             }
 
             // use the buf of ByteArrayOutputStream
-            int position = headerSize + writeCipher.getExplicitNonceSize();
-            count = position;
+            count = headerSize + writeCipher.getExplicitNonceSize();
 
             write(level);
             write(description);
@@ -221,8 +220,7 @@ void encodeChangeCipherSpec() throws IOException {
             }
 
             // use the buf of ByteArrayOutputStream
-            int position = headerSize + writeCipher.getExplicitNonceSize();
-            count = position;
+            count = headerSize + writeCipher.getExplicitNonceSize();
 
             write((byte)1);         // byte 1: change_cipher_spec(
 
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
index 7acc3a9911e0b..74f38bf5b56c4 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
index f0bd183aff0ac..9c451baa12b23 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 import java.nio.ByteBuffer;
 import java.text.MessageFormat;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import javax.net.ssl.SSLProtocolException;

From 940b053065de788e44ef0d7f6fab901f8f0dfb40 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 6 Jan 2021 17:34:15 +0000
Subject: [PATCH 051/129] 8259232: Bad JNI lookup during printing

Reviewed-by: psadhukhan
---
 src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m | 2 +-
 test/jdk/java/awt/print/bug8023392/bug8023392.java            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
index 201ec6db56410..e8246be951c67 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
@@ -58,7 +58,7 @@
 
 #define GET_CPRINTERDIALOG_METHOD_RETURN(ret) \
    GET_CPRINTERDIALOG_CLASS_RETURN(ret); \
-   GET_METHOD_RETURN(sjm_printerJob, sjc_CPrinterDialog, "fPrinterJob", "Lsun/lwawt/macosx/CPrinterJob;", ret);
+   GET_FIELD_RETURN(sjm_printerJob, sjc_CPrinterDialog, "fPrinterJob", "Lsun/lwawt/macosx/CPrinterJob;", ret);
 
 static NSPrintInfo* createDefaultNSPrintInfo();
 
diff --git a/test/jdk/java/awt/print/bug8023392/bug8023392.java b/test/jdk/java/awt/print/bug8023392/bug8023392.java
index 440de96a06186..071c9021ddffb 100644
--- a/test/jdk/java/awt/print/bug8023392/bug8023392.java
+++ b/test/jdk/java/awt/print/bug8023392/bug8023392.java
@@ -23,7 +23,7 @@
 
 /*
   test
-  @bug 8023392
+  @bug 8023392 8259232
   @summary Swing text components printed with spaces between chars
   @author Anton Nashatyrev
   @run applet/manual=yesno bug8023392.html

From 80544e4d5f402f67171eb5aca11897f1c5c3d431 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 6 Jan 2021 18:05:33 +0000
Subject: [PATCH 052/129] 8250564: Remove terminally deprecated constructor in
 GSSUtil 8250565: Remove terminally deprecated constructor in
 java.net.URLDecoder

Reviewed-by: bpb, smarks, alanb, mullan
---
 src/java.base/share/classes/java/net/URLDecoder.java         | 3 +--
 .../share/classes/com/sun/security/jgss/GSSUtil.java         | 3 +--
 test/jdk/java/net/URLDecoder/B6463990.java                   | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/java/net/URLDecoder.java b/src/java.base/share/classes/java/net/URLDecoder.java
index 511e74022b190..0003778860a18 100644
--- a/src/java.base/share/classes/java/net/URLDecoder.java
+++ b/src/java.base/share/classes/java/net/URLDecoder.java
@@ -84,8 +84,7 @@ public class URLDecoder {
     /**
      * Do not call.
      */
-    @Deprecated(since="16", forRemoval=true)
-    public URLDecoder() {}
+    private URLDecoder() {}
 
     // The platform default encoding
     static String dfltEncName = URLEncoder.dfltEncName;
diff --git a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
index 0669596800d12..b94e2877f0800 100644
--- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
+++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
@@ -37,8 +37,7 @@ public class GSSUtil {
     /**
      * Do not call.
      */
-    @Deprecated(since="16", forRemoval=true)
-    public GSSUtil() {}
+    private GSSUtil() {}
 
     /**
      * Use this method to convert a GSSName and GSSCredential into a
diff --git a/test/jdk/java/net/URLDecoder/B6463990.java b/test/jdk/java/net/URLDecoder/B6463990.java
index c49f9d6404551..76f78b05772e7 100644
--- a/test/jdk/java/net/URLDecoder/B6463990.java
+++ b/test/jdk/java/net/URLDecoder/B6463990.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,7 @@ public class B6463990 {
     public static void main(String[] args) {
         boolean except = false;
         try {
-            URLDecoder ud = new java.net.URLDecoder();
-            String s = ud.decode("%-1", "iso-8859-1");
+            String s = URLDecoder.decode("%-1", "iso-8859-1");
             System.out.println((int) s.charAt(0));
         } catch (Exception e) {
             except = true;

From eef43be71ce84514c733e0889317009d2ca11de7 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Wed, 6 Jan 2021 18:52:59 +0000
Subject: [PATCH 053/129] 8251200: False positive messages about missing
 comments for serialization

Reviewed-by: hannesw
---
 .../builders/SerializedFormBuilder.java       |  2 +-
 .../internal/doclets/toolkit/util/Utils.java  | 60 ++++++++------
 .../testSerialMissing/TestSerialMissing.java  | 78 +++++++++++++++++++
 3 files changed, 117 insertions(+), 23 deletions(-)
 create mode 100644 test/langtools/jdk/javadoc/doclet/testSerialMissing/TestSerialMissing.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java
index 2516073ee5b03..cabc48511ff59 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java
@@ -550,7 +550,7 @@ private static boolean serialClassInclude(Utils utils, TypeElement te) {
             return false;
         }
         if (utils.isSerializable(te)) {
-            if (!utils.getSerialTrees(te).isEmpty()) {
+            if (utils.hasDocCommentTree(te) && !utils.getSerialTrees(te).isEmpty()) {
                 return serialDocInclude(utils, te);
             } else if (utils.isPublic(te) || utils.isProtected(te)) {
                 return true;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
index 28824ad72052b..9987570d922e5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -2685,6 +2685,16 @@ public TreePath getTreePath(Element e) {
      */
     private final Map<Element, DocCommentInfo> dcTreeCache = new LinkedHashMap<>();
 
+    /**
+     * Checks whether an element has an associated doc comment.
+     * @param element the element
+     * @return {@code true} if the element has a comment, and false otherwise
+     */
+    public boolean hasDocCommentTree(Element element) {
+        DocCommentInfo info = getDocCommentInfo(element);
+        return info != null && info.dcTree != null;
+    }
+
     /**
      * Retrieves the doc comments for a given element.
      * @param element
@@ -2692,28 +2702,7 @@ public TreePath getTreePath(Element e) {
      */
     public DocCommentTree getDocCommentTree0(Element element) {
 
-        DocCommentInfo info = null;
-
-        ElementKind kind = element.getKind();
-        if (kind == ElementKind.PACKAGE || kind == ElementKind.OTHER) {
-            info = dcTreeCache.get(element); // local cache
-            if (info == null && kind == ElementKind.PACKAGE) {
-                // package-info.java
-                info = getDocCommentInfo(element);
-            }
-            if (info == null) {
-                // package.html or overview.html
-                info = configuration.cmtUtils.getHtmlCommentInfo(element); // html source
-            }
-        } else {
-            info = configuration.cmtUtils.getSyntheticCommentInfo(element);
-            if (info == null) {
-                info = dcTreeCache.get(element); // local cache
-            }
-            if (info == null) {
-                info = getDocCommentInfo(element); // get the real mccoy
-            }
-        }
+        DocCommentInfo info = getDocCommentInfo(element);
 
         DocCommentTree docCommentTree = info == null ? null : info.dcTree;
         if (!dcTreeCache.containsKey(element)) {
@@ -2738,6 +2727,33 @@ public DocCommentTree getDocCommentTree0(Element element) {
     }
 
     private DocCommentInfo getDocCommentInfo(Element element) {
+        DocCommentInfo info = null;
+
+        ElementKind kind = element.getKind();
+        if (kind == ElementKind.PACKAGE || kind == ElementKind.OTHER) {
+            info = dcTreeCache.get(element); // local cache
+            if (info == null && kind == ElementKind.PACKAGE) {
+                // package-info.java
+                info = getDocCommentInfo0(element);
+            }
+            if (info == null) {
+                // package.html or overview.html
+                info = configuration.cmtUtils.getHtmlCommentInfo(element); // html source
+            }
+        } else {
+            info = configuration.cmtUtils.getSyntheticCommentInfo(element);
+            if (info == null) {
+                info = dcTreeCache.get(element); // local cache
+            }
+            if (info == null) {
+                info = getDocCommentInfo0(element); // get the real mccoy
+            }
+        }
+
+        return info;
+    }
+
+    private DocCommentInfo getDocCommentInfo0(Element element) {
         // prevent nasty things downstream with overview element
         if (element.getKind() != ElementKind.OTHER) {
             TreePath path = getTreePath(element);
diff --git a/test/langtools/jdk/javadoc/doclet/testSerialMissing/TestSerialMissing.java b/test/langtools/jdk/javadoc/doclet/testSerialMissing/TestSerialMissing.java
new file mode 100644
index 0000000000000..b0210468dc56c
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testSerialMissing/TestSerialMissing.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8251200
+ * @summary False positive messages about missing comments for serialization
+ * @library /tools/lib ../../lib/
+ * @modules jdk.javadoc/jdk.javadoc.internal.api
+ *          jdk.javadoc/jdk.javadoc.internal.tool
+ * @build javadoc.tester.*
+ * @build toolbox.ToolBox javadoc.tester.*
+ * @run main TestSerialMissing
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+public class TestSerialMissing extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        TestSerialMissing tester = new TestSerialMissing();
+        tester.runTests(m -> new Object[] { Path.of(m.getName()) } );
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testPackagePrivate(Path base) throws IOException {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    /** Module m. */
+                    module m { exports p; }
+                    """,
+                """
+                    package p;
+                    /** PUBLIC class. */
+                    public class PUBLIC extends Exception { }
+                    """,
+                """
+                    package p;
+                    // no comment: class should not be documented
+                    class PACKAGE_PRIVATE extends Exception { }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-sourcepath", src.toString(),
+                "--module", "m");
+        checkExit(Exit.OK);
+
+        // should not be any reference to PACKAGE_PRIVATE.java, such as for no comment
+        checkOutput(Output.OUT, false,
+                "PACKAGE_PRIVATE");
+    }
+}
\ No newline at end of file

From 4f914e21c4b9447b3a32820a23fed49d2719316c Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Wed, 6 Jan 2021 19:26:17 +0000
Subject: [PATCH 054/129] 8249633: doclint reports missing javadoc for JavaFX
 property methods that have a property description

Reviewed-by: hannesw
---
 .../builders/MemberSummaryBuilder.java        |  6 +-
 .../internal/doclets/toolkit/util/Utils.java  | 18 +++---
 .../javadoc/doclet/testJavaFX/TestJavaFX.java | 58 ++++++++++++++++++-
 3 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
index 2e593830faf04..2c6641d9a6e5f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
@@ -46,6 +46,7 @@
 import jdk.javadoc.internal.doclets.toolkit.WriterFactory;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
 import jdk.javadoc.internal.doclets.toolkit.CommentUtils;
 
@@ -507,7 +508,10 @@ private void addToPropertiesMap(Element propertyMethod,
             if (null == propertyMethod || null == commentSource) {
                 return;
             }
-            DocCommentTree docTree = builder.utils.getDocCommentTree(propertyMethod);
+            Utils utils = builder.utils;
+            DocCommentTree docTree = utils.hasDocCommentTree(propertyMethod)
+                    ? utils.getDocCommentTree(propertyMethod)
+                    : null;
 
             /* The second condition is required for the property buckets. In
              * this case the comment is at the property method (not at the field)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
index 9987570d922e5..7bf29be9df0e4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -2637,14 +2637,16 @@ public boolean hasBlockTag(Element element, DocTree.Kind kind) {
     }
 
     public boolean hasBlockTag(Element element, DocTree.Kind kind, final String tagName) {
-        CommentHelper ch = getCommentHelper(element);
-        String tname = tagName != null && tagName.startsWith("@")
-                ? tagName.substring(1)
-                : tagName;
-        for (DocTree dt : getBlockTags(element, kind)) {
-            if (dt.getKind() == kind) {
-                if (tname == null || ch.getTagName(dt).equals(tname)) {
-                    return true;
+        if (hasDocCommentTree(element)) {
+            CommentHelper ch = getCommentHelper(element);
+            String tname = tagName != null && tagName.startsWith("@")
+                    ? tagName.substring(1)
+                    : tagName;
+            for (DocTree dt : getBlockTags(element, kind)) {
+                if (dt.getKind() == kind) {
+                    if (tname == null || ch.getTagName(dt).equals(tname)) {
+                        return true;
+                    }
                 }
             }
         }
diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
index 2ac83d830b17c..652d8893f4d10 100644
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363
  *      8167967 8172528 8175200 8178830 8182257 8186332 8182765 8025091
- *      8203791 8184205
+ *      8203791 8184205 8249633
  * @summary Test of the JavaFX doclet features.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -33,6 +33,10 @@
  * @run main TestJavaFX
  */
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
 import javadoc.tester.JavadocTester;
 
 public class TestJavaFX extends JavadocTester {
@@ -366,4 +370,56 @@ public void test4() {
         // make sure the doclet indeed emits the warning
         checkOutput(Output.OUT, true, "C.java:0: warning - invalid usage of tag <");
     }
+
+    /*
+     * Verify that no warnings are produced on methods that may have synthesized comments.
+     */
+    @Test
+    public void test5() throws IOException {
+        Path src5 = Files.createDirectories(Path.of("src5").resolve("pkg"));
+        Files.writeString(src5.resolve("MyClass.java"),
+                """
+                    package pkg;
+
+                    // The following import not required with --disable-javafx-strict-checks
+                    // import javafx.beans.property.*;
+
+                    /**
+                     * This is my class.
+                     */
+                    public class MyClass {
+                        /**
+                         * This is my property that enables something
+                         */
+                         private BooleanProperty something = new SimpleBooleanProperty(false);
+
+                         public final boolean isSomething() {
+                            return something.get();
+                         }
+
+                         public final void setSomething(boolean val) {
+                            something.set(val);
+                         }
+
+                         public final BooleanProperty somethingProperty() {
+                            return something;
+                         }
+
+                         /** Dummy declaration. */
+                         public class BooleanProperty { }
+                    }
+                    """);
+
+        javadoc("-d", "out5",
+                "--javafx",
+                "--disable-javafx-strict-checks",
+                "-Xdoclint:all",
+                "--source-path", "src5",
+                "pkg");
+        checkExit(Exit.OK);
+
+        checkOutput(Output.OUT, false,
+                "warning",
+                "no comment");
+    }
 }

From 28e1f4d9eebd148c4a7e5c83a5141e8acc7ccced Mon Sep 17 00:00:00 2001
From: Yoshiki Sato <ysatowse@openjdk.org>
Date: Wed, 6 Jan 2021 22:48:00 +0000
Subject: [PATCH 055/129] 8247957: remove doclint support for HTML 4 8257204:
 Remove usage of -Xhtmlversion option from javac 8256313: JavaCompilation.gmk
 needs to be updated not to use --doclint-format html5 option 8258460: Remove
 --doclint-format option from javac 8256312: Valid anchor 'id' value not
 allowed

Reviewed-by: jjg, ihse
---
 make/common/JavaCompilation.gmk               |   2 +-
 .../com/sun/tools/doclint/DocLint.java        |   1 -
 .../com/sun/tools/javac/main/Arguments.java   |   5 -
 .../com/sun/tools/javac/main/Option.java      |   2 -
 .../tools/javac/resources/javac.properties    |   3 -
 .../doclets/toolkit/BaseConfiguration.java    |   2 -
 .../jdk/javadoc/internal/doclint/Checker.java |  97 +++-----
 .../jdk/javadoc/internal/doclint/DocLint.java |  17 --
 .../jdk/javadoc/internal/doclint/Env.java     |   8 +-
 .../jdk/javadoc/internal/doclint/HtmlTag.java | 199 ++++++++--------
 .../javadoc/internal/doclint/HtmlVersion.java |  49 ----
 .../doclint/resources/doclint.properties      |  11 +-
 .../doclint/resources/doclint_ja.properties   |   8 +-
 .../resources/doclint_zh_CN.properties        |   8 +-
 .../TestHtmlTableStyles.java                  |   2 +-
 .../tools/doclint/AccessibilityTest.java      |  15 +-
 .../tools/doclint/AccessibilityTest.out       |   2 +-
 .../tools/doclint/AccessibilityTest5.java     |  30 ---
 .../tools/doclint/AccessibilityTest5.out      |   4 -
 test/langtools/tools/doclint/AnchorTest.java  |  35 +--
 test/langtools/tools/doclint/AnchorTest.out   |  44 ++--
 test/langtools/tools/doclint/AnchorTest2.java |   8 +-
 test/langtools/tools/doclint/AnchorTest2.out  |   2 +-
 .../langtools/tools/doclint/AnchorTest2a.java |   2 +-
 test/langtools/tools/doclint/EndTagsTest.java |   6 +-
 .../tools/doclint/HtmlAttrsTest.java          |   2 +-
 .../langtools/tools/doclint/HtmlAttrsTest.out |   9 +-
 .../langtools/tools/doclint/HtmlTagsTest.java |   2 +-
 test/langtools/tools/doclint/HtmlTagsTest.out |   5 +-
 .../tools/doclint/HtmlVersionTest.java        |  41 ----
 .../tools/doclint/anchorTests/p/Test.java     |  38 +--
 .../tools/doclint/anchorTests/p/Test.out      |  12 +-
 .../doclint/anchorTests/p/package-info.java   |   8 +-
 .../anchorTests/p/package-info.javac.out      |   4 +-
 .../doclint/anchorTests/p/package-info.out    |  10 +-
 .../html/HtmlVersionTagsAttrsTest.java        |  13 +-
 ...Html5.out => HtmlVersionTagsAttrsTest.out} | 219 ++++++++++--------
 .../html/HtmlVersionTagsAttrsTestHtml4.out    | 212 -----------------
 .../tools/doclint/html/InlineTagTest.out      |  10 +
 .../tools/doclint/html/InlineTagsTest.java    |   4 +-
 .../tools/doclint/html/OtherTagsTest.java     |   2 +-
 .../tools/doclint/html/OtherTagsTest.out      |  11 +-
 .../tools/doclint/html/TableTagTest.out       |  22 ++
 .../tools/doclint/html/TableTagsTest.java     |   4 +-
 .../tools/doclint/html/TagNotAllowed.java     |   2 +-
 .../tools/doclint/html/TagNotAllowed.out      |  19 +-
 .../tools/doclint/html/TextNotAllowed.java    |  22 +-
 .../tools/doclint/html/TextNotAllowed.out     |  40 ++--
 .../doclint/tidy/AnchorAlreadyDefined.java    |   6 +-
 .../doclint/tidy/AnchorAlreadyDefined.out     |   2 +-
 test/langtools/tools/doclint/tidy/BadEnd.java |   4 +-
 test/langtools/tools/doclint/tidy/BadEnd.out  |   6 +-
 .../tools/doclint/tidy/InvalidName.java       |  11 +-
 .../tools/doclint/tidy/InvalidName.out        |   4 +-
 .../tools/doclint/tidy/TextNotAllowed.java    |   8 +-
 .../tools/doclint/tidy/TextNotAllowed.out     |  12 +-
 .../tools/doclint/tidy/TrimmingEmptyTag.java  |   5 +-
 .../tools/doclint/tidy/TrimmingEmptyTag.out   |  37 ++-
 .../javac/doclint/DocLintFormatTest.java      |  17 +-
 59 files changed, 494 insertions(+), 891 deletions(-)
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlVersion.java
 delete mode 100644 test/langtools/tools/doclint/AccessibilityTest5.java
 delete mode 100644 test/langtools/tools/doclint/AccessibilityTest5.out
 delete mode 100644 test/langtools/tools/doclint/HtmlVersionTest.java
 rename test/langtools/tools/doclint/html/{HtmlVersionTagsAttrsTestHtml5.out => HtmlVersionTagsAttrsTest.out} (65%)
 delete mode 100644 test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out
 create mode 100644 test/langtools/tools/doclint/html/InlineTagTest.out
 create mode 100644 test/langtools/tools/doclint/html/TableTagTest.out

diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index 1d25dc6dbeba3..cb93131a124ee 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -269,7 +269,7 @@ define SetupJavaCompilationBody
   # Tell javac to do exactly as told and no more
   PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true -encoding ascii
 
-  $1_FLAGS += -g -Xlint:all --doclint-format html5 $$($1_TARGET_RELEASE) $$(PARANOIA_FLAGS) $$(JAVA_WARNINGS_ARE_ERRORS)
+  $1_FLAGS += -g -Xlint:all $$($1_TARGET_RELEASE) $$(PARANOIA_FLAGS) $$(JAVA_WARNINGS_ARE_ERRORS)
   $1_FLAGS += $$($1_JAVAC_FLAGS)
 
   ifneq ($$($1_DISABLED_WARNINGS), )
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
index f4e6e241bbe7b..0a52e70169aca 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
@@ -41,7 +41,6 @@
 public abstract class DocLint implements Plugin {
     public static final String XMSGS_OPTION = "-Xmsgs";
     public static final String XMSGS_CUSTOM_PREFIX = "-Xmsgs:";
-    public static final String XHTML_VERSION_PREFIX = "-XhtmlVersion:";
     public static final String XCHECK_PACKAGE = "-XcheckPackage:";
 
     private static ServiceLoader.Provider<DocLint> docLintProvider;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
index 00e2d435ddc18..2c67eb1b8193f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
@@ -853,11 +853,6 @@ public List<String> getDocLintOpts() {
             doclintOpts.add(DocLint.XCHECK_PACKAGE + checkPackages);
         }
 
-        String format = options.get(Option.DOCLINT_FORMAT);
-        if (format != null) {
-            doclintOpts.add(DocLint.XHTML_VERSION_PREFIX + format);
-        }
-
         return List.from(doclintOpts.toArray(new String[doclintOpts.size()]));
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index a12db6ce668b3..2eae5da0b6c74 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -159,8 +159,6 @@ public void process(OptionHelper helper, String option, String arg) {
         }
     },
 
-    DOCLINT_FORMAT("--doclint-format", "opt.doclint.format", EXTENDED, BASIC, ONEOF, "html5"),
-
     // -nowarn is retained for command-line backward compatibility
     NOWARN("-nowarn", "opt.nowarn", STANDARD, BASIC) {
         @Override
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 4bb02bd8a5d73..4264a2e12a554 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -286,9 +286,6 @@ javac.opt.Xdoclint.package.desc=\
     expands to all sub-packages of the given package. Each <package> can be prefixed\n\
     with '-' to disable checks for the specified package or packages.
 
-javac.opt.doclint.format=\
-    Specify the format for documentation comments
-
 javac.opt.Xstdout=\
     Redirect standard output
 javac.opt.X=\
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
index ef785603a5e8d..f65462eb92d78 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
@@ -798,8 +798,6 @@ public void initDocLint(List<String> opts, Set<String> customTagNames) {
             doclintOpts.add(DocLint.XCUSTOM_TAGS_PREFIX + customTags);
         }
 
-        doclintOpts.add(DocLint.XHTML_VERSION_PREFIX + "html5");
-
         doclint = new DocLint();
         doclint.init(docEnv.getDocTrees(), docEnv.getElementUtils(), docEnv.getTypeUtils(),
                 doclintOpts.toArray(new String[0]));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
index f9286d532ce99..2cbb48518ad94 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -91,6 +91,7 @@
 import com.sun.tools.javac.util.DefinedBy.Api;
 
 import jdk.javadoc.internal.doclint.HtmlTag.AttrKind;
+import jdk.javadoc.internal.doclint.HtmlTag.ElemKind;
 import static jdk.javadoc.internal.doclint.Messages.Group.*;
 
 
@@ -324,8 +325,8 @@ public Void visitStartElement(StartElementTree tree, Void ignore) {
         final HtmlTag t = HtmlTag.get(treeName);
         if (t == null) {
             env.messages.error(HTML, tree, "dc.tag.unknown", treeName);
-        } else if (t.allowedVersion != HtmlVersion.ALL && t.allowedVersion != env.htmlVersion) {
-            env.messages.error(HTML, tree, "dc.tag.not.supported", treeName);
+        } else if (t.elemKind == ElemKind.HTML4) {
+            env.messages.error(HTML, tree, "dc.tag.not.supported.html5", treeName);
         } else {
             boolean done = false;
             for (TagStackItem tsi: tagStack) {
@@ -413,8 +414,7 @@ public Void visitStartElement(StartElementTree tree, Void ignore) {
     // so-called "self-closing" tags are only permitted in HTML 5, for void elements
     // https://html.spec.whatwg.org/multipage/syntax.html#start-tags
     private boolean isSelfClosingAllowed(HtmlTag tag) {
-        return env.htmlVersion == HtmlVersion.HTML5
-                && tag.endKind == HtmlTag.EndKind.NONE;
+        return tag.endKind == HtmlTag.EndKind.NONE;
     }
 
     private void checkStructure(StartElementTree tree, HtmlTag t) {
@@ -535,7 +535,7 @@ public Void visitEndElement(EndElementTree tree, Void ignore) {
 
                         case SECTION:
                         case ARTICLE:
-                            if (env.htmlVersion == HtmlVersion.HTML5 && !top.flags.contains(Flag.HAS_HEADING)) {
+                            if (!top.flags.contains(Flag.HAS_HEADING)) {
                                 env.messages.error(HTML, tree, "dc.tag.requires.heading", treeName);
                             }
                             break;
@@ -579,7 +579,8 @@ void warnIfEmpty(TagStackItem tsi, DocTree endTree) {
             if (tsi.tag.flags.contains(HtmlTag.Flag.EXPECT_CONTENT)
                     && !tsi.flags.contains(Flag.HAS_TEXT)
                     && !tsi.flags.contains(Flag.HAS_ELEMENT)
-                    && !tsi.flags.contains(Flag.HAS_INLINE_TAG)) {
+                    && !tsi.flags.contains(Flag.HAS_INLINE_TAG)
+                    && !(tsi.tag.elemKind == ElemKind.HTML4)) {
                 DocTree tree = (endTree != null) ? endTree : tsi.tree;
                 Name treeName = ((StartElementTree) tsi.tree).getName();
                 env.messages.warning(HTML, tree, "dc.tag.empty", treeName);
@@ -594,13 +595,10 @@ void warnIfEmpty(TagStackItem tsi, DocTree endTree) {
     @Override @DefinedBy(Api.COMPILER_TREE) @SuppressWarnings("fallthrough")
     public Void visitAttribute(AttributeTree tree, Void ignore) {
         HtmlTag currTag = tagStack.peek().tag;
-        if (currTag != null) {
+        if (currTag != null && currTag.elemKind != ElemKind.HTML4) {
             Name name = tree.getName();
             HtmlTag.Attr attr = currTag.getAttr(name);
             if (attr != null) {
-                if (env.htmlVersion == HtmlVersion.HTML4 && attr.name().contains("-")) {
-                    env.messages.error(HTML, tree, "dc.attr.not.supported.html4", name);
-                }
                 boolean first = tagStack.peek().attrs.add(attr);
                 if (!first)
                     env.messages.error(HTML, tree, "dc.attr.repeated", name);
@@ -609,30 +607,29 @@ public Void visitAttribute(AttributeTree tree, Void ignore) {
             // without checking the validity or applicability of the name
             if (!name.toString().startsWith("on")) {
                 AttrKind k = currTag.getAttrKind(name);
-                switch (env.htmlVersion) {
+                switch (k) {
+                    case OK:
+                        break;
+                    case OBSOLETE:
+                        env.messages.warning(HTML, tree, "dc.attr.obsolete", name);
+                        break;
                     case HTML4:
-                        validateHtml4Attrs(tree, name, k);
+                        env.messages.error(HTML, tree, "dc.attr.not.supported.html5", name);
                         break;
-
-                    case HTML5:
-                        validateHtml5Attrs(tree, name, k);
+                    case INVALID:
+                        env.messages.error(HTML, tree, "dc.attr.unknown", name);
                         break;
                 }
             }
 
             if (attr != null) {
                 switch (attr) {
-                    case NAME:
-                        if (currTag != HtmlTag.A) {
-                            break;
-                        }
-                        // fallthrough
                     case ID:
                         String value = getAttrValue(tree);
                         if (value == null) {
                             env.messages.error(HTML, tree, "dc.anchor.value.missing");
                         } else {
-                            if (!validName.matcher(value).matches()) {
+                            if (!validId.matcher(value).matches()) {
                                 env.messages.error(HTML, tree, "dc.invalid.anchor", value);
                             }
                             if (!checkAnchor(value)) {
@@ -674,12 +671,20 @@ public Void visitAttribute(AttributeTree tree, Void ignore) {
                         if (currTag == HtmlTag.TABLE) {
                             String v = getAttrValue(tree);
                             try {
-                                if (env.htmlVersion == HtmlVersion.HTML5
-                                        && (v == null || (!v.isEmpty() && Integer.parseInt(v) != 1))) {
-                                    env.messages.error(HTML, tree, "dc.attr.table.border.html5", attr);
+                                if (v == null || (!v.isEmpty() && Integer.parseInt(v) != 1)) {
+                                    env.messages.error(HTML, tree, "dc.attr.table.border.not.valid", attr);
+                                }
+                            } catch (NumberFormatException ex) {
+                                env.messages.error(HTML, tree, "dc.attr.table.border.not.number", attr);
+                            }
+                        } else if (currTag == HtmlTag.IMG) {
+                            String v = getAttrValue(tree);
+                            try {
+                                if (v == null || (!v.isEmpty() && Integer.parseInt(v) != 0)) {
+                                    env.messages.error(HTML, tree, "dc.attr.img.border.not.valid", attr);
                                 }
                             } catch (NumberFormatException ex) {
-                                env.messages.error(HTML, tree, "dc.attr.table.border.html5", attr);
+                                env.messages.error(HTML, tree, "dc.attr.img.border.not.number", attr);
                             }
                         }
                         break;
@@ -701,44 +706,6 @@ public Void visitAttribute(AttributeTree tree, Void ignore) {
         return null;
     }
 
-    private void validateHtml4Attrs(AttributeTree tree, Name name, AttrKind k) {
-        switch (k) {
-            case ALL:
-            case HTML4:
-                break;
-
-            case INVALID:
-                env.messages.error(HTML, tree, "dc.attr.unknown", name);
-                break;
-
-            case OBSOLETE:
-                env.messages.warning(HTML, tree, "dc.attr.obsolete", name);
-                break;
-
-            case USE_CSS:
-                env.messages.warning(HTML, tree, "dc.attr.obsolete.use.css", name);
-                break;
-
-            case HTML5:
-                env.messages.error(HTML, tree, "dc.attr.not.supported.html4", name);
-                break;
-        }
-    }
-
-    private void validateHtml5Attrs(AttributeTree tree, Name name, AttrKind k) {
-        switch (k) {
-            case ALL:
-            case HTML5:
-                break;
-
-            case INVALID:
-            case OBSOLETE:
-            case USE_CSS:
-            case HTML4:
-                env.messages.error(HTML, tree, "dc.attr.not.supported.html5", name);
-                break;
-        }
-    }
 
     private boolean checkAnchor(String name) {
         Element e = getEnclosingPackageOrClass(env.currElement);
@@ -765,8 +732,8 @@ private Element getEnclosingPackageOrClass(Element e) {
         return e;
     }
 
-    // http://www.w3.org/TR/html401/types.html#type-name
-    private static final Pattern validName = Pattern.compile("[A-Za-z][A-Za-z0-9-_:.]*");
+    // https://html.spec.whatwg.org/#the-id-attribute
+    private static final Pattern validId = Pattern.compile("[^\\s]+");
 
     private static final Pattern validNumber = Pattern.compile("-?[0-9]+");
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java
index a7c5f8df8fd78..5ef7c1ada2b99 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java
@@ -83,7 +83,6 @@ public class DocLint extends com.sun.tools.doclint.DocLint {
     public static final String XMSGS_CUSTOM_PREFIX = "-Xmsgs:";
     private static final String STATS = "-stats";
     public static final String XCUSTOM_TAGS_PREFIX = "-XcustomTags:";
-    public static final String XHTML_VERSION_PREFIX = "-XhtmlVersion:";
     public static final String XCHECK_PACKAGE = "-XcheckPackage:";
     public static final String SEPARATOR = ",";
 
@@ -223,14 +222,6 @@ void processArgs(String... args) throws BadArgs {
                 env.messages.setOptions(arg.substring(arg.indexOf(":") + 1));
             } else if (arg.startsWith(XCUSTOM_TAGS_PREFIX)) {
                 env.setCustomTags(arg.substring(arg.indexOf(":") + 1));
-            } else if (arg.startsWith(XHTML_VERSION_PREFIX)) {
-                String argsVersion = arg.substring(arg.indexOf(":") + 1);
-                HtmlVersion htmlVersion = HtmlVersion.getHtmlVersion(argsVersion);
-                if (htmlVersion != null) {
-                    env.setHtmlVersion(htmlVersion);
-                } else {
-                    throw new BadArgs("dc.bad.value.for.option", arg, argsVersion);
-                }
             } else if (arg.equals("-h") || arg.equals("-help") || arg.equals("--help")
                     || arg.equals("-?") || arg.equals("-usage")) {
                 needHelp = true;
@@ -345,14 +336,6 @@ private void processArgs(Env env, String... args) {
                 env.messages.setOptions(arg.substring(arg.indexOf(":") + 1));
             } else if (arg.startsWith(XCUSTOM_TAGS_PREFIX)) {
                 env.setCustomTags(arg.substring(arg.indexOf(":") + 1));
-            } else if (arg.startsWith(XHTML_VERSION_PREFIX)) {
-                String argsVersion = arg.substring(arg.indexOf(":") + 1);
-                HtmlVersion htmlVersion = HtmlVersion.getHtmlVersion(argsVersion);
-                if (htmlVersion != null) {
-                    env.setHtmlVersion(htmlVersion);
-                } else {
-                    throw new IllegalArgumentException(argsVersion);
-                }
             } else if (arg.startsWith(XCHECK_PACKAGE)) {
                 env.setCheckPackages(arg.substring(arg.indexOf(":") + 1));
             } else
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
index 321cd708043a1..a822f4f157e3e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,8 +98,6 @@ else if (mods.contains(Modifier.PRIVATE))
     Set<Pattern> includePackages;
     Set<Pattern> excludePackages;
 
-    HtmlVersion htmlVersion = HtmlVersion.HTML4;
-
     // Utility classes
     DocTrees trees;
     Elements elements;
@@ -190,10 +188,6 @@ static boolean validatePackages(String packages) {
         return true;
     }
 
-    void setHtmlVersion(HtmlVersion version) {
-        htmlVersion = version;
-    }
-
     /** Set the current declaration and its doc comment. */
     void setCurrent(TreePath path, DocCommentTree comment) {
         currPath = path;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
index a5107017da772..da1bc22b1affe 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,30 +57,30 @@
  */
 public enum HtmlTag {
     A(BlockType.INLINE, EndKind.REQUIRED,
-            attrs(AttrKind.ALL, HREF, TARGET, ID),
+            attrs(AttrKind.OK, HREF, TARGET, ID),
             attrs(AttrKind.HTML4, REV, CHARSET, SHAPE, COORDS, NAME)),
 
     ABBR(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
-    ACRONYM(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
+    ACRONYM(ElemKind.HTML4, BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
     ADDRESS(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
-    ARTICLE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    ARTICLE(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
-    ASIDE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    ASIDE(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
     B(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
-    BDI(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
+    BDI(BlockType.INLINE, EndKind.REQUIRED),
 
-    BIG(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
+    BIG(ElemKind.HTML4, BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT)),
 
     BLOCKQUOTE(BlockType.BLOCK, EndKind.REQUIRED,
@@ -89,13 +89,13 @@ public enum HtmlTag {
     BODY(BlockType.OTHER, EndKind.REQUIRED),
 
     BR(BlockType.INLINE, EndKind.NONE,
-            attrs(AttrKind.USE_CSS, CLEAR)),
+            attrs(AttrKind.HTML4, CLEAR)),
 
     CAPTION(BlockType.TABLE_ITEM, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT),
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
 
-    CENTER(HtmlVersion.HTML4, BlockType.BLOCK, EndKind.REQUIRED,
+    CENTER(ElemKind.HTML4, BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
     CITE(BlockType.INLINE, EndKind.REQUIRED,
@@ -120,18 +120,18 @@ public boolean accepts(HtmlTag t) {
 
     DEL(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST),
-            attrs(AttrKind.ALL, Attr.CITE, Attr.DATETIME)),
+            attrs(AttrKind.OK, Attr.CITE, Attr.DATETIME)),
 
     DFN(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
     DIV(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
 
     DL(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT),
-            attrs(AttrKind.USE_CSS, COMPACT)) {
+            attrs(AttrKind.HTML4, COMPACT)) {
         @Override
         public boolean accepts(HtmlTag t) {
             return (t == DT) || (t == DD);
@@ -144,11 +144,11 @@ public boolean accepts(HtmlTag t) {
     EM(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.NO_NEST)),
 
-    FONT(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED, // tag itself is deprecated
+    FONT(ElemKind.HTML4, BlockType.INLINE, EndKind.REQUIRED, // tag itself is deprecated
             EnumSet.of(Flag.EXPECT_CONTENT),
-            attrs(AttrKind.USE_CSS, SIZE, COLOR, FACE)),
+            attrs(AttrKind.HTML4, SIZE, COLOR, FACE)),
 
-    FOOTER(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    FOOTER(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)) {
         @Override
         public boolean accepts(HtmlTag t) {
@@ -161,31 +161,31 @@ public boolean accepts(HtmlTag t) {
         }
     },
 
-    FIGURE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    FIGURE(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
-    FIGCAPTION(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED),
+    FIGCAPTION(BlockType.BLOCK, EndKind.REQUIRED),
 
-    FRAME(HtmlVersion.HTML4, BlockType.OTHER, EndKind.NONE),
+    FRAME(ElemKind.HTML4, BlockType.OTHER, EndKind.NONE),
 
-    FRAMESET(HtmlVersion.HTML4, BlockType.OTHER, EndKind.REQUIRED),
+    FRAMESET(ElemKind.HTML4, BlockType.OTHER, EndKind.REQUIRED),
 
     H1(BlockType.BLOCK, EndKind.REQUIRED,
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
     H2(BlockType.BLOCK, EndKind.REQUIRED,
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
     H3(BlockType.BLOCK, EndKind.REQUIRED,
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
     H4(BlockType.BLOCK, EndKind.REQUIRED,
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
     H5(BlockType.BLOCK, EndKind.REQUIRED,
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
     H6(BlockType.BLOCK, EndKind.REQUIRED,
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
 
     HEAD(BlockType.OTHER, EndKind.REQUIRED),
 
-    HEADER(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    HEADER(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)) {
         @Override
         public boolean accepts(HtmlTag t) {
@@ -199,8 +199,7 @@ public boolean accepts(HtmlTag t) {
     },
 
     HR(BlockType.BLOCK, EndKind.NONE,
-            attrs(AttrKind.HTML4, WIDTH),
-            attrs(AttrKind.USE_CSS, ALIGN, NOSHADE, SIZE)),
+            attrs(AttrKind.HTML4, WIDTH, ALIGN, NOSHADE, SIZE)),
 
     HTML(BlockType.OTHER, EndKind.REQUIRED),
 
@@ -210,28 +209,26 @@ public boolean accepts(HtmlTag t) {
     IFRAME(BlockType.OTHER, EndKind.REQUIRED),
 
     IMG(BlockType.INLINE, EndKind.NONE,
-            attrs(AttrKind.ALL, SRC, ALT, HEIGHT, WIDTH),
-            attrs(AttrKind.HTML5, CROSSORIGIN),
-            attrs(AttrKind.OBSOLETE, NAME),
-            attrs(AttrKind.USE_CSS, ALIGN, HSPACE, VSPACE, BORDER)),
+            attrs(AttrKind.OK, SRC, ALT, HEIGHT, WIDTH, CROSSORIGIN),
+            attrs(AttrKind.HTML4, NAME, ALIGN, HSPACE, VSPACE, BORDER)),
 
     INS(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST),
-            attrs(AttrKind.ALL, Attr.CITE, Attr.DATETIME)),
+            attrs(AttrKind.OK, Attr.CITE, Attr.DATETIME)),
 
     KBD(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
     LI(BlockType.LIST_ITEM, EndKind.OPTIONAL,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
-            attrs(AttrKind.ALL, VALUE),
-            attrs(AttrKind.USE_CSS, TYPE)),
+            attrs(AttrKind.OK, VALUE),
+            attrs(AttrKind.HTML4, TYPE)),
 
     LINK(BlockType.OTHER, EndKind.NONE),
 
-    MAIN(HtmlVersion.HTML5, BlockType.OTHER, EndKind.REQUIRED),
+    MAIN(BlockType.OTHER, EndKind.REQUIRED),
 
-    MARK(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
+    MARK(BlockType.INLINE, EndKind.REQUIRED),
 
     MENU(BlockType.BLOCK, EndKind.REQUIRED) {
         @Override
@@ -242,18 +239,17 @@ public boolean accepts(HtmlTag t) {
 
     META(BlockType.OTHER, EndKind.NONE),
 
-    NAV(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    NAV(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
-    NOFRAMES(HtmlVersion.HTML4, BlockType.OTHER, EndKind.REQUIRED),
+    NOFRAMES(ElemKind.HTML4, BlockType.OTHER, EndKind.REQUIRED),
 
     NOSCRIPT(BlockType.BLOCK, EndKind.REQUIRED),
 
     OL(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT),
-            attrs(AttrKind.ALL, START, TYPE),
-            attrs(AttrKind.HTML5, REVERSED),
-            attrs(AttrKind.USE_CSS, COMPACT)) {
+            attrs(AttrKind.OK, START, TYPE, REVERSED),
+            attrs(AttrKind.HTML4, COMPACT)) {
         @Override
         public boolean accepts(HtmlTag t) {
             return (t == LI);
@@ -262,11 +258,11 @@ public boolean accepts(HtmlTag t) {
 
     P(BlockType.BLOCK, EndKind.OPTIONAL,
             EnumSet.of(Flag.EXPECT_CONTENT),
-            attrs(AttrKind.USE_CSS, ALIGN)),
+            attrs(AttrKind.HTML4, ALIGN)),
 
     PRE(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT),
-            attrs(AttrKind.USE_CSS, WIDTH)) {
+            attrs(AttrKind.HTML4, WIDTH)) {
         @Override
         public boolean accepts(HtmlTag t) {
             switch (t) {
@@ -288,9 +284,9 @@ public boolean accepts(HtmlTag t) {
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
     SCRIPT(BlockType.OTHER, EndKind.REQUIRED,
-            attrs(AttrKind.ALL, SRC)),
+            attrs(AttrKind.OK, SRC)),
 
-    SECTION(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    SECTION(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
     SMALL(BlockType.INLINE, EndKind.REQUIRED,
@@ -299,7 +295,7 @@ public boolean accepts(HtmlTag t) {
     SPAN(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT)),
 
-    STRIKE(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
+    STRIKE(ElemKind.HTML4, BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT)),
 
     STRONG(BlockType.INLINE, EndKind.REQUIRED,
@@ -315,9 +311,9 @@ public boolean accepts(HtmlTag t) {
 
     TABLE(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT),
-            attrs(AttrKind.ALL, BORDER),
-            attrs(AttrKind.HTML4, SUMMARY, CELLPADDING, CELLSPACING, Attr.FRAME, RULES, WIDTH),
-            attrs(AttrKind.USE_CSS, ALIGN, BGCOLOR)) {
+            attrs(AttrKind.OK, BORDER),
+            attrs(AttrKind.HTML4, SUMMARY, CELLPADDING, CELLSPACING,
+                    Attr.FRAME, RULES, WIDTH, ALIGN, BGCOLOR)) {
         @Override
         public boolean accepts(HtmlTag t) {
             switch (t) {
@@ -334,8 +330,7 @@ public boolean accepts(HtmlTag t) {
 
     TBODY(BlockType.TABLE_ITEM, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT),
-            attrs(AttrKind.ALL, VALIGN),
-            attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF)) {
+            attrs(AttrKind.HTML4, ALIGN, VALIGN, CHAR, CHAROFF)) {
         @Override
         public boolean accepts(HtmlTag t) {
             return (t == TR);
@@ -344,16 +339,15 @@ public boolean accepts(HtmlTag t) {
 
     TD(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
-            attrs(AttrKind.ALL, COLSPAN, ROWSPAN, HEADERS, VALIGN),
-            attrs(AttrKind.HTML4, AXIS, Attr.ABBR, SCOPE, ALIGN, CHAR, CHAROFF),
-            attrs(AttrKind.USE_CSS, WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
+            attrs(AttrKind.OK, COLSPAN, ROWSPAN, HEADERS),
+            attrs(AttrKind.HTML4, AXIS, Attr.ABBR, SCOPE, ALIGN, VALIGN, CHAR, CHAROFF,
+                    WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
 
-    TEMPLATE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
+    TEMPLATE(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
     TFOOT(BlockType.TABLE_ITEM, EndKind.REQUIRED,
-            attrs(AttrKind.ALL, VALIGN),
-            attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF)) {
+            attrs(AttrKind.HTML4, ALIGN, VALIGN, CHAR, CHAROFF)) {
         @Override
         public boolean accepts(HtmlTag t) {
             return (t == TR);
@@ -362,35 +356,30 @@ public boolean accepts(HtmlTag t) {
 
     TH(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
-            attrs(AttrKind.ALL, COLSPAN, ROWSPAN, HEADERS, SCOPE, Attr.ABBR,
-                VALIGN),
-            attrs(AttrKind.HTML4, AXIS, ALIGN, CHAR, CHAROFF),
-            attrs(AttrKind.USE_CSS, WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
+            attrs(AttrKind.OK, COLSPAN, ROWSPAN, HEADERS, SCOPE, Attr.ABBR),
+            attrs(AttrKind.HTML4, WIDTH, BGCOLOR, HEIGHT, NOWRAP, AXIS, ALIGN, CHAR, CHAROFF, VALIGN)),
 
     THEAD(BlockType.TABLE_ITEM, EndKind.REQUIRED,
-            attrs(AttrKind.ALL, VALIGN),
-            attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF)) {
+            attrs(AttrKind.HTML4, ALIGN, VALIGN, CHAR, CHAROFF)) {
         @Override
         public boolean accepts(HtmlTag t) {
             return (t == TR);
         }
     },
 
-    TIME(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
+    TIME(BlockType.INLINE, EndKind.REQUIRED),
 
     TITLE(BlockType.OTHER, EndKind.REQUIRED),
 
     TR(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
-            attrs(AttrKind.ALL, VALIGN),
-            attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF),
-            attrs(AttrKind.USE_CSS, BGCOLOR)) {
+            attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF, BGCOLOR, VALIGN)) {
         @Override
         public boolean accepts(HtmlTag t) {
             return (t == TH) || (t == TD);
         }
     },
 
-    TT(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
+    TT(ElemKind.HTML4, BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
     U(BlockType.INLINE, EndKind.REQUIRED,
@@ -405,10 +394,20 @@ public boolean accepts(HtmlTag t) {
         }
     },
 
-    WBR(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
+    WBR(BlockType.INLINE, EndKind.REQUIRED),
 
     VAR(BlockType.INLINE, EndKind.REQUIRED);
 
+    /**
+     * Enum representing the supportability of HTML element.
+     */
+    public static enum ElemKind {
+        OK,
+        INVALID,
+        OBSOLETE,
+        HTML4
+    }
+
     /**
      * Enum representing the type of HTML element.
      */
@@ -534,12 +533,10 @@ public String getText() {
     }
 
     public static enum AttrKind {
-        HTML4,
-        HTML5,
+        OK,
         INVALID,
         OBSOLETE,
-        USE_CSS,
-        ALL
+        HTML4
     }
 
     // This class exists to avoid warnings from using parameterized vararg type
@@ -552,52 +549,52 @@ private static class AttrMap extends EnumMap<Attr,AttrKind>  {
     }
 
 
-    public final HtmlVersion allowedVersion;
+    public final ElemKind elemKind;
     public final BlockType blockType;
     public final EndKind endKind;
     public final Set<Flag> flags;
     private final Map<Attr,AttrKind> attrs;
 
     HtmlTag(BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
-        this(HtmlVersion.ALL, blockType, endKind, Collections.emptySet(), attrMaps);
+        this(ElemKind.OK, blockType, endKind, Collections.emptySet(), attrMaps);
     }
 
-    HtmlTag(HtmlVersion allowedVersion, BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
-        this(allowedVersion, blockType, endKind, Collections.emptySet(), attrMaps);
+    HtmlTag(ElemKind elemKind, BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
+        this(elemKind, blockType, endKind, Collections.emptySet(), attrMaps);
     }
 
     HtmlTag(BlockType blockType, EndKind endKind, Set<Flag> flags, AttrMap... attrMaps) {
-        this(HtmlVersion.ALL, blockType, endKind, flags, attrMaps);
+        this(ElemKind.OK, blockType, endKind, flags, attrMaps);
     }
 
-    HtmlTag(HtmlVersion allowedVersion, BlockType blockType, EndKind endKind, Set<Flag> flags, AttrMap... attrMaps) {
-        this.allowedVersion = allowedVersion;
+    HtmlTag(ElemKind elemKind, BlockType blockType, EndKind endKind, Set<Flag> flags, AttrMap... attrMaps) {
+        this.elemKind = elemKind;
         this.blockType = blockType;
         this.endKind = endKind;
         this.flags = flags;
         this.attrs = new EnumMap<>(Attr.class);
         for (Map<Attr,AttrKind> m: attrMaps)
             this.attrs.putAll(m);
-        attrs.put(Attr.CLASS, AttrKind.ALL);
-        attrs.put(Attr.ID, AttrKind.ALL);
-        attrs.put(Attr.STYLE, AttrKind.ALL);
-        attrs.put(Attr.ROLE, AttrKind.HTML5);
+        attrs.put(Attr.CLASS, AttrKind.OK);
+        attrs.put(Attr.ID, AttrKind.OK);
+        attrs.put(Attr.STYLE, AttrKind.OK);
+        attrs.put(Attr.ROLE, AttrKind.OK);
         // for now, assume that all ARIA attributes are allowed on all tags.
-        attrs.put(Attr.ARIA_ACTIVEDESCENDANT, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_CONTROLS, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_DESCRIBEDBY, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_EXPANDED, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_LABEL, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_LABELLEDBY, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_LEVEL, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_MULTISELECTABLE, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_OWNS, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_POSINSET, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_READONLY, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_REQUIRED, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_SELECTED, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_SETSIZE, AttrKind.HTML5);
-        attrs.put(Attr.ARIA_SORT, AttrKind.HTML5);
+        attrs.put(Attr.ARIA_ACTIVEDESCENDANT, AttrKind.OK);
+        attrs.put(Attr.ARIA_CONTROLS, AttrKind.OK);
+        attrs.put(Attr.ARIA_DESCRIBEDBY, AttrKind.OK);
+        attrs.put(Attr.ARIA_EXPANDED, AttrKind.OK);
+        attrs.put(Attr.ARIA_LABEL, AttrKind.OK);
+        attrs.put(Attr.ARIA_LABELLEDBY, AttrKind.OK);
+        attrs.put(Attr.ARIA_LEVEL, AttrKind.OK);
+        attrs.put(Attr.ARIA_MULTISELECTABLE, AttrKind.OK);
+        attrs.put(Attr.ARIA_OWNS, AttrKind.OK);
+        attrs.put(Attr.ARIA_POSINSET, AttrKind.OK);
+        attrs.put(Attr.ARIA_READONLY, AttrKind.OK);
+        attrs.put(Attr.ARIA_REQUIRED, AttrKind.OK);
+        attrs.put(Attr.ARIA_SELECTED, AttrKind.OK);
+        attrs.put(Attr.ARIA_SETSIZE, AttrKind.OK);
+        attrs.put(Attr.ARIA_SORT, AttrKind.OK);
     }
 
     public boolean accepts(HtmlTag t) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlVersion.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlVersion.java
deleted file mode 100644
index 6fadc3ccfd571..0000000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlVersion.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclint;
-
-/**
- * Enum representing HTML version of the documentation comment.
- *
- * @author Bhavesh Patel
- */
-public enum HtmlVersion {
-
-    HTML4,
-    HTML5,
-    ALL;
-
-    public static HtmlVersion getHtmlVersion(String argsVersion) {
-        switch (argsVersion) {
-            case "html4":
-                return HtmlVersion.HTML4;
-            case "html5":
-                return HtmlVersion.HTML5;
-            default:
-                return null;
-        }
-    }
-}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties
index aa0881e502e8a..5704c581fd6b8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties
@@ -27,12 +27,13 @@ dc.anchor.already.defined = anchor already defined: "{0}"
 dc.anchor.value.missing = no value given for anchor
 dc.attr.lacks.value = attribute lacks value
 dc.attr.not.number = attribute value is not a number
-dc.attr.not.supported.html4 = attribute not supported in HTML4: {0}
 dc.attr.not.supported.html5 = attribute not supported in HTML5: {0}
 dc.attr.obsolete = attribute obsolete: {0}
-dc.attr.obsolete.use.css = attribute obsolete, use CSS instead: {0}
 dc.attr.repeated = repeated attribute: {0}
-dc.attr.table.border.html5 = attribute border for table only accepts "" or "1", use CSS instead: {0}
+dc.attr.img.border.not.valid = attribute "border" for img only accepts "0": {0}
+dc.attr.img.border.not.number = invalid value for attribute "border": {0}
+dc.attr.table.border.not.valid = attribute "border" for table only accepts "" or "1": {0}
+dc.attr.table.border.not.number = invalid value for attribute "border": {0}
 dc.attr.unknown = unknown attribute: {0}
 dc.bad.option = bad option: {0}
 dc.bad.value.for.option = bad value for option: {0} {1}
@@ -54,7 +55,7 @@ dc.missing.param = no @param for {0}
 dc.missing.return = no @return
 dc.missing.throws = no @throws for {0}
 dc.no.alt.attr.for.image = no "alt" attribute for image
-dc.no.summary.or.caption.for.table=no summary or caption for table
+dc.no.summary.or.caption.for.table=no caption for table
 dc.param.name.not.found = @param name not found
 dc.ref.not.found = reference not found
 dc.return.not.first = '{@return} not at beginning of description
@@ -79,7 +80,7 @@ dc.tag.requires.heading = heading not found for </{0}>
 dc.tag.self.closing = self-closing element not allowed
 dc.tag.start.unmatched = end tag missing: </{0}>
 dc.tag.unknown = unknown tag: {0}
-dc.tag.not.supported = tag not supported in the generated HTML version: {0}
+dc.tag.not.supported.html5 = tag not supported in HTML5: {0}
 dc.text.not.allowed = text not allowed in <{0}> element
 dc.unexpected.comment=documentation comment not expected here
 dc.value.not.allowed.here='{@value} not allowed here
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
index 03f7f10d10dc1..581ce27e66e58 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,12 @@ dc.anchor.already.defined = \u30A2\u30F3\u30AB\u30FC\u304C\u3059\u3067\u306B\u5B
 dc.anchor.value.missing = \u30A2\u30F3\u30AB\u30FC\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 dc.attr.lacks.value = \u5C5E\u6027\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u3093
 dc.attr.not.number = \u5C5E\u6027\u5024\u304C\u6570\u5B57\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-dc.attr.not.supported.html4 = \u5C5E\u6027\u306FHTML4\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.attr.not.supported.html5 = \u5C5E\u6027\u306FHTML5\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.attr.obsolete = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 dc.attr.obsolete.use.css = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
 dc.attr.repeated = \u7E70\u308A\u8FD4\u3055\u308C\u305F\u5C5E\u6027: {0}
-dc.attr.table.border.html5 = \u8868\u306E\u5C5E\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
+dc.attr.img.border = \u753b\u50cf\u306e\u5c5e\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
+dc.attr.table.border = \u8868\u306E\u5C5E\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
 dc.attr.unknown = \u4E0D\u660E\u306A\u5C5E\u6027: {0}
 dc.bad.option = \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 dc.bad.value.for.option = \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: {0} {1}
@@ -78,7 +78,7 @@ dc.tag.requires.heading = </{0}>\u306E\u898B\u51FA\u3057\u304C\u898B\u3064\u304B
 dc.tag.self.closing = \u81EA\u5DF1\u7D42\u4E86\u8981\u7D20\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.tag.start.unmatched = \u7D42\u4E86\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093: </{0}>
 dc.tag.unknown = \u4E0D\u660E\u306A\u30BF\u30B0: {0}
-dc.tag.not.supported = \u30BF\u30B0\u306F\u3001\u751F\u6210\u6E08HTML\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
+dc.tag.not.supported.html5 = \u30bf\u30b0\u306fHTML5\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093: {0}
 dc.text.not.allowed = <{0}>\u8981\u7D20\u3067\u306F\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.type.arg.not.allowed = \u578B\u5F15\u6570\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.unexpected.comment=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306F\u3053\u3053\u3067\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
index 4790ce7ed0cee..50b6ad80bfdfe 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,12 @@ dc.anchor.already.defined = \u951A\u5B9A\u70B9\u5DF2\u5B9A\u4E49: "{0}"
 dc.anchor.value.missing = \u6CA1\u6709\u4E3A\u951A\u5B9A\u70B9\u6307\u5B9A\u503C
 dc.attr.lacks.value = \u5C5E\u6027\u7F3A\u5C11\u503C
 dc.attr.not.number = \u5C5E\u6027\u503C\u4E0D\u662F\u6570\u5B57
-dc.attr.not.supported.html4 = \u5C5E\u6027\u5728 HTML4 \u4E2D\u4E0D\u53D7\u652F\u6301: {0}
 dc.attr.not.supported.html5 = \u5C5E\u6027\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301: {0}
 dc.attr.obsolete = \u5C5E\u6027\u5DF2\u8FC7\u65F6: {0}
 dc.attr.obsolete.use.css = \u5C5E\u6027\u5DF2\u8FC7\u65F6, \u8BF7\u6539\u7528 CSS: {0}
 dc.attr.repeated = \u5C5E\u6027\u91CD\u590D: {0}
-dc.attr.table.border.html5 = \u8868\u7684\u5C5E\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
+dc.attr.img.border = \u56FE\u50CF\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
+dc.attr.table.border = \u8868\u7684\u5C5E\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
 dc.attr.unknown = \u672A\u77E5\u5C5E\u6027: {0}
 dc.bad.option = \u9009\u9879\u9519\u8BEF: {0}
 dc.bad.value.for.option = \u9009\u9879\u7684\u503C\u9519\u8BEF: {0} {1}
@@ -78,7 +78,7 @@ dc.tag.requires.heading = \u672A\u627E\u5230 </{0}> \u7684\u6807\u9898
 dc.tag.self.closing = \u4E0D\u5141\u8BB8\u4F7F\u7528\u81EA\u5173\u95ED\u5143\u7D20
 dc.tag.start.unmatched = \u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0: </{0}>
 dc.tag.unknown = \u672A\u77E5\u6807\u8BB0: {0}
-dc.tag.not.supported = \u6807\u8BB0\u5728\u751F\u6210\u7684 HTML \u7248\u672C\u4E2D\u4E0D\u53D7\u652F\u6301: {0}
+dc.tag.not.supported.html5 = \u6807\u8BB0\u5728\u751F\u6210\u7684 HTML \u7248\u672C\u4E2D\u4E0D\u53D7\u652F\u6301: {0}
 dc.text.not.allowed = <{0}> \u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u6587\u672C
 dc.type.arg.not.allowed = \u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u53C2\u6570
 dc.unexpected.comment=\u6B64\u5904\u672A\u9884\u671F\u6587\u6863\u6CE8\u91CA
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
index 248edc2607a01..34cc2e5944a1c 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
@@ -50,7 +50,7 @@ public void test() {
         checkOutput(Output.OUT, true,
                 "attribute not supported in HTML5: summary",
                 """
-                    attribute border for table only accepts "" or "1", use CSS instead: BORDER""",
+                    attribute "border" for table only accepts "" or "1": BORDER""",
                 "attribute not supported in HTML5: cellpadding",
                 "attribute not supported in HTML5: cellspacing",
                 "attribute not supported in HTML5: align");
diff --git a/test/langtools/tools/doclint/AccessibilityTest.java b/test/langtools/tools/doclint/AccessibilityTest.java
index 5d7e34fe00da4..17e9c9aa48c59 100644
--- a/test/langtools/tools/doclint/AccessibilityTest.java
+++ b/test/langtools/tools/doclint/AccessibilityTest.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247955 8247957
  * @summary Add new doclint package
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
@@ -47,11 +47,6 @@ public void missing_h4() { }
      */
     public void missing_alt() { }
 
-    /**
-     * <table summary="ok"><tr><th>head<tr><td>data</table>
-     */
-    public void table_with_summary() { }
-
     /**
      * <table><caption>ok</caption><tr><th>head<tr><td>data</table>
      */
@@ -60,6 +55,12 @@ public void table_with_caption() { }
     /**
      * <table><tr><th>head<tr><td>data</table>
      */
-    public void table_without_summary_and_caption() { }
+    public void table_without_caption() { }
+
+    /**
+     * <table role="presentation"><tr><th>head<tr><td>data</table>
+     */
+    public void table_presentation() { }
+
 }
 
diff --git a/test/langtools/tools/doclint/AccessibilityTest.out b/test/langtools/tools/doclint/AccessibilityTest.out
index 94c7611232a6b..b3497ce8185cd 100644
--- a/test/langtools/tools/doclint/AccessibilityTest.out
+++ b/test/langtools/tools/doclint/AccessibilityTest.out
@@ -19,7 +19,7 @@ AccessibilityTest.java:41: error: heading used out of sequence: <H5>, compared t
 AccessibilityTest.java:46: error: no "alt" attribute for image
      * <img src="x.jpg">
        ^
-AccessibilityTest.java:61: error: no summary or caption for table
+AccessibilityTest.java:56: error: no caption for table
      * <table><tr><th>head<tr><td>data</table>
                                       ^
 8 errors
diff --git a/test/langtools/tools/doclint/AccessibilityTest5.java b/test/langtools/tools/doclint/AccessibilityTest5.java
deleted file mode 100644
index a5393b3d54483..0000000000000
--- a/test/langtools/tools/doclint/AccessibilityTest5.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 8247955
- * @summary Add new doclint package
- * @modules jdk.javadoc/jdk.javadoc.internal.doclint
- * @build DocLintTester
- * @run main DocLintTester -XhtmlVersion:html5 -Xmsgs:-accessibility AccessibilityTest5.java
- * @run main DocLintTester -XhtmlVersion:html5 -ref AccessibilityTest5.out AccessibilityTest5.java
- */
-
-// This test should be merged into AccessibilityTest.java when we drop support for html4.
-
-/** */
-public class AccessibilityTest5 {
-    /**
-     * <table><caption>ok</caption><tr><th>head<tr><td>data</table>
-     */
-    public void table_with_caption() { }
-
-    /**
-     * <table><tr><th>head<tr><td>data</table>
-     */
-    public void table_without_caption() { }
-
-    /**
-     * <table role="presentation"><tr><th>head<tr><td>data</table>
-     */
-    public void table_presentation() { }
-}
-
diff --git a/test/langtools/tools/doclint/AccessibilityTest5.out b/test/langtools/tools/doclint/AccessibilityTest5.out
deleted file mode 100644
index 23ccfda6681e2..0000000000000
--- a/test/langtools/tools/doclint/AccessibilityTest5.out
+++ /dev/null
@@ -1,4 +0,0 @@
-AccessibilityTest5.java:21: error: no summary or caption for table
-     * <table><tr><th>head<tr><td>data</table>
-                                      ^
-1 error
diff --git a/test/langtools/tools/doclint/AnchorTest.java b/test/langtools/tools/doclint/AnchorTest.java
index d2d9324189d6b..7bce8a51966b1 100644
--- a/test/langtools/tools/doclint/AnchorTest.java
+++ b/test/langtools/tools/doclint/AnchorTest.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
@@ -9,37 +9,10 @@
 
 /** */
 public class AnchorTest {
-    // tests for <a name=value>
-
-    /**
-     * <a name=foo></a>
-     */
-    public void a_name_foo() { }
-
-    /**
-     * <a name=foo></a>
-     */
-    public void a_name_already_defined() { }
-
-    /**
-     * <a name=></a>
-     */
-    public void a_name_empty() { }
-
-    /**
-     * <a name=123 ></a>
-     */
-    public void a_name_invalid() { }
-
-    /**
-     * <a name ></a>
-     */
-    public void a_name_missing() { }
-
     // tests for <a id=value>
 
     /**
-     * <a id=a_id_foo></a>
+     * <a id=foo></a>
      */
     public void a_id_foo() { }
 
@@ -54,7 +27,7 @@ public void a_id_already_defined() { }
     public void a_id_empty() { }
 
     /**
-     * <a id=123 ></a>
+     * <a id="123 "></a>
      */
     public void a_id_invalid() { }
 
@@ -81,7 +54,7 @@ public void p_id_already_defined() { }
     public void p_id_empty() { }
 
     /**
-     * <p id=123 >text</p>
+     * <p id="123 ">text</p>
      */
     public void p_id_invalid() { }
 
diff --git a/test/langtools/tools/doclint/AnchorTest.out b/test/langtools/tools/doclint/AnchorTest.out
index 70bb1383ee31b..72c062e4acbd7 100644
--- a/test/langtools/tools/doclint/AnchorTest.out
+++ b/test/langtools/tools/doclint/AnchorTest.out
@@ -1,49 +1,31 @@
 AnchorTest.java:20: error: anchor already defined: "foo"
-     * <a name=foo></a>
-          ^
-AnchorTest.java:25: error: invalid name for anchor: ""
-     * <a name=></a>
-          ^
-AnchorTest.java:30: error: invalid name for anchor: "123"
-     * <a name=123 ></a>
-          ^
-AnchorTest.java:35: error: no value given for anchor
-     * <a name ></a>
-          ^
-AnchorTest.java:47: error: anchor already defined: "foo"
      * <a id=foo></a>
           ^
-AnchorTest.java:52: error: invalid name for anchor: ""
-     * <a id=></a>
-          ^
-AnchorTest.java:52: error: anchor already defined: ""
+AnchorTest.java:25: error: invalid name for anchor: ""
      * <a id=></a>
           ^
-AnchorTest.java:57: error: invalid name for anchor: "123"
-     * <a id=123 ></a>
-          ^
-AnchorTest.java:57: error: anchor already defined: "123"
-     * <a id=123 ></a>
+AnchorTest.java:30: error: invalid name for anchor: "123 "
+     * <a id="123 "></a>
           ^
-AnchorTest.java:62: error: no value given for anchor
+AnchorTest.java:35: error: no value given for anchor
      * <a id ></a>
           ^
-AnchorTest.java:74: error: anchor already defined: "foo"
+AnchorTest.java:47: error: anchor already defined: "foo"
      * <p id=foo>text</p>
           ^
-AnchorTest.java:79: error: invalid name for anchor: ""
+AnchorTest.java:52: error: invalid name for anchor: ""
      * <p id=>text</p>
           ^
-AnchorTest.java:79: error: anchor already defined: ""
+AnchorTest.java:52: error: anchor already defined: ""
      * <p id=>text</p>
           ^
-AnchorTest.java:84: error: invalid name for anchor: "123"
-     * <p id=123 >text</p>
+AnchorTest.java:57: error: invalid name for anchor: "123 "
+     * <p id="123 ">text</p>
           ^
-AnchorTest.java:84: error: anchor already defined: "123"
-     * <p id=123 >text</p>
+AnchorTest.java:57: error: anchor already defined: "123 "
+     * <p id="123 ">text</p>
           ^
-AnchorTest.java:89: error: no value given for anchor
+AnchorTest.java:62: error: no value given for anchor
      * <p id >text</p>
           ^
-16 errors
+10 errors
diff --git a/test/langtools/tools/doclint/AnchorTest2.java b/test/langtools/tools/doclint/AnchorTest2.java
index 79b668677f1be..ac8270322137a 100644
--- a/test/langtools/tools/doclint/AnchorTest2.java
+++ b/test/langtools/tools/doclint/AnchorTest2.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8020313
+ * @bug 8020313 8247957
  * @summary doclint doesn't reset HTML anchors correctly
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
@@ -10,12 +10,12 @@
 
 /** */
 public class AnchorTest2 {
-    /** <a name="AnchorTest2"> </a> */
+    /** <a id="AnchorTest2"> </a> */
     public void a_name_AnchorTest2() { }
 
-    /** <a name="AnchorTest2"> </a> */
+    /** <a id="AnchorTest2"> </a> */
     public void a_name_AnchorTest2_already_defined() { }
 
-    /** <a name="AnchorTest2a"> </a> */
+    /** <a id="AnchorTest2a"> </a> */
     public void a_name_AnchorTest2a_defined_in_other_file() { }
 }
diff --git a/test/langtools/tools/doclint/AnchorTest2.out b/test/langtools/tools/doclint/AnchorTest2.out
index 755e6073eb635..b74020b560add 100644
--- a/test/langtools/tools/doclint/AnchorTest2.out
+++ b/test/langtools/tools/doclint/AnchorTest2.out
@@ -1,4 +1,4 @@
 AnchorTest2.java:16: error: anchor already defined: "AnchorTest2"
-    /** <a name="AnchorTest2"> </a> */
+    /** <a id="AnchorTest2"> </a> */
            ^
 1 error
diff --git a/test/langtools/tools/doclint/AnchorTest2a.java b/test/langtools/tools/doclint/AnchorTest2a.java
index 3a19713893146..984f60d7e0fca 100644
--- a/test/langtools/tools/doclint/AnchorTest2a.java
+++ b/test/langtools/tools/doclint/AnchorTest2a.java
@@ -1,7 +1,7 @@
 /* /nodynamiccopyright/ */
 
 /**
- * <a name="AnchorTest2a"> </a>
+ * <a id="AnchorTest2a"> </a>
  */
 public class AnchorTest2a { }
 
diff --git a/test/langtools/tools/doclint/EndTagsTest.java b/test/langtools/tools/doclint/EndTagsTest.java
index ad2d1cebc68b3..ef5ca8bf40069 100644
--- a/test/langtools/tools/doclint/EndTagsTest.java
+++ b/test/langtools/tools/doclint/EndTagsTest.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8006236
+ * @bug 8006236 8247957
  * @summary doclint: structural issue hidden
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
@@ -10,10 +10,10 @@
 
 /** */
 public class EndTagsTest {
-    /** <p>  <a name="a1"> text <img alt="image" src="image.png"> </a> </p> */
+    /** <p>  <a id="a1"> text <img alt="image" src="image.png"> </a> </p> */
     public void valid_all() { }
 
-    /** <p>  <a name="a2"> text <img alt="image" src="image.png"> </a> */
+    /** <p>  <a id="a2"> text <img alt="image" src="image.png"> </a> */
     public void valid_omit_optional_close() { }
 
     /** </a> */
diff --git a/test/langtools/tools/doclint/HtmlAttrsTest.java b/test/langtools/tools/doclint/HtmlAttrsTest.java
index 5d31702f0c441..f90b3f8461ba9 100644
--- a/test/langtools/tools/doclint/HtmlAttrsTest.java
+++ b/test/langtools/tools/doclint/HtmlAttrsTest.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832 8258916
+ * @bug 8004832 8258916 8247957
  * @summary Add new doclint package
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
diff --git a/test/langtools/tools/doclint/HtmlAttrsTest.out b/test/langtools/tools/doclint/HtmlAttrsTest.out
index 889d99ed4466a..59b3294a00fcf 100644
--- a/test/langtools/tools/doclint/HtmlAttrsTest.out
+++ b/test/langtools/tools/doclint/HtmlAttrsTest.out
@@ -1,12 +1,11 @@
 HtmlAttrsTest.java:14: error: unknown attribute: xyz
      * <p xyz> text </p>
           ^
-HtmlAttrsTest.java:19: warning: attribute obsolete: name
+HtmlAttrsTest.java:19: error: attribute not supported in HTML5: name
      * <img name="x" alt="alt">
             ^
-HtmlAttrsTest.java:24: warning: attribute obsolete, use CSS instead: size
+HtmlAttrsTest.java:24: error: tag not supported in HTML5: font
      * <font size="3"> text </font>
-             ^
-1 error
-2 warnings
+       ^
+3 errors
 
diff --git a/test/langtools/tools/doclint/HtmlTagsTest.java b/test/langtools/tools/doclint/HtmlTagsTest.java
index 8f1926cf17a6d..d8b033d2fbbd4 100644
--- a/test/langtools/tools/doclint/HtmlTagsTest.java
+++ b/test/langtools/tools/doclint/HtmlTagsTest.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
diff --git a/test/langtools/tools/doclint/HtmlTagsTest.out b/test/langtools/tools/doclint/HtmlTagsTest.out
index 9e0b22de3dc6c..66d80e365e66c 100644
--- a/test/langtools/tools/doclint/HtmlTagsTest.out
+++ b/test/langtools/tools/doclint/HtmlTagsTest.out
@@ -7,9 +7,6 @@ HtmlTagsTest.java:14: error: unknown tag: xyz
 HtmlTagsTest.java:19: error: unknown tag: xyz
      * <div> <xyz> </div>
              ^
-HtmlTagsTest.java:24: error: self-closing element not allowed
-     * <br/>
-       ^
 HtmlTagsTest.java:29: error: element not allowed in documentation comments: <html>
      * <html>
        ^
@@ -43,5 +40,5 @@ HtmlTagsTest.java:60: error: text not allowed in <ul> element
 HtmlTagsTest.java:65: error: tag not allowed here: <b>
      * <ul> <b>text</b> <li> ... </li> </ul>
             ^
-14 errors
+13 errors
 1 warning
diff --git a/test/langtools/tools/doclint/HtmlVersionTest.java b/test/langtools/tools/doclint/HtmlVersionTest.java
deleted file mode 100644
index 04ea2af3bd16b..0000000000000
--- a/test/langtools/tools/doclint/HtmlVersionTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8072945
- * @summary test HTML version
- * @library ..
- * @modules jdk.javadoc/jdk.javadoc.internal.doclint
- * @build DocLintTester
- * @run main DocLintTester -XhtmlVersion:html5 HtmlVersionTest.java
- * @run main DocLintTester -XhtmlVersion:html4 HtmlVersionTest.java
- * @run main DocLintTester -badargs -XhtmlVersion: HtmlVersionTest.java
- * @run main DocLintTester HtmlVersionTest.java
- */
-
-/**
- * Test HTML version option.
- */
-public class HtmlVersionTest {
-}
diff --git a/test/langtools/tools/doclint/anchorTests/p/Test.java b/test/langtools/tools/doclint/anchorTests/p/Test.java
index bc734c9eb5b24..a46f994cce18f 100644
--- a/test/langtools/tools/doclint/anchorTests/p/Test.java
+++ b/test/langtools/tools/doclint/anchorTests/p/Test.java
@@ -1,5 +1,5 @@
 /* @test /nodynamiccopyright/
- * @bug 8025246
+ * @bug 8025246 8247957
  * @summary doclint is showing error on anchor already defined when it's not
  * @library ../..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -11,43 +11,43 @@
 package p;
 
 /**
- * <a name="dupTest">dupTest</a>
- * <a name="dupTest">dupTest again</a>
+ * <a id="dupTest">dupTest</a>
+ * <a id="dupTest">dupTest again</a>
  *
- * <a name="dupTestField">dupTestField</a>
- * <a name="dupTestMethod">dupTestMethod</a>
+ * <a id="dupTestField">dupTestField</a>
+ * <a id="dupTestMethod">dupTestMethod</a>
 
- * <a name="okClass">okClass</a>
- * <a name="okField">okField</a>
- * <a name="okMethod">okMethod</a>
+ * <a id="okClass">okClass</a>
+ * <a id="okField">okField</a>
+ * <a id="okMethod">okMethod</a>
  */
 public class Test {
-    /** <a name="dupTestField">dupTestField again</a> */
+    /** <a id="dupTestField">dupTestField again</a> */
     public int f;
 
-    /** <a name="dupTestMethod">dupTestMethod again</a> */
+    /** <a id="dupTestMethod">dupTestMethod again</a> */
     public void m() { }
 
     /**
-     * <a name="dupNested">dupNested</a>
-     * <a name="dupNested">dupNested again</a>
-     * <a name="dupNestedField">dupNestedField</a>
-     * <a name="dupNestedMethod">dupNestedMethod</a>
+     * <a id="dupNested">dupNested</a>
+     * <a id="dupNested">dupNested again</a>
+     * <a id="dupNestedField">dupNestedField</a>
+     * <a id="dupNestedMethod">dupNestedMethod</a>
      *
-     * <a name="okClass">okClass again</a>
+     * <a id="okClass">okClass again</a>
      */
     public class Nested {
         /**
-         * <a name="dupNestedField">dupNestedField</a>
+         * <a id="dupNestedField">dupNestedField</a>
          *
-         * <a name="okField">okField again</a>
+         * <a id="okField">okField again</a>
          */
         public int f;
 
         /**
-         * <a name="dupNestedMethod">dupNestedMethod</a>
+         * <a id="dupNestedMethod">dupNestedMethod</a>
          *
-         * <a name="okMethod">okMethod again</a>
+         * <a id="okMethod">okMethod again</a>
          */
         public void m() { }
     }
diff --git a/test/langtools/tools/doclint/anchorTests/p/Test.out b/test/langtools/tools/doclint/anchorTests/p/Test.out
index 3448c423e98f3..e55d25aaf3d09 100644
--- a/test/langtools/tools/doclint/anchorTests/p/Test.out
+++ b/test/langtools/tools/doclint/anchorTests/p/Test.out
@@ -1,19 +1,19 @@
 Test.java:15: error: anchor already defined: "dupTest"
- * <a name="dupTest">dupTest again</a>
+ * <a id="dupTest">dupTest again</a>
       ^
 Test.java:25: error: anchor already defined: "dupTestField"
-    /** <a name="dupTestField">dupTestField again</a> */
+    /** <a id="dupTestField">dupTestField again</a> */
            ^
 Test.java:28: error: anchor already defined: "dupTestMethod"
-    /** <a name="dupTestMethod">dupTestMethod again</a> */
+    /** <a id="dupTestMethod">dupTestMethod again</a> */
            ^
 Test.java:33: error: anchor already defined: "dupNested"
-     * <a name="dupNested">dupNested again</a>
+     * <a id="dupNested">dupNested again</a>
           ^
 Test.java:41: error: anchor already defined: "dupNestedField"
-         * <a name="dupNestedField">dupNestedField</a>
+         * <a id="dupNestedField">dupNestedField</a>
               ^
 Test.java:48: error: anchor already defined: "dupNestedMethod"
-         * <a name="dupNestedMethod">dupNestedMethod</a>
+         * <a id="dupNestedMethod">dupNestedMethod</a>
               ^
 6 errors
diff --git a/test/langtools/tools/doclint/anchorTests/p/package-info.java b/test/langtools/tools/doclint/anchorTests/p/package-info.java
index 9a586ad6af0e3..75915015506d3 100644
--- a/test/langtools/tools/doclint/anchorTests/p/package-info.java
+++ b/test/langtools/tools/doclint/anchorTests/p/package-info.java
@@ -1,5 +1,5 @@
 /* @test /nodynamiccopyright/
- * @bug 8025246
+ * @bug 8025246 8247957
  * @summary doclint is showing error on anchor already defined when it's not
  * @library ../..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -9,8 +9,10 @@
  */
 
 /**
- * <a name=here>here</a>
- * <a name=here>here again</a>
+ * <a id=here>here</a>
+ * <a id=here>here again</a>
+ * <a name=name>obsolete anchor</a>
+ * <a name=name>obsolete anchor again</a>
  */
 package p;
 
diff --git a/test/langtools/tools/doclint/anchorTests/p/package-info.javac.out b/test/langtools/tools/doclint/anchorTests/p/package-info.javac.out
index f6b8948560d9a..6edee352de817 100644
--- a/test/langtools/tools/doclint/anchorTests/p/package-info.javac.out
+++ b/test/langtools/tools/doclint/anchorTests/p/package-info.javac.out
@@ -1,2 +1,4 @@
 package-info.java:13:7: compiler.err.proc.messager: anchor already defined: "here"
-1 error
+package-info.java:14:7: compiler.err.proc.messager: attribute not supported in HTML5: name
+package-info.java:15:7: compiler.err.proc.messager: attribute not supported in HTML5: name
+3 errors
diff --git a/test/langtools/tools/doclint/anchorTests/p/package-info.out b/test/langtools/tools/doclint/anchorTests/p/package-info.out
index 4eaa98adc9c05..1594f46653857 100644
--- a/test/langtools/tools/doclint/anchorTests/p/package-info.out
+++ b/test/langtools/tools/doclint/anchorTests/p/package-info.out
@@ -1,4 +1,10 @@
 package-info.java:13: error: anchor already defined: "here"
- * <a name=here>here again</a>
+ * <a id=here>here again</a>
       ^
-1 error
+package-info.java:14: error: attribute not supported in HTML5: name
+ * <a name=name>obsolete anchor</a>
+      ^
+package-info.java:15: error: attribute not supported in HTML5: name
+ * <a name=name>obsolete anchor again</a>
+      ^
+3 errors
diff --git a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java
index 21da610ff310d..4e699232de26c 100644
--- a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java
+++ b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java
@@ -1,14 +1,11 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8072945
+ * @bug 8072945 8247957
  * @summary test tags and attributes specific to the output HTML version
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
- * @run main DocLintTester -XhtmlVersion:html5 -ref HtmlVersionTagsAttrsTestHtml5.out HtmlVersionTagsAttrsTest.java
- * @run main DocLintTester -XhtmlVersion:html4 -ref HtmlVersionTagsAttrsTestHtml4.out HtmlVersionTagsAttrsTest.java
- * @run main DocLintTester -badargs -XhtmlVersion: HtmlVersionTagsAttrsTest.java
- * @run main DocLintTester -ref HtmlVersionTagsAttrsTestHtml4.out HtmlVersionTagsAttrsTest.java
+ * @run main DocLintTester -Xmaxerrs 200 -ref HtmlVersionTagsAttrsTest.out HtmlVersionTagsAttrsTest.java
  */
 
 /**
@@ -73,7 +70,7 @@ public class HtmlVersionTagsAttrsTest {
      * <tr><td>Test border</td></tr>
      * </table>
      */
-    public void SupportedAttrs_in_html4_not_in_html5() { }
+    public void notSupportedAttrs_html5() { }
 
     /**
      * <ol reversed="reversed">
@@ -88,7 +85,7 @@ public void SupportedAttrs_in_html4_not_in_html5() { }
      * <p id="t2" aria-label="Label">Label test</p>
      * </div>
      */
-    public void SupportedAttrs_in_html5_not_in_html4() { }
+    public void SupportedAttrs_html5() { }
 
     /**
      * <p><big>Bigger text test</big></p>
@@ -156,7 +153,7 @@ public void notSupportedTags_html5() { }
      * <p>Test current time is <time>10:00</time> at night</p>
      * <p>Test <wbr>WBR</wbr> text</p>
      */
-    public void SupportedTags_in_html5_not_in_html4() { }
+    public void SupportedTags_html5() { }
 
     /**
      * <section>
diff --git a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.out
similarity index 65%
rename from test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out
rename to test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.out
index 9c51141bd5a19..69b31d53831f4 100644
--- a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out
+++ b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.out
@@ -1,299 +1,314 @@
-HtmlVersionTagsAttrsTest.java:19: error: attribute not supported in HTML5: rev
+HtmlVersionTagsAttrsTest.java:16: error: attribute not supported in HTML5: rev
      * <a rev="help" href="rev_test.html">Help Page</a>
           ^
-HtmlVersionTagsAttrsTest.java:20: error: attribute not supported in HTML5: charset
+HtmlVersionTagsAttrsTest.java:17: error: attribute not supported in HTML5: charset
      * <a charset="UTF-8" href="charset_test.html">Test page</a>
           ^
-HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: shape
+HtmlVersionTagsAttrsTest.java:18: error: attribute not supported in HTML5: shape
      * <a href="shape_test.html" shape="poly" coords="10,30,56,142">Location</a>
                                  ^
-HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: coords
+HtmlVersionTagsAttrsTest.java:18: error: attribute not supported in HTML5: coords
      * <a href="shape_test.html" shape="poly" coords="10,30,56,142">Location</a>
                                               ^
-HtmlVersionTagsAttrsTest.java:22: error: attribute not supported in HTML5: name
+HtmlVersionTagsAttrsTest.java:19: error: attribute not supported in HTML5: name
      * <img name="name_test" alt="alt">
             ^
-HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: axis
+HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: axis
      * <tr><th axis="desc">Description</th></tr>
                ^
-HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: axis
+HtmlVersionTagsAttrsTest.java:22: error: attribute not supported in HTML5: axis
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                ^
-HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: abbr
+HtmlVersionTagsAttrsTest.java:22: error: attribute not supported in HTML5: abbr
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                            ^
-HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: scope
+HtmlVersionTagsAttrsTest.java:22: error: attribute not supported in HTML5: scope
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                                             ^
-HtmlVersionTagsAttrsTest.java:26: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:23: error: no caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:27: error: attribute not supported in HTML5: summary
+HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: summary
      * <table summary="summary_test"><tr><td>Test Row</td></tr></table>
               ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: align
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
               ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: bgcolor
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: cellpadding
+HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: cellpadding
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                              ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: cellspacing
+HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: cellspacing
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                               ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: frame
+HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: frame
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                               ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: rules
+HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: rules
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                                           ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: width
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                                                        ^
-HtmlVersionTagsAttrsTest.java:30: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:27: error: attribute not supported in HTML5: align
      * <caption align="center">Test table, caption, col, colgroup, tbody,
                 ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: align
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                  ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: char
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                               ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: charoff
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                        ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: valign
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: valign
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                                    ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: width
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                                                 ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:30: error: attribute not supported in HTML5: align
      * <col align="center" valign="top" width="200">
             ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: valign
+HtmlVersionTagsAttrsTest.java:30: error: attribute not supported in HTML5: valign
      * <col align="center" valign="top" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:30: error: attribute not supported in HTML5: width
      * <col align="center" valign="top" width="200">
                                         ^
-HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: align
      * <col align="char" char="." charoff="2">
             ^
-HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: char
      * <col align="char" char="." charoff="2">
                          ^
-HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: charoff
      * <col align="char" char="." charoff="2">
                                   ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: align
      * <thead align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: char
      * <thead align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: charoff
      * <thead align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: valign
+     * <thead align="char" char="." charoff="2" valign="top">
+                                                ^
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: align
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
            ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: char
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                         ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: charoff
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                  ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: bgcolor
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                              ^
-HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: valign
+     * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
+                                                               ^
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: align
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
            ^
-HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: char
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                         ^
-HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: charoff
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                  ^
-HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: bgcolor
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                              ^
-HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: height
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: height
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                ^
-HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: valign
+     * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
+                                                                            ^
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: width
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: nowrap
+HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: nowrap
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:39: error: attribute not supported in HTML5: align
      * <tfoot align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:39: error: attribute not supported in HTML5: char
      * <tfoot align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:39: error: attribute not supported in HTML5: charoff
      * <tfoot align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:39: error: attribute not supported in HTML5: valign
+     * <tfoot align="char" char="." charoff="2" valign="top">
+                                                ^
+HtmlVersionTagsAttrsTest.java:45: error: attribute not supported in HTML5: align
      * <tbody align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:45: error: attribute not supported in HTML5: char
      * <tbody align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:45: error: attribute not supported in HTML5: charoff
      * <tbody align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:45: error: attribute not supported in HTML5: valign
+     * <tbody align="char" char="." charoff="2" valign="top">
+                                                ^
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: align
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
            ^
-HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: char
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                         ^
-HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: charoff
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                  ^
-HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: bgcolor
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                              ^
-HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: height
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: height
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                ^
-HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: valign
+     * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
+                                                                            ^
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: width
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: nowrap
+HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: nowrap
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:55: error: attribute not supported in HTML5: clear
+HtmlVersionTagsAttrsTest.java:52: error: attribute not supported in HTML5: clear
      * <br clear="left">
            ^
-HtmlVersionTagsAttrsTest.java:56: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:53: error: attribute not supported in HTML5: compact
      * <ol compact>
            ^
-HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: type
+HtmlVersionTagsAttrsTest.java:57: error: attribute not supported in HTML5: type
      * <ul type="circle" compact>
            ^
-HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:57: error: attribute not supported in HTML5: compact
      * <ul type="circle" compact>
                          ^
-HtmlVersionTagsAttrsTest.java:61: error: attribute not supported in HTML5: type
+HtmlVersionTagsAttrsTest.java:58: error: attribute not supported in HTML5: type
      * <li type="square">Test list</li>
            ^
-HtmlVersionTagsAttrsTest.java:64: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:61: error: attribute not supported in HTML5: compact
      * <dl compact>
            ^
-HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: hspace
+HtmlVersionTagsAttrsTest.java:65: error: attribute not supported in HTML5: hspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                             ^
-HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: vspace
+HtmlVersionTagsAttrsTest.java:65: error: attribute not supported in HTML5: vspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                         ^
-HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: border
+HtmlVersionTagsAttrsTest.java:65: error: attribute not supported in HTML5: border
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                                     ^
-HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: size
+HtmlVersionTagsAttrsTest.java:66: error: attribute not supported in HTML5: size
      * <hr size="20" noshade>
            ^
-HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: noshade
+HtmlVersionTagsAttrsTest.java:66: error: attribute not supported in HTML5: noshade
      * <hr size="20" noshade>
                      ^
-HtmlVersionTagsAttrsTest.java:70: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: width
      * <pre width="25">Test Pre</pre>
             ^
-HtmlVersionTagsAttrsTest.java:71: error: attribute not supported in HTML5: name
+HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: name
      * <a name="AnchorTest">Anchor Test</a>
           ^
-HtmlVersionTagsAttrsTest.java:72: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
+HtmlVersionTagsAttrsTest.java:69: error: attribute "border" for table only accepts "" or "1": BORDER
      * <table border="0">
               ^
-HtmlVersionTagsAttrsTest.java:74: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:71: error: no caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:94: error: tag not supported in the generated HTML version: big
+HtmlVersionTagsAttrsTest.java:91: error: tag not supported in HTML5: big
      * <p><big>Bigger text test</big></p>
           ^
-HtmlVersionTagsAttrsTest.java:94: warning: empty <p> tag
+HtmlVersionTagsAttrsTest.java:91: warning: empty <p> tag
      * <p><big>Bigger text test</big></p>
                                      ^
-HtmlVersionTagsAttrsTest.java:95: error: tag not supported in the generated HTML version: center
+HtmlVersionTagsAttrsTest.java:92: error: tag not supported in HTML5: center
      * <center>Center text test</center>
        ^
-HtmlVersionTagsAttrsTest.java:96: error: tag not supported in the generated HTML version: font
+HtmlVersionTagsAttrsTest.java:93: error: tag not supported in HTML5: font
      * <font size="3">Font test</font>
        ^
-HtmlVersionTagsAttrsTest.java:96: error: attribute not supported in HTML5: size
-     * <font size="3">Font test</font>
-             ^
-HtmlVersionTagsAttrsTest.java:97: error: tag not supported in the generated HTML version: strike
+HtmlVersionTagsAttrsTest.java:94: error: tag not supported in HTML5: strike
      * <p>Text <strike>strike</strike></p>
                ^
-HtmlVersionTagsAttrsTest.java:98: error: tag not supported in the generated HTML version: tt
+HtmlVersionTagsAttrsTest.java:95: error: tag not supported in HTML5: tt
      * <p><tt>Teletype text</tt></p>
           ^
-HtmlVersionTagsAttrsTest.java:98: warning: empty <p> tag
+HtmlVersionTagsAttrsTest.java:95: warning: empty <p> tag
      * <p><tt>Teletype text</tt></p>
                                 ^
-HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:97: error: unknown tag: hgroup
      * <hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:103: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
      * </hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:103: error: unknown tag: details
      * <details>
        ^
-HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:104: error: unknown tag: summary
      * <summary>Summary</summary>
        ^
-HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:104: error: unknown tag: summary
      * <summary>Summary</summary>
                        ^
-HtmlVersionTagsAttrsTest.java:109: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
      * </details>
        ^
-HtmlVersionTagsAttrsTest.java:132: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:129: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:164: error: heading not found for </section>
+HtmlVersionTagsAttrsTest.java:161: error: heading not found for </section>
      * </section>
        ^
-HtmlVersionTagsAttrsTest.java:167: error: heading not found for </article>
+HtmlVersionTagsAttrsTest.java:164: error: heading not found for </article>
      * </article>
        ^
-HtmlVersionTagsAttrsTest.java:169: error: tag not allowed here: <header>
+HtmlVersionTagsAttrsTest.java:166: error: tag not allowed here: <header>
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:172: error: tag not allowed here: <footer>
+HtmlVersionTagsAttrsTest.java:169: error: tag not allowed here: <footer>
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:175: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:172: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:181: error: tag not allowed here: <header>
+HtmlVersionTagsAttrsTest.java:178: error: tag not allowed here: <header>
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:184: error: tag not allowed here: <footer>
+HtmlVersionTagsAttrsTest.java:181: error: tag not allowed here: <footer>
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:187: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:184: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:192: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
+HtmlVersionTagsAttrsTest.java:189: error: attribute "border" for table only accepts "" or "1": BORDER
      * <table border="2">
               ^
-HtmlVersionTagsAttrsTest.java:194: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:191: error: no caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:205: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:202: error: no caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:208: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:205: error: no caption for table
      * </table>
        ^
-97 errors
+102 errors
 2 warnings
diff --git a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out
deleted file mode 100644
index faa26eeebe0a3..0000000000000
--- a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out
+++ /dev/null
@@ -1,212 +0,0 @@
-HtmlVersionTagsAttrsTest.java:22: warning: attribute obsolete: name
-     * <img name="name_test" alt="alt">
-            ^
-HtmlVersionTagsAttrsTest.java:26: error: no summary or caption for table
-     * </table>
-       ^
-HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: align
-     * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
-              ^
-HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: bgcolor
-     * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
-                           ^
-HtmlVersionTagsAttrsTest.java:30: warning: attribute obsolete, use CSS instead: align
-     * <caption align="center">Test table, caption, col, colgroup, tbody,
-                ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: bgcolor
-     * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
-                                             ^
-HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: bgcolor
-     * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
-                                             ^
-HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: height
-     * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
-                                                               ^
-HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: width
-     * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
-                                                                                         ^
-HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: nowrap
-     * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
-                                                                                                     ^
-HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: bgcolor
-     * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
-                                             ^
-HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: height
-     * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
-                                                               ^
-HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: width
-     * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
-                                                                                         ^
-HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: nowrap
-     * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
-                                                                                                     ^
-HtmlVersionTagsAttrsTest.java:55: warning: attribute obsolete, use CSS instead: clear
-     * <br clear="left">
-           ^
-HtmlVersionTagsAttrsTest.java:56: warning: attribute obsolete, use CSS instead: compact
-     * <ol compact>
-           ^
-HtmlVersionTagsAttrsTest.java:61: warning: attribute obsolete, use CSS instead: type
-     * <li type="square">Test list</li>
-           ^
-HtmlVersionTagsAttrsTest.java:64: warning: attribute obsolete, use CSS instead: compact
-     * <dl compact>
-           ^
-HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: hspace
-     * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
-                                            ^
-HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: vspace
-     * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
-                                                        ^
-HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: border
-     * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
-                                                                    ^
-HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: size
-     * <hr size="20" noshade>
-           ^
-HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: noshade
-     * <hr size="20" noshade>
-                     ^
-HtmlVersionTagsAttrsTest.java:70: warning: attribute obsolete, use CSS instead: width
-     * <pre width="25">Test Pre</pre>
-            ^
-HtmlVersionTagsAttrsTest.java:74: error: no summary or caption for table
-     * </table>
-       ^
-HtmlVersionTagsAttrsTest.java:79: error: attribute not supported in HTML4: reversed
-     * <ol reversed="reversed">
-           ^
-HtmlVersionTagsAttrsTest.java:84: error: attribute not supported in HTML4: crossorigin
-     * <img src="testImg.jpg" alt="imgTest" crossorigin="anonymous">
-                                            ^
-HtmlVersionTagsAttrsTest.java:85: error: attribute not supported in HTML4: aria-labelledby
-     * <div aria-labelledby="Topics" aria-describedby="t1">
-            ^
-HtmlVersionTagsAttrsTest.java:85: error: attribute not supported in HTML4: aria-describedby
-     * <div aria-labelledby="Topics" aria-describedby="t1">
-                                     ^
-HtmlVersionTagsAttrsTest.java:88: error: attribute not supported in HTML4: aria-label
-     * <p id="t2" aria-label="Label">Label test</p>
-                  ^
-HtmlVersionTagsAttrsTest.java:96: warning: attribute obsolete, use CSS instead: size
-     * <font size="3">Font test</font>
-             ^
-HtmlVersionTagsAttrsTest.java:99: error: tag not supported in the generated HTML version: section
-     * <section>
-       ^
-HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
-     * <hgroup>
-       ^
-HtmlVersionTagsAttrsTest.java:103: error: unknown tag: hgroup
-     * </hgroup>
-       ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
-     * <details>
-       ^
-HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
-     * <summary>Summary</summary>
-       ^
-HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
-     * <summary>Summary</summary>
-                       ^
-HtmlVersionTagsAttrsTest.java:109: error: unknown tag: details
-     * </details>
-       ^
-HtmlVersionTagsAttrsTest.java:114: error: tag not supported in the generated HTML version: section
-     * <section>
-       ^
-HtmlVersionTagsAttrsTest.java:119: error: tag not supported in the generated HTML version: article
-     * <article>
-       ^
-HtmlVersionTagsAttrsTest.java:124: error: tag not supported in the generated HTML version: header
-     * <header>
-       ^
-HtmlVersionTagsAttrsTest.java:125: error: tag not supported in the generated HTML version: nav
-     * <nav>Navigation</nav>
-       ^
-HtmlVersionTagsAttrsTest.java:128: error: tag not supported in the generated HTML version: footer
-     * <footer>
-       ^
-HtmlVersionTagsAttrsTest.java:129: error: tag not supported in the generated HTML version: nav
-     * <nav>Navigation</nav>
-       ^
-HtmlVersionTagsAttrsTest.java:132: error: tag not supported in the generated HTML version: main
-     * <main>
-       ^
-HtmlVersionTagsAttrsTest.java:135: error: tag not supported in the generated HTML version: aside
-     * <aside>
-       ^
-HtmlVersionTagsAttrsTest.java:140: error: tag not supported in the generated HTML version: bdi
-     * <li>Testing<bdi>BDI</bdi></li>
-                  ^
-HtmlVersionTagsAttrsTest.java:142: error: tag not supported in the generated HTML version: figure
-     * <figure>
-       ^
-HtmlVersionTagsAttrsTest.java:144: error: tag not supported in the generated HTML version: figcaption
-     * <figcaption>Fig. 1</figcaption>
-       ^
-HtmlVersionTagsAttrsTest.java:146: error: tag not supported in the generated HTML version: mark
-     * <p><mark>Marked</mark> text test</p>
-          ^
-HtmlVersionTagsAttrsTest.java:147: error: tag not supported in the generated HTML version: nav
-     * <nav>
-       ^
-HtmlVersionTagsAttrsTest.java:153: error: tag not supported in the generated HTML version: template
-     * <template id="testTemplate">
-       ^
-HtmlVersionTagsAttrsTest.java:156: error: tag not supported in the generated HTML version: time
-     * <p>Test current time is <time>10:00</time> at night</p>
-                               ^
-HtmlVersionTagsAttrsTest.java:157: error: tag not supported in the generated HTML version: wbr
-     * <p>Test <wbr>WBR</wbr> text</p>
-               ^
-HtmlVersionTagsAttrsTest.java:162: error: tag not supported in the generated HTML version: section
-     * <section>
-       ^
-HtmlVersionTagsAttrsTest.java:165: error: tag not supported in the generated HTML version: article
-     * <article>
-       ^
-HtmlVersionTagsAttrsTest.java:168: error: tag not supported in the generated HTML version: header
-     * <header>
-       ^
-HtmlVersionTagsAttrsTest.java:169: error: tag not supported in the generated HTML version: header
-     * <header>
-       ^
-HtmlVersionTagsAttrsTest.java:172: error: tag not supported in the generated HTML version: footer
-     * <footer>
-       ^
-HtmlVersionTagsAttrsTest.java:175: error: tag not supported in the generated HTML version: main
-     * <main>
-       ^
-HtmlVersionTagsAttrsTest.java:180: error: tag not supported in the generated HTML version: footer
-     * <footer>
-       ^
-HtmlVersionTagsAttrsTest.java:181: error: tag not supported in the generated HTML version: header
-     * <header>
-       ^
-HtmlVersionTagsAttrsTest.java:184: error: tag not supported in the generated HTML version: footer
-     * <footer>
-       ^
-HtmlVersionTagsAttrsTest.java:187: error: tag not supported in the generated HTML version: main
-     * <main>
-       ^
-HtmlVersionTagsAttrsTest.java:194: error: no summary or caption for table
-     * </table>
-       ^
-HtmlVersionTagsAttrsTest.java:199: error: tag not supported in the generated HTML version: header
-     * <header role="banner">Main text</header>
-       ^
-HtmlVersionTagsAttrsTest.java:199: error: attribute not supported in HTML4: role
-     * <header role="banner">Main text</header>
-               ^
-HtmlVersionTagsAttrsTest.java:200: error: attribute not supported in HTML4: role
-     * <div role="navigation">
-            ^
-HtmlVersionTagsAttrsTest.java:205: error: no summary or caption for table
-     * </table>
-       ^
-HtmlVersionTagsAttrsTest.java:208: error: no summary or caption for table
-     * </table>
-       ^
-46 errors
-24 warnings
diff --git a/test/langtools/tools/doclint/html/InlineTagTest.out b/test/langtools/tools/doclint/html/InlineTagTest.out
new file mode 100644
index 0000000000000..aae8dc53142ca
--- /dev/null
+++ b/test/langtools/tools/doclint/html/InlineTagTest.out
@@ -0,0 +1,10 @@
+InlineTagsTest.java:39: error: tag not supported in HTML5: big
+     *  <big> abc </big>
+        ^
+InlineTagsTest.java:45: error: tag not supported in HTML5: font
+     *  <font> abc </font>
+        ^
+InlineTagsTest.java:53: error: tag not supported in HTML5: tt
+     *  <tt> abc </tt>
+        ^
+3 errors
\ No newline at end of file
diff --git a/test/langtools/tools/doclint/html/InlineTagsTest.java b/test/langtools/tools/doclint/html/InlineTagsTest.java
index 0285c9cf477fb..03e0126c0830e 100644
--- a/test/langtools/tools/doclint/html/InlineTagsTest.java
+++ b/test/langtools/tools/doclint/html/InlineTagsTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @bug 8006251
+ * @bug 8006251 8247957
  * @summary test inline tags
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
- * @run main DocLintTester -Xmsgs InlineTagsTest.java
+ * @run main DocLintTester -Xmsgs -ref InlineTagTest.out InlineTagsTest.java
  */
 
 /** */
diff --git a/test/langtools/tools/doclint/html/OtherTagsTest.java b/test/langtools/tools/doclint/html/OtherTagsTest.java
index ec04a418a8f2d..951b20a312f12 100644
--- a/test/langtools/tools/doclint/html/OtherTagsTest.java
+++ b/test/langtools/tools/doclint/html/OtherTagsTest.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8006251 8022173
+ * @bug 8006251 8022173 8247957
  * @summary test other tags
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
diff --git a/test/langtools/tools/doclint/html/OtherTagsTest.out b/test/langtools/tools/doclint/html/OtherTagsTest.out
index 6068dbc9eab6b..571df0f20a3df 100644
--- a/test/langtools/tools/doclint/html/OtherTagsTest.out
+++ b/test/langtools/tools/doclint/html/OtherTagsTest.out
@@ -1,25 +1,28 @@
 OtherTagsTest.java:14: error: element not allowed in documentation comments: <body>
      *  <body> <p> abc </body>
         ^
-OtherTagsTest.java:15: error: element not allowed in documentation comments: <frame>
+OtherTagsTest.java:15: error: tag not supported in HTML5: frame
      *  <frame>
         ^
-OtherTagsTest.java:16: error: element not allowed in documentation comments: <frameset>
+OtherTagsTest.java:16: error: tag not supported in HTML5: frameset
      *  <frameset> </frameset>
         ^
 OtherTagsTest.java:17: error: element not allowed in documentation comments: <head>
      *  <head> </head>
         ^
+OtherTagsTest.java:18: error: attribute not supported in HTML5: width
+     *  <hr width="50%">
+            ^
 OtherTagsTest.java:19: error: element not allowed in documentation comments: <link>
      *  <link>
         ^
 OtherTagsTest.java:20: error: element not allowed in documentation comments: <meta>
      *  <meta>
         ^
-OtherTagsTest.java:21: error: element not allowed in documentation comments: <noframes>
+OtherTagsTest.java:21: error: tag not supported in HTML5: noframes
      *  <noframes> </noframes>
         ^
 OtherTagsTest.java:23: error: element not allowed in documentation comments: <title>
      *  <title> </title>
         ^
-8 errors
+9 errors
diff --git a/test/langtools/tools/doclint/html/TableTagTest.out b/test/langtools/tools/doclint/html/TableTagTest.out
new file mode 100644
index 0000000000000..318587e0b16ec
--- /dev/null
+++ b/test/langtools/tools/doclint/html/TableTagTest.out
@@ -0,0 +1,22 @@
+TableTagsTest.java:37: error: attribute not supported in HTML5: summary
+     *  <table summary="abc"> <tr> <td> </table>
+               ^
+TableTagsTest.java:38: error: attribute not supported in HTML5: summary
+     *  <table summary="abc"> <tr> <th> </table>
+               ^
+TableTagsTest.java:40: error: attribute not supported in HTML5: summary
+     *  <table summary="abc"> <thead> <tr> </thead> <tr> <td> </table>
+               ^
+TableTagsTest.java:41: error: attribute not supported in HTML5: summary
+     *  <table summary="abc"> <tbody> <tr> <td> </tbody> </table>
+               ^
+TableTagsTest.java:42: error: attribute not supported in HTML5: summary
+     *  <table summary="abc"> <tr> <td> <tfoot> <tr> </tfoot></table>
+               ^
+TableTagsTest.java:43: error: attribute not supported in HTML5: summary
+     *  <table summary="abc" width="50%"> <tr> <td> <tfoot> <tr> </tfoot></table>
+               ^
+TableTagsTest.java:43: error: attribute not supported in HTML5: width
+     *  <table summary="abc" width="50%"> <tr> <td> <tfoot> <tr> </tfoot></table>
+                             ^
+7 errors
diff --git a/test/langtools/tools/doclint/html/TableTagsTest.java b/test/langtools/tools/doclint/html/TableTagsTest.java
index b796769893109..88d882e67a564 100644
--- a/test/langtools/tools/doclint/html/TableTagsTest.java
+++ b/test/langtools/tools/doclint/html/TableTagsTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @bug 8006251 8022173
+ * @bug 8006251 8022173 8247957
  * @summary test table tags
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
  * @build DocLintTester
- * @run main DocLintTester -Xmsgs TableTagsTest.java
+ * @run main DocLintTester -Xmsgs -ref TableTagTest.out TableTagsTest.java
  */
 
 /** */
diff --git a/test/langtools/tools/doclint/html/TagNotAllowed.java b/test/langtools/tools/doclint/html/TagNotAllowed.java
index e8836e2dbe56c..6ea68bb6f10ca 100644
--- a/test/langtools/tools/doclint/html/TagNotAllowed.java
+++ b/test/langtools/tools/doclint/html/TagNotAllowed.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
diff --git a/test/langtools/tools/doclint/html/TagNotAllowed.out b/test/langtools/tools/doclint/html/TagNotAllowed.out
index d0de7b5c4cbc4..553d32864aa12 100644
--- a/test/langtools/tools/doclint/html/TagNotAllowed.out
+++ b/test/langtools/tools/doclint/html/TagNotAllowed.out
@@ -25,18 +25,33 @@ TagNotAllowed.java:14: error: tag not allowed here: <b>
 TagNotAllowed.java:14: error: tag not allowed here: <b>
  * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
                                                               ^
+TagNotAllowed.java:16: error: attribute not supported in HTML5: summary
+ * <table summary=description> <b>abc</b> </table>
+          ^
 TagNotAllowed.java:16: error: tag not allowed here: <b>
  * <table summary=description> <b>abc</b> </table>
                                ^
+TagNotAllowed.java:17: error: attribute not supported in HTML5: summary
+ * <table summary=description> <thead> <b>abc</b> </thead> </table>
+          ^
 TagNotAllowed.java:17: error: tag not allowed here: <b>
  * <table summary=description> <thead> <b>abc</b> </thead> </table>
                                        ^
+TagNotAllowed.java:18: error: attribute not supported in HTML5: summary
+ * <table summary=description> <tbody> <b>abc</b> </tbody> </table>
+          ^
 TagNotAllowed.java:18: error: tag not allowed here: <b>
  * <table summary=description> <tbody> <b>abc</b> </tbody> </table>
                                        ^
+TagNotAllowed.java:19: error: attribute not supported in HTML5: summary
+ * <table summary=description> <tfoot> <b>abc</b> </tfoot> </table>
+          ^
 TagNotAllowed.java:19: error: tag not allowed here: <b>
  * <table summary=description> <tfoot> <b>abc</b> </tfoot> </table>
                                        ^
+TagNotAllowed.java:20: error: attribute not supported in HTML5: summary
+ * <table summary=description> <tr> <b>abc</b> </tr> </table>
+          ^
 TagNotAllowed.java:20: error: tag not allowed here: <b>
  * <table summary=description> <tr> <b>abc</b> </tr> </table>
                                     ^
@@ -46,7 +61,7 @@ TagNotAllowed.java:23: error: tag not allowed here: <img>
 TagNotAllowed.java:24: error: tag not allowed here: <p>
  *   <p> para </p>
      ^
-TagNotAllowed.java:25: error: tag not allowed here: <big>
+TagNotAllowed.java:25: error: tag not supported in HTML5: big
  *   <big> text </big>
      ^
 TagNotAllowed.java:26: error: tag not allowed here: <small>
@@ -58,4 +73,4 @@ TagNotAllowed.java:27: error: tag not allowed here: <sub>
 TagNotAllowed.java:28: error: tag not allowed here: <sup>
  *   <sup> text </sup>
      ^
-20 errors
+25 errors
diff --git a/test/langtools/tools/doclint/html/TextNotAllowed.java b/test/langtools/tools/doclint/html/TextNotAllowed.java
index 626740903b2d7..d44239aa6c9f1 100644
--- a/test/langtools/tools/doclint/html/TextNotAllowed.java
+++ b/test/langtools/tools/doclint/html/TextNotAllowed.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -13,21 +13,21 @@
  * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
  *
- * <table summary=description> abc </table>
- * <table summary=description> <thead> abc </thead> </table>
- * <table summary=description> <tbody> abc </tbody> </table>
- * <table summary=description> <tfoot> abc </tfoot> </table>
- * <table summary=description> <tr> abc </tr> </table>
+ * <table> <caption> description </caption> abc </table>
+ * <table> <caption> description </caption> <thead> abc </thead> </table>
+ * <table> <caption> description </caption> <tbody> abc </tbody> </table>
+ * <table> <caption> description </caption> <tfoot> abc </tfoot> </table>
+ * <table> <caption> description </caption> <tr> abc </tr> </table>
  *
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
  * <ol> &amp; <li> item </li> &lt; <li> item </li> &gt; </ol>
  * <ul> &amp; <li> item </li> &lt; <li> item </li> &gt; </ul>
  *
- * <table summary=description> &amp; </table>
- * <table summary=description> <thead> &amp; </thead> </table>
- * <table summary=description> <tbody> &amp; </tbody> </table>
- * <table summary=description> <tfoot> &amp; </tfoot> </table>
- * <table summary=description> <tr> &amp; </tr> </table>
+ * <table> <caption> description </caption> &amp; </table>
+ * <table> <caption> description </caption> <thead> &amp; </thead> </table>
+ * <table> <caption> description </caption> <tbody> &amp; </tbody> </table>
+ * <table> <caption> description </caption> <tfoot> &amp; </tfoot> </table>
+ * <table> <caption> description </caption> <tr> &amp; </tr> </table>
  *
  */
 public class TextNotAllowed { }
diff --git a/test/langtools/tools/doclint/html/TextNotAllowed.out b/test/langtools/tools/doclint/html/TextNotAllowed.out
index c7ae5b1a05ff2..4fa1f069294b3 100644
--- a/test/langtools/tools/doclint/html/TextNotAllowed.out
+++ b/test/langtools/tools/doclint/html/TextNotAllowed.out
@@ -26,20 +26,20 @@ TextNotAllowed.java:14: error: text not allowed in <ul> element
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
                                                ^
 TextNotAllowed.java:16: error: text not allowed in <table> element
- * <table summary=description> abc </table>
-                              ^
+ * <table> <caption> description </caption> abc </table>
+                                           ^
 TextNotAllowed.java:17: error: text not allowed in <thead> element
- * <table summary=description> <thead> abc </thead> </table>
-                                      ^
+ * <table> <caption> description </caption> <thead> abc </thead> </table>
+                                                   ^
 TextNotAllowed.java:18: error: text not allowed in <tbody> element
- * <table summary=description> <tbody> abc </tbody> </table>
-                                      ^
+ * <table> <caption> description </caption> <tbody> abc </tbody> </table>
+                                                   ^
 TextNotAllowed.java:19: error: text not allowed in <tfoot> element
- * <table summary=description> <tfoot> abc </tfoot> </table>
-                                      ^
+ * <table> <caption> description </caption> <tfoot> abc </tfoot> </table>
+                                                   ^
 TextNotAllowed.java:20: error: text not allowed in <tr> element
- * <table summary=description> <tr> abc </tr> </table>
-                                   ^
+ * <table> <caption> description </caption> <tr> abc </tr> </table>
+                                                ^
 TextNotAllowed.java:22: error: text not allowed in <dl> element
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
         ^
@@ -68,18 +68,18 @@ TextNotAllowed.java:24: error: text not allowed in <ul> element
  * <ul> &amp; <li> item </li> &lt; <li> item </li> &gt; </ul>
                                                    ^
 TextNotAllowed.java:26: error: text not allowed in <table> element
- * <table summary=description> &amp; </table>
-                               ^
+ * <table> <caption> description </caption> &amp; </table>
+                                            ^
 TextNotAllowed.java:27: error: text not allowed in <thead> element
- * <table summary=description> <thead> &amp; </thead> </table>
-                                       ^
+ * <table> <caption> description </caption> <thead> &amp; </thead> </table>
+                                                    ^
 TextNotAllowed.java:28: error: text not allowed in <tbody> element
- * <table summary=description> <tbody> &amp; </tbody> </table>
-                                       ^
+ * <table> <caption> description </caption> <tbody> &amp; </tbody> </table>
+                                                    ^
 TextNotAllowed.java:29: error: text not allowed in <tfoot> element
- * <table summary=description> <tfoot> &amp; </tfoot> </table>
-                                       ^
+ * <table> <caption> description </caption> <tfoot> &amp; </tfoot> </table>
+                                                    ^
 TextNotAllowed.java:30: error: text not allowed in <tr> element
- * <table summary=description> <tr> &amp; </tr> </table>
-                                    ^
+ * <table> <caption> description </caption> <tr> &amp; </tr> </table>
+                                                 ^
 28 errors
diff --git a/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java
index 23df06b417891..f04d200d51552 100644
--- a/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java
+++ b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -11,8 +11,8 @@
 // tidy: Warning: <.*> anchor ".*" already defined
 
 /**
- * <a name="here">valid</a>
- * <a name="here">duplicate</a>
+ * <a id="here">valid</a>
+ * <a id="here">duplicate</a>
  * <h2 id="here">duplicate</h2>
  */
 public class AnchorAlreadyDefined { }
diff --git a/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out
index ec745ab16e69a..5ee4fb9258475 100644
--- a/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out
+++ b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out
@@ -1,5 +1,5 @@
 AnchorAlreadyDefined.java:15: error: anchor already defined: "here"
- * <a name="here">duplicate</a>
+ * <a id="here">duplicate</a>
       ^
 AnchorAlreadyDefined.java:16: error: anchor already defined: "here"
  * <h2 id="here">duplicate</h2>
diff --git a/test/langtools/tools/doclint/tidy/BadEnd.java b/test/langtools/tools/doclint/tidy/BadEnd.java
index 9d8643da22dc2..e8bba3a5084d2 100644
--- a/test/langtools/tools/doclint/tidy/BadEnd.java
+++ b/test/langtools/tools/doclint/tidy/BadEnd.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -11,7 +11,7 @@
 // tidy: Warning: <.*> is probably intended as </.*>
 
 /**
- * <a name="here"> text <a>
+ * <a id="here"> text <a>
  * <code> text <code>
  */
 public class BadEnd { }
diff --git a/test/langtools/tools/doclint/tidy/BadEnd.out b/test/langtools/tools/doclint/tidy/BadEnd.out
index 6bd284a0655d2..43e643b79a08c 100644
--- a/test/langtools/tools/doclint/tidy/BadEnd.out
+++ b/test/langtools/tools/doclint/tidy/BadEnd.out
@@ -11,10 +11,10 @@ BadEnd.java:15: error: element not closed: code
  * <code> text <code>
    ^
 BadEnd.java:14: error: element not closed: a
- * <a name="here"> text <a>
-                        ^
+ * <a id="here"> text <a>
+                      ^
 BadEnd.java:14: error: element not closed: a
- * <a name="here"> text <a>
+ * <a id="here"> text <a>
    ^
 4 errors
 2 warnings
diff --git a/test/langtools/tools/doclint/tidy/InvalidName.java b/test/langtools/tools/doclint/tidy/InvalidName.java
index e47e297ce4c17..852415796ecf1 100644
--- a/test/langtools/tools/doclint/tidy/InvalidName.java
+++ b/test/langtools/tools/doclint/tidy/InvalidName.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -11,9 +11,10 @@
 // tidy: Warning: <a> cannot copy name attribute to id
 
 /**
- * <a name="abc">valid</a>
- * <a name="abc123">valid</a>
- * <a name="a.1:2-3_4">valid</a>
- * <a name="foo()">invalid</a>
+ * <a id="abc">valid</a>
+ * <a id="abc123">valid</a>
+ * <a id="a.1:2-3_4">valid</a>
+ * <a id="foo()">valid</a>
+ * <a id="foo() ">invalid</a>
  */
 public class InvalidName { }
diff --git a/test/langtools/tools/doclint/tidy/InvalidName.out b/test/langtools/tools/doclint/tidy/InvalidName.out
index 62d3079915559..ce23b7d548926 100644
--- a/test/langtools/tools/doclint/tidy/InvalidName.out
+++ b/test/langtools/tools/doclint/tidy/InvalidName.out
@@ -1,4 +1,4 @@
-InvalidName.java:17: error: invalid name for anchor: "foo()"
- * <a name="foo()">invalid</a>
+InvalidName.java:18: error: invalid name for anchor: "foo() "
+ * <a id="foo() ">invalid</a>
       ^
 1 error
diff --git a/test/langtools/tools/doclint/tidy/TextNotAllowed.java b/test/langtools/tools/doclint/tidy/TextNotAllowed.java
index 8fc7046e2164d..4ac69c2b569a1 100644
--- a/test/langtools/tools/doclint/tidy/TextNotAllowed.java
+++ b/test/langtools/tools/doclint/tidy/TextNotAllowed.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8247957
  * @summary Add new doclint package
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -11,9 +11,9 @@
 // tidy: Warning: plain text isn't allowed in <.*> elements
 
 /**
- * <table summary=description> abc </table>
- * <table summary=description> <tbody> abc </tbody> </table>
- * <table summary=description> <tr> abc </tr> </table>
+ * <table> <caption> description </caption> abc </table>
+ * <table> <caption> description </caption> <tbody> abc </tbody> </table>
+ * <table> <caption> description </caption> <tr> abc </tr> </table>
  *
  * <dl> abc </dl>
  * <ol> abc </ol>
diff --git a/test/langtools/tools/doclint/tidy/TextNotAllowed.out b/test/langtools/tools/doclint/tidy/TextNotAllowed.out
index b75c43309181b..2c71d717847f0 100644
--- a/test/langtools/tools/doclint/tidy/TextNotAllowed.out
+++ b/test/langtools/tools/doclint/tidy/TextNotAllowed.out
@@ -1,12 +1,12 @@
 TextNotAllowed.java:14: error: text not allowed in <table> element
- * <table summary=description> abc </table>
-                              ^
+ * <table> <caption> description </caption> abc </table>
+                                           ^
 TextNotAllowed.java:15: error: text not allowed in <tbody> element
- * <table summary=description> <tbody> abc </tbody> </table>
-                                      ^
+ * <table> <caption> description </caption> <tbody> abc </tbody> </table>
+                                                   ^
 TextNotAllowed.java:16: error: text not allowed in <tr> element
- * <table summary=description> <tr> abc </tr> </table>
-                                   ^
+ * <table> <caption> description </caption> <tr> abc </tr> </table>
+                                                ^
 TextNotAllowed.java:18: error: text not allowed in <dl> element
  * <dl> abc </dl>
        ^
diff --git a/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.java b/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.java
index 3078e26c71815..a24afe61e4b8d 100644
--- a/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.java
+++ b/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8004832 8026368
+ * @bug 8004832 8026368 8247957
  * @summary Add new doclint package
  * @library ..
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
@@ -12,18 +12,15 @@
 
 /**
  * <b></b>
- * <table summary=description></table>
  * <table><caption></caption></table>
  * <code></code>
  * <dl></dl>
  * <dl><dt></dt><dd></dd></dl>
- * <font></font>
  * <i></i>
  * <ol></ol>
  * <p></p>
  * <pre></pre>
  * <span></span>
- * <tt></tt>
  * <ul></ul>
  * <ul><li></li></ul>
  */
diff --git a/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.out b/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.out
index 9619f23c05d0c..f257840d3ad31 100644
--- a/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.out
+++ b/test/langtools/tools/doclint/tidy/TrimmingEmptyTag.out
@@ -1,52 +1,43 @@
 TrimmingEmptyTag.java:14: warning: empty <b> tag
  * <b></b>
       ^
-TrimmingEmptyTag.java:15: warning: empty <table> tag
- * <table summary=description></table>
-                              ^
-TrimmingEmptyTag.java:16: warning: empty <caption> tag
+TrimmingEmptyTag.java:15: warning: empty <caption> tag
  * <table><caption></caption></table>
                    ^
-TrimmingEmptyTag.java:17: warning: empty <code> tag
+TrimmingEmptyTag.java:16: warning: empty <code> tag
  * <code></code>
          ^
-TrimmingEmptyTag.java:18: warning: empty <dl> tag
+TrimmingEmptyTag.java:17: warning: empty <dl> tag
  * <dl></dl>
        ^
-TrimmingEmptyTag.java:19: warning: empty <dt> tag
+TrimmingEmptyTag.java:18: warning: empty <dt> tag
  * <dl><dt></dt><dd></dd></dl>
            ^
-TrimmingEmptyTag.java:19: warning: empty <dd> tag
+TrimmingEmptyTag.java:18: warning: empty <dd> tag
  * <dl><dt></dt><dd></dd></dl>
                     ^
-TrimmingEmptyTag.java:20: warning: empty <font> tag
- * <font></font>
-         ^
-TrimmingEmptyTag.java:21: warning: empty <i> tag
+TrimmingEmptyTag.java:19: warning: empty <i> tag
  * <i></i>
       ^
-TrimmingEmptyTag.java:22: warning: empty <ol> tag
+TrimmingEmptyTag.java:20: warning: empty <ol> tag
  * <ol></ol>
        ^
-TrimmingEmptyTag.java:23: warning: empty <p> tag
+TrimmingEmptyTag.java:21: warning: empty <p> tag
  * <p></p>
       ^
-TrimmingEmptyTag.java:24: warning: empty <pre> tag
+TrimmingEmptyTag.java:22: warning: empty <pre> tag
  * <pre></pre>
         ^
-TrimmingEmptyTag.java:25: warning: empty <span> tag
+TrimmingEmptyTag.java:23: warning: empty <span> tag
  * <span></span>
          ^
-TrimmingEmptyTag.java:26: warning: empty <tt> tag
- * <tt></tt>
-       ^
-TrimmingEmptyTag.java:27: warning: empty <ul> tag
+TrimmingEmptyTag.java:24: warning: empty <ul> tag
  * <ul></ul>
        ^
-TrimmingEmptyTag.java:31: warning: empty <p> tag
+TrimmingEmptyTag.java:28: warning: empty <p> tag
     /** <p> */
         ^
-TrimmingEmptyTag.java:33: warning: empty <p> tag
+TrimmingEmptyTag.java:30: warning: empty <p> tag
     /** <p> <ul><li>text</ul> */
         ^
-17 warnings
+14 warnings
diff --git a/test/langtools/tools/javac/doclint/DocLintFormatTest.java b/test/langtools/tools/javac/doclint/DocLintFormatTest.java
index 230dbefc83e05..da195619e68ec 100644
--- a/test/langtools/tools/javac/doclint/DocLintFormatTest.java
+++ b/test/langtools/tools/javac/doclint/DocLintFormatTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8172474
+ * @bug 8172474 8247957
  * @summary javac should enable doclint checking for HTML 5
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -60,23 +60,20 @@ void run() throws Exception {
             "/** This is an <mark>HTML 5</mark> comment. */ public class Test5 { }"
         );
 
-        test(src.resolve("Test4.java"), "html4");
-        test(src.resolve("Test4.java"), "html5",
-                "Test4.java:1:16: compiler.err.proc.messager: tag not supported in the generated HTML version: tt");
-        test(src.resolve("Test5.java"), "html4",
-                "Test5.java:1:16: compiler.err.proc.messager: tag not supported in the generated HTML version: mark");
-        test(src.resolve("Test5.java"), "html5");
+        test(src.resolve("Test4.java"),
+                "Test4.java:1:16: compiler.err.proc.messager: tag not supported in HTML5: tt");
+        test(src.resolve("Test5.java"));
 
         if (errors > 0) {
             throw new Exception(errors + " errors occurred");
         }
     }
 
-    void test(Path file, String format, String... expect) {
-        System.err.println("Test: " + format + " " + file);
+    void test(Path file, String... expect) {
+        System.err.println("Test: " + file);
         List<String> output = new JavacTask(tb)
                   .outdir(classes)
-                  .options("-XDrawDiagnostics", "-Xdoclint", "--doclint-format", format)
+                  .options("-XDrawDiagnostics", "-Xdoclint")
                   .files(file)
                   .run(expect.length == 0 ? Task.Expect.SUCCESS : Task.Expect.FAIL)
                   .writeAll()

From 67c221148159d94142a3a6d9ddadce2dff8c858b Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Wed, 6 Jan 2021 23:59:52 +0000
Subject: [PATCH 056/129] 8259045: Exception message from saproc.dll is garbled
 on Windows with Japanese locale

Reviewed-by: erikj, cjplummer, iklam
---
 make/modules/jdk.hotspot.agent/Lib.gmk        |  9 ++--
 .../share/native/libsaproc/sadis.c            | 48 +++----------------
 2 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk
index 827b4bc4f2827..871dffeeb9e05 100644
--- a/make/modules/jdk.hotspot.agent/Lib.gmk
+++ b/make/modules/jdk.hotspot.agent/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ else ifeq ($(call isTargetOs, macosx), true)
       -mstack-alignment=16 -fPIC
   LIBSA_EXTRA_SRC := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent
 else ifeq ($(call isTargetOs, windows), true)
-  SA_CFLAGS := -D_WINDOWS -D_DEBUG -D_CONSOLE -D_MBCS -EHsc
+  SA_CFLAGS := -D_WINDOWS -D_DEBUG -D_CONSOLE -EHsc
   ifeq ($(call isTargetCpu, x86_64), true)
     SA_CXXFLAGS := -DWIN64
   else
@@ -65,12 +65,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
     CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
     EXTRA_SRC := $(LIBSA_EXTRA_SRC), \
-    LDFLAGS := $(LDFLAGS_JDKLIB), \
+    LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(LIBCXX), \
+    LIBS_unix := -ljava, \
     LIBS_linux := $(LIBDL), \
     LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
         -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
-    LIBS_windows := dbgeng.lib, \
+    LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \
 ))
 
 TARGETS += $(BUILD_LIBSA)
diff --git a/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
index 9210f78ab2a89..846ea3b1b0acf 100644
--- a/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
+++ b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
@@ -70,42 +70,8 @@
 #define JVM_MAXPATHLEN MAXPATHLEN
 #endif
 
+#include "jni_util.h"
 
-#ifdef _WINDOWS
-static int getLastErrorString(char *buf, size_t len)
-{
-    long errval;
-
-    if ((errval = GetLastError()) != 0)
-    {
-      /* DOS error */
-      size_t n = (size_t)FormatMessage(
-            FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
-            NULL,
-            errval,
-            0,
-            buf,
-            (DWORD)len,
-            NULL);
-      if (n > 3) {
-        /* Drop final '.', CR, LF */
-        if (buf[n - 1] == '\n') n--;
-        if (buf[n - 1] == '\r') n--;
-        if (buf[n - 1] == '.') n--;
-        buf[n] = '\0';
-      }
-      return (int)n;
-    }
-
-    if (errno != 0)
-    {
-      /* C runtime error that has no corresponding DOS error code */
-      strerror_s(buf, len, errno);
-      return strlen(buf);
-    }
-    return 0;
-}
-#endif /* _WINDOWS */
 
 /*
  * Class:     sun_jvm_hotspot_asm_Disassembler
@@ -157,13 +123,13 @@ JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_asm_Disassembler_load_1library(JNIE
     /* Couldn't find entry point.  error_message should contain some
      * platform dependent error message.
      */
-    jclass eclass = (*env)->FindClass(env, "sun/jvm/hotspot/debugger/DebuggerException");
-    if ((*env)->ExceptionOccurred(env)) {
-      /* Can't throw exception, probably OOM, so silently return 0 */
-      return (jlong) 0;
+    jstring s = JNU_NewStringPlatform(env, error_message);
+    if (s != NULL) {
+      jobject x = JNU_NewObjectByName(env, "sun/jvm/hotspot/debugger/DebuggerException", "(Ljava/lang/String;)V", s);
+      if (x != NULL) {
+        (*env)->Throw(env, x);
+      }
     }
-
-    (*env)->ThrowNew(env, eclass, error_message);
   }
   return (jlong)func;
 }

From 227f99d394571331ffa40b0b6b9d9d61c90635dd Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 7 Jan 2021 03:57:43 +0000
Subject: [PATCH 057/129] 8233555: [TESTBUG] JRadioButton tests failing on
 MacoS

Reviewed-by: serb
---
 test/jdk/ProblemList.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index bb51afe42a133..b223a7e9ab5d5 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -762,9 +762,6 @@ javax/swing/Popup/TaskbarPositionTest.java 8065097 macosx-all,linux-all
 javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all
 javax/swing/JTree/6263446/bug6263446.java 8213125 macosx-all
 javax/swing/JRootPane/4670486/bug4670486.java 8042381 macosx-all
-javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java 8233555 macosx-all
-javax/swing/JRadioButton/8075609/bug8075609.java 8233555 macosx-all
-javax/swing/JRadioButton/8033699/bug8033699.java 8233555 macosx-all
 javax/swing/JPopupMenu/4634626/bug4634626.java 8017175 macosx-all
 javax/swing/JMenuItem/6249972/bug6249972.java 8233640 macosx-all
 

From 81c0624286976b1c162c6fd40cce746ce6e01c8a Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@ckozak.net>
Date: Thu, 7 Jan 2021 06:11:32 +0000
Subject: [PATCH 058/129] 8259354: Fix race condition in
 AbstractEventStream.nextThreadName

Reviewed-by: egahlin
---
 .../classes/jdk/jfr/internal/consumer/AbstractEventStream.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java
index 3d78b43a218ba..cc1c691cc81be 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java
@@ -276,8 +276,7 @@ public Void run() {
     }
 
     private String nextThreadName() {
-        counter.incrementAndGet();
-        return "JFR Event Stream " + counter;
+        return "JFR Event Stream " + counter.incrementAndGet();
     }
 
     @Override

From 0e6de4eb5759ec4c6d8583bd77c3c96b9f34be01 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Thu, 7 Jan 2021 12:15:23 +0000
Subject: [PATCH 059/129] 8259339: AllocateUninitializedArray C2 intrinsic
 fails with void.class input

Reviewed-by: kvn, chagedorn
---
 src/hotspot/share/opto/library_call.cpp       |  5 +++--
 .../unsafe/AllocateUninitializedArray.java    | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index df9b10295e6fc..b6c271f762f63 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3331,7 +3331,8 @@ bool LibraryCallKit::inline_unsafe_newArray(bool uninitialized) {
     // ensuing call will throw an exception, or else it
     // will cache the array klass for next time.
     PreserveJVMState pjvms(this);
-    CallJavaNode* slow_call = generate_method_call_static(vmIntrinsics::_newArray);
+    CallJavaNode* slow_call = uninitialized ? generate_method_call_virtual(vmIntrinsics::_allocateUninitializedArray) :
+                                              generate_method_call_static(vmIntrinsics::_newArray);
     Node* slow_result = set_results_for_java_call(slow_call);
     // this->control() comes from set_results_for_java_call
     result_reg->set_req(_slow_path, control());
diff --git a/test/hotspot/jtreg/compiler/intrinsics/unsafe/AllocateUninitializedArray.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/AllocateUninitializedArray.java
index fe761caa97339..9e9437881d64a 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/unsafe/AllocateUninitializedArray.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/unsafe/AllocateUninitializedArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8150465
+ * @bug 8150465 8259339
  * @summary Unsafe methods to produce uninitialized arrays
  * @modules java.base/jdk.internal.misc:+open
  *
@@ -79,6 +79,7 @@ public static void main(String... args) throws Exception {
         testOK(float[].class,   10, AllConstants::testFloat);
         testOK(long[].class,    10, AllConstants::testLong);
         testOK(double[].class,  10, AllConstants::testDouble);
+        testOK(null,            10, AllConstants::testVoid);
 
         testOK(boolean[].class, 10, LengthIsConstant::testBoolean);
         testOK(byte[].class,    10, LengthIsConstant::testByte);
@@ -88,6 +89,7 @@ public static void main(String... args) throws Exception {
         testOK(float[].class,   10, LengthIsConstant::testFloat);
         testOK(long[].class,    10, LengthIsConstant::testLong);
         testOK(double[].class,  10, LengthIsConstant::testDouble);
+        testOK(null,            10, LengthIsConstant::testVoid);
 
         testOK(boolean[].class, 10, ClassIsConstant::testBoolean);
         testOK(byte[].class,    10, ClassIsConstant::testByte);
@@ -97,6 +99,7 @@ public static void main(String... args) throws Exception {
         testOK(float[].class,   10, ClassIsConstant::testFloat);
         testOK(long[].class,    10, ClassIsConstant::testLong);
         testOK(double[].class,  10, ClassIsConstant::testDouble);
+        testOK(null,            10, ClassIsConstant::testVoid);
 
         testOK(boolean[].class, 10, NothingIsConstant::testBoolean);
         testOK(byte[].class,    10, NothingIsConstant::testByte);
@@ -106,11 +109,18 @@ public static void main(String... args) throws Exception {
         testOK(float[].class,   10, NothingIsConstant::testFloat);
         testOK(long[].class,    10, NothingIsConstant::testLong);
         testOK(double[].class,  10, NothingIsConstant::testDouble);
+        testOK(null,            10, NothingIsConstant::testVoid);
     }
 
     public static void testOK(Class<?> expectClass, int expectLen, Callable<Object> test) throws Exception {
         for (int c = 0; c < ITERS; c++) {
             Object res = test.call();
+            if (res == null) {
+                if (expectClass != null) {
+                    throw new IllegalStateException("Unexpected null result");
+                }
+                continue;
+            }
             Class<?> actualClass = res.getClass();
             if (!actualClass.equals(expectClass)) {
                 throw new IllegalStateException("Wrong class: expected = " + expectClass + ", but got " + actualClass);
@@ -148,6 +158,7 @@ public static void testIAE(Callable<Object> test) throws Exception {
     static volatile Class<?> classFloat   = float.class;
     static volatile Class<?> classLong    = long.class;
     static volatile Class<?> classDouble  = double.class;
+    static volatile Class<?> classVoid    = void.class;
     static volatile Class<?> classObject  = Object.class;
     static volatile Class<?> classArray   = Object[].class;
     static volatile Class<?> classNull    = null;
@@ -161,6 +172,7 @@ static class AllConstants {
         static Object testFloat()   { return UNSAFE.allocateUninitializedArray(float.class,    10); }
         static Object testLong()    { return UNSAFE.allocateUninitializedArray(long.class,     10); }
         static Object testDouble()  { return UNSAFE.allocateUninitializedArray(double.class,   10); }
+        static Object testVoid()    { return UNSAFE.allocateUninitializedArray(void.class,     10); }
         static Object testObject()  { return UNSAFE.allocateUninitializedArray(Object.class,   10); }
         static Object testArray()   { return UNSAFE.allocateUninitializedArray(Object[].class, 10); }
         static Object testNull()    { return UNSAFE.allocateUninitializedArray(null,           10); }
@@ -177,6 +189,7 @@ static class ClassIsConstant {
         static Object testFloat()   { return UNSAFE.allocateUninitializedArray(float.class,    sampleLen); }
         static Object testLong()    { return UNSAFE.allocateUninitializedArray(long.class,     sampleLen); }
         static Object testDouble()  { return UNSAFE.allocateUninitializedArray(double.class,   sampleLen); }
+        static Object testVoid()    { return UNSAFE.allocateUninitializedArray(void.class,     sampleLen); }
         static Object testObject()  { return UNSAFE.allocateUninitializedArray(Object.class,   sampleLen); }
         static Object testArray()   { return UNSAFE.allocateUninitializedArray(Object[].class, sampleLen); }
         static Object testNull()    { return UNSAFE.allocateUninitializedArray(null,           sampleLen); }
@@ -193,6 +206,7 @@ static class LengthIsConstant {
         static Object testFloat()   { return UNSAFE.allocateUninitializedArray(classFloat,   10); }
         static Object testLong()    { return UNSAFE.allocateUninitializedArray(classLong,    10); }
         static Object testDouble()  { return UNSAFE.allocateUninitializedArray(classDouble,  10); }
+        static Object testVoid()    { return UNSAFE.allocateUninitializedArray(classVoid,    10); }
         static Object testObject()  { return UNSAFE.allocateUninitializedArray(classObject,  10); }
         static Object testArray()   { return UNSAFE.allocateUninitializedArray(classArray,   10); }
         static Object testNull()    { return UNSAFE.allocateUninitializedArray(classNull,    10); }
@@ -209,6 +223,7 @@ static class NothingIsConstant {
         static Object testFloat()   { return UNSAFE.allocateUninitializedArray(classFloat,   sampleLen); }
         static Object testLong()    { return UNSAFE.allocateUninitializedArray(classLong,    sampleLen); }
         static Object testDouble()  { return UNSAFE.allocateUninitializedArray(classDouble,  sampleLen); }
+        static Object testVoid()    { return UNSAFE.allocateUninitializedArray(classVoid,    sampleLen); }
         static Object testObject()  { return UNSAFE.allocateUninitializedArray(classObject,  sampleLen); }
         static Object testArray()   { return UNSAFE.allocateUninitializedArray(classArray,   sampleLen); }
         static Object testNull()    { return UNSAFE.allocateUninitializedArray(classNull,    sampleLen); }

From 4a478b8a98d00e1a5cda589e528a73135e783a5e Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 7 Jan 2021 12:21:59 +0000
Subject: [PATCH 060/129] 8250903: jdk/jfr/javaagent/TestLoadedAgent.java fails
 with Mismatch in TestEvent count

Reviewed-by: mgronlun
---
 .../jdk/jfr/javaagent/EventEmitterAgent.java  | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java b/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java
index 0e19589d65d3a..5a4cd4f534f5f 100644
--- a/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java
+++ b/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java
@@ -35,12 +35,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-// Java agent that emits in multiple threads
+// Java agent that emits events
 public class EventEmitterAgent {
 
-    private static final int THREADS = 5;
-    private static final int EVENTS_PER_THREAD = 150_000;
-    private static final int EXPECTED_COUNT = THREADS * EVENTS_PER_THREAD;
+    private static final long EVENTS = 150_000;
     private static final Path DUMP_PATH = Paths.get("dump.jfr").toAbsolutePath();
 
     // Called when agent is loaded from command line
@@ -58,20 +56,13 @@ private static void agentWork() throws Exception {
             r.enable(EventNames.JavaExceptionThrow);
             r.setDestination(DUMP_PATH);
             r.start();
-            Thread[] threads = new Thread[THREADS];
-            for (int i = 0; i < THREADS; i++) {
-                threads[i] = new Thread(EventEmitterAgent::emitEvents);
-                threads[i].start();
-            }
-            for (int i = 0; i < THREADS; i++) {
-                threads[i].join();
-            }
+            emitEvents();
             r.stop();
         }
     }
 
     public static void emitEvents() {
-        for (int i = 0; i < EVENTS_PER_THREAD; i++) {
+        for (int i = 0; i < EVENTS; i++) {
             TestEvent e = new TestEvent();
             e.msg = "Long message that puts pressure on the string pool " + i % 100;
             e.count = i;
@@ -80,7 +71,7 @@ public static void emitEvents() {
             e.commit();
             if (i % 10000 == 0) {
                 try {
-                    Thread.sleep(1);
+                    Thread.sleep(10);
                 } catch (InterruptedException ie) {
                     // ignore
                 }
@@ -101,6 +92,6 @@ public static void validateRecording() throws Exception {
                 .stream()
                 .filter(e -> e.getEventType().getName().equals("Test"))
                 .count();
-        Asserts.assertTrue(testEventCount == EXPECTED_COUNT, "Mismatch in TestEvent count");
+        Asserts.assertEquals(testEventCount, EVENTS, "Mismatch in TestEvent count");
     }
 }

From 1c33847b8b43e1cf6d9649ad3c5d82f294bde6e3 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Thu, 7 Jan 2021 12:35:16 +0000
Subject: [PATCH 061/129] 8259067: bootclasspath append takes out object lock

Reviewed-by: lfoltan, sspitsyn, iklam, dholmes
---
 src/hotspot/share/classfile/classLoader.cpp   | 22 +++++++++++--------
 src/hotspot/share/classfile/classLoader.hpp   | 13 +++++++----
 .../share/classfile/classLoader.inline.hpp    |  8 +++----
 src/hotspot/share/prims/jvmtiEnv.cpp          |  9 +-------
 src/hotspot/share/runtime/mutexLocker.cpp     |  2 ++
 src/hotspot/share/runtime/mutexLocker.hpp     |  4 +++-
 6 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index 8dcd7985a40f2..835b6685c7b49 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,8 +141,9 @@ PerfCounter*    ClassLoader::_unsafe_defineClassCallCounter = NULL;
 GrowableArray<ModuleClassPathList*>* ClassLoader::_patch_mod_entries = NULL;
 GrowableArray<ModuleClassPathList*>* ClassLoader::_exploded_entries = NULL;
 ClassPathEntry* ClassLoader::_jrt_entry = NULL;
-ClassPathEntry* ClassLoader::_first_append_entry = NULL;
-ClassPathEntry* ClassLoader::_last_append_entry  = NULL;
+
+ClassPathEntry* volatile ClassLoader::_first_append_entry_list = NULL;
+ClassPathEntry* volatile ClassLoader::_last_append_entry  = NULL;
 #if INCLUDE_CDS
 ClassPathEntry* ClassLoader::_app_classpath_entries = NULL;
 ClassPathEntry* ClassLoader::_last_app_classpath_entry = NULL;
@@ -815,7 +816,7 @@ ClassPathZipEntry* ClassLoader::create_class_path_zip_entry(const char *path, bo
 
 // returns true if entry already on class path
 bool ClassLoader::contains_append_entry(const char* name) {
-  ClassPathEntry* e = _first_append_entry;
+  ClassPathEntry* e = first_append_entry();
   while (e != NULL) {
     // assume zip entries have been canonicalized
     if (strcmp(name, e->name()) == 0) {
@@ -826,11 +827,14 @@ bool ClassLoader::contains_append_entry(const char* name) {
   return false;
 }
 
+// The boot append entries are added with a lock, and read lock free.
 void ClassLoader::add_to_boot_append_entries(ClassPathEntry *new_entry) {
   if (new_entry != NULL) {
+    MutexLocker ml(Bootclasspath_lock, Mutex::_no_safepoint_check_flag);
     if (_last_append_entry == NULL) {
-      assert(_first_append_entry == NULL, "boot loader's append class path entry list not empty");
-      _first_append_entry = _last_append_entry = new_entry;
+      _last_append_entry = new_entry;
+      assert(first_append_entry() == NULL, "boot loader's append class path entry list not empty");
+      Atomic::release_store(&_first_append_entry_list, new_entry);
     } else {
       _last_append_entry->set_next(new_entry);
       _last_append_entry = new_entry;
@@ -944,7 +948,7 @@ void ClassLoader::print_bootclasspath() {
   }
 
   // appended entries
-  e = _first_append_entry;
+  e = first_append_entry();
   while (e != NULL) {
     tty->print("%s ;", e->name());
     e = e->next();
@@ -1252,7 +1256,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
     assert(classpath_index == 0, "The classpath_index has been incremented incorrectly");
     classpath_index = 1;
 
-    e = _first_append_entry;
+    e = first_append_entry();
     while (e != NULL) {
       stream = e->open_stream(file_name, CHECK_NULL);
       if (NULL != stream) {
@@ -1427,7 +1431,7 @@ void ClassLoader::record_result(InstanceKlass* ik, const ClassFileStream* stream
 // Initialize the class loader's access to methods in libzip.  Parse and
 // process the boot classpath into a list ClassPathEntry objects.  Once
 // this list has been created, it must not change order (see class PackageInfo)
-// it can be appended to and is by jvmti and the kernel vm.
+// it can be appended to and is by jvmti.
 
 void ClassLoader::initialize() {
   EXCEPTION_MARK;
diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp
index 9e0dde6464ee7..e00892c423d9e 100644
--- a/src/hotspot/share/classfile/classLoader.hpp
+++ b/src/hotspot/share/classfile/classLoader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,6 +53,7 @@ class ClassPathEntry : public CHeapObj<mtClass> {
   ClassPathEntry* next() const;
   virtual ~ClassPathEntry() {}
   void set_next(ClassPathEntry* next);
+
   virtual bool is_modules_image() const { return false; }
   virtual bool is_jar_file() const { return false; }
   // Is this entry created from the "Class-path" attribute from a JAR Manifest?
@@ -214,9 +215,13 @@ class ClassLoader: AllStatic {
   // 3. the boot loader's append path
   //    [-Xbootclasspath/a]; [jvmti appended entries]
   //    Note: boot loader append path does not support named modules.
-  static ClassPathEntry* _first_append_entry;
+  static ClassPathEntry* volatile _first_append_entry_list;
+  static ClassPathEntry* first_append_entry() {
+    return Atomic::load_acquire(&_first_append_entry_list);
+  }
+
   // Last entry in linked list of appended ClassPathEntry instances
-  static ClassPathEntry* _last_append_entry;
+  static ClassPathEntry* volatile _last_append_entry;
 
   // Info used by CDS
   CDS_ONLY(static ClassPathEntry* _app_classpath_entries;)
@@ -234,7 +239,7 @@ class ClassLoader: AllStatic {
   CDS_ONLY(static ClassPathEntry* app_classpath_entries() {return _app_classpath_entries;})
   CDS_ONLY(static ClassPathEntry* module_path_entries() {return _module_path_entries;})
 
-  static bool has_bootclasspath_append() { return _first_append_entry != NULL; }
+  static bool has_bootclasspath_append() { return first_append_entry() != NULL; }
 
  protected:
   // Initialization:
diff --git a/src/hotspot/share/classfile/classLoader.inline.hpp b/src/hotspot/share/classfile/classLoader.inline.hpp
index 5d10272e522eb..aa362f3112c06 100644
--- a/src/hotspot/share/classfile/classLoader.inline.hpp
+++ b/src/hotspot/share/classfile/classLoader.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ inline ClassPathEntry* ClassLoader::classpath_entry(int n) {
     // the _jrt_entry is not included in the _first_append_entry
     // linked list, it must be accounted for when comparing the
     // class path vs. the shared archive class path.
-    ClassPathEntry* e = ClassLoader::_first_append_entry;
+    ClassPathEntry* e = first_append_entry();
     while (--n >= 1) {
       assert(e != NULL, "Not that many classpath entries.");
       e = e->next();
@@ -72,7 +72,7 @@ inline int ClassLoader::num_boot_classpath_entries() {
   Arguments::assert_is_dumping_archive();
   assert(has_jrt_entry(), "must have a java runtime image");
   int num_entries = 1; // count the runtime image
-  ClassPathEntry* e = ClassLoader::_first_append_entry;
+  ClassPathEntry* e = first_append_entry();
   while (e != NULL) {
     num_entries ++;
     e = e->next();
@@ -82,7 +82,7 @@ inline int ClassLoader::num_boot_classpath_entries() {
 
 inline ClassPathEntry* ClassLoader::get_next_boot_classpath_entry(ClassPathEntry* e) {
   if (e == ClassLoader::_jrt_entry) {
-    return ClassLoader::_first_append_entry;
+    return first_append_entry();
   } else {
     return e->next();
   }
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 4559f9d279d1f..d3694e342bb8f 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -659,13 +659,6 @@ JvmtiEnv::AddToBootstrapClassLoaderSearch(const char* segment) {
       return JVMTI_ERROR_ILLEGAL_ARGUMENT;
     }
 
-    // lock the loader
-    Thread* thread = Thread::current();
-    HandleMark hm(thread);
-    Handle loader_lock = Handle(thread, SystemDictionary::system_loader_lock());
-
-    ObjectLocker ol(loader_lock, thread);
-
     // add the jar file to the bootclasspath
     log_info(class, load)("opened: %s", zip_entry->name());
 #if INCLUDE_CDS
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 140ff4f10b93a..f61e78856afb7 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -157,6 +157,7 @@ Mutex*   CDSLambda_lock               = NULL;
 Mutex*   DumpRegion_lock              = NULL;
 Mutex*   ClassListFile_lock           = NULL;
 #endif // INCLUDE_CDS
+Mutex*   Bootclasspath_lock           = NULL;
 
 #if INCLUDE_JVMCI
 Monitor* JVMCI_lock                   = NULL;
@@ -353,6 +354,7 @@ void mutex_init() {
   def(DumpRegion_lock              , PaddedMutex  , leaf,        true,  _safepoint_check_never);
   def(ClassListFile_lock           , PaddedMutex  , leaf,        true,  _safepoint_check_never);
 #endif // INCLUDE_CDS
+  def(Bootclasspath_lock           , PaddedMutex  , leaf,        false, _safepoint_check_never);
 
 #if INCLUDE_JVMCI
   def(JVMCI_lock                   , PaddedMonitor, nonleaf+2,   true,  _safepoint_check_always);
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index a4a5865cf3c62..de9fe972c1a6e 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,6 +158,8 @@ extern Mutex*   CodeHeapStateAnalytics_lock;     // lock print functions against
 extern Monitor* JVMCI_lock;                      // Monitor to control initialization of JVMCI
 #endif
 
+extern Mutex*   Bootclasspath_lock;
+
 extern Mutex* tty_lock;                          // lock to synchronize output.
 
 // A MutexLocker provides mutual exclusion with respect to a given mutex

From 3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 7 Jan 2021 12:39:44 +0000
Subject: [PATCH 062/129] 8258484: AIX build fails in Harfbuzz with XLC
 16.01.0000.0006

Reviewed-by: clanger, mdoerr
---
 make/modules/java.desktop/lib/Awt2dLibraries.gmk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index 3203378d00a49..b1e07006f5622 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -474,6 +474,11 @@ else
     #
 
   LIBHARFBUZZ_OPTIMIZATION := HIGH
+  # Early re-canonizing has to be disabled to workaround an internal XlC compiler error
+  # when building libharfbuzz
+  ifeq ($(call isTargetOs, aix), true)
+    LIBHARFBUZZ_CFLAGS += -qdebug=necan
+  endif
 
   LIBHARFBUZZ_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
 

From f91f92dcaadca3e5e7fd8d1300d8e24f7872f562 Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Thu, 7 Jan 2021 13:18:50 +0000
Subject: [PATCH 063/129] 8259317: Remove JVM option BreakAtWarning

Reviewed-by: lfoltan, coleenp
---
 src/hotspot/share/runtime/globals.hpp | 3 ---
 src/hotspot/share/utilities/debug.cpp | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 7a9419ca9d5b1..f4f47dcfc7103 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -554,9 +554,6 @@ const intx ObjectAlignmentInBytes = 8;
           "directory) of the dump file (defaults to java_pid<pid>.hprof "   \
           "in the working directory)")                                      \
                                                                             \
-  develop(bool, BreakAtWarning, false,                                      \
-          "Execute breakpoint upon encountering VM warning")                \
-                                                                            \
   product(ccstr, NativeMemoryTracking, "off",                               \
           "Native memory tracking options")                                 \
                                                                             \
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index 7892cfc1ad583..25762fa43f1e1 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,7 +125,6 @@ void warning(const char* format, ...) {
     va_end(ap);
     fputc('\n', err);
   }
-  if (BreakAtWarning) BREAKPOINT;
 }
 
 #ifndef PRODUCT

From 484e23b92acb76bb0c9dbcec55e1610140208ea8 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Thu, 7 Jan 2021 14:57:30 +0000
Subject: [PATCH 064/129] 8258657: Doc build is broken by use of new language
 features

Reviewed-by: tbell, iris
---
 make/Docs.gmk              |  4 ++--
 make/autoconf/boot-jdk.m4  | 27 ++++++++++++++++++++++++++-
 make/autoconf/configure.ac |  3 ++-
 make/autoconf/spec.gmk.in  |  4 +++-
 make/conf/jib-profiles.js  |  9 ++++++---
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 1f7a0caf81990..3d8d3e1492d40 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -477,7 +477,7 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
     SHORT_NAME := $(JAVASE_SHORT_NAME), \
     LONG_NAME := $(JAVASE_LONG_NAME), \
     TARGET_DIR := $(DOCS_REFERENCE_IMAGE_DIR)/api, \
-    JAVADOC_CMD := $(JAVADOC), \
+    JAVADOC_CMD := $(DOCS_REFERENCE_JAVADOC), \
     OPTIONS := $(REFERENCE_OPTIONS), \
     TAGS := $(REFERENCE_TAGS), \
 ))
diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
index a7a9f1aba2832..1d82f7c79b943 100644
--- a/make/autoconf/boot-jdk.m4
+++ b/make/autoconf/boot-jdk.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -606,3 +606,28 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
   AC_SUBST(BUILD_JDK)
   AC_SUBST(EXTERNAL_BUILDJDK)
 ])
+
+# The docs-reference JDK is used to run javadoc for the docs-reference targets.
+# If not set, the reference docs will be built using the interim javadoc.
+AC_DEFUN([BOOTJDK_SETUP_DOCS_REFERENCE_JDK],
+[
+  AC_ARG_WITH(docs-reference-jdk, [AS_HELP_STRING([--with-docs-reference-jdk],
+      [path to JDK to use for building the reference documentation])])
+
+  AC_MSG_CHECKING([for docs-reference JDK])
+  if test "x$with_docs_reference_jdk" != "x"; then
+    DOCS_REFERENCE_JDK="$with_docs_reference_jdk"
+    AC_MSG_RESULT([$DOCS_REFERENCE_JDK])
+    DOCS_REFERENCE_JAVADOC="$DOCS_REFERENCE_JDK/bin/javadoc"
+    if test ! -x "$DOCS_REFERENCE_JAVADOC"; then
+      AC_MSG_ERROR([docs-reference JDK found at $DOCS_REFERENCE_JDK did not contain bin/javadoc])
+    fi
+    UTIL_FIXUP_EXECUTABLE(DOCS_REFERENCE_JAVADOC)
+  else
+    AC_MSG_RESULT([no, using interim javadoc for the docs-reference targets])
+    # By leaving this empty, Docs.gmk will revert to the default interim javadoc
+    DOCS_REFERENCE_JAVADOC=
+  fi
+
+  AC_SUBST(DOCS_REFERENCE_JAVADOC)
+])
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index a2fe84a1fb2bc..ab0122f7908de 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -144,6 +144,7 @@ JDKVER_SETUP_JDK_VERSION_NUMBERS
 
 BOOTJDK_SETUP_BOOT_JDK
 BOOTJDK_SETUP_BUILD_JDK
+BOOTJDK_SETUP_DOCS_REFERENCE_JDK
 
 ###############################################################################
 #
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 9e0d03e6f6cc9..7d859fd0d8e81 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -648,6 +648,8 @@ BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
 BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac
 BUILD_JAR=@FIXPATH@ $(BUILD_JDK)/bin/jar
 
+DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
+
 # Interim langtools modules and arguments
 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 2bd8ac926d577..632953e8e8887 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -723,8 +723,11 @@ var getJibProfilesProfiles = function (input, common, data) {
             configure_args: concat(
                 "--enable-full-docs",
                 versionArgs(input, common),
-                "--with-build-jdk=" + input.get(buildJdkDep, "home_path")
-                    + (input.build_os == "macosx" ? "/Contents/Home" : "")
+                "--with-build-jdk=" + input.get(buildJdkDep, "home_path"),
+                // Provide an explicit JDK for the docs-reference target to
+                // mimic the running conditions of when it's run for real as
+                // closely as possible.
+                "--with-docs-reference-jdk=" + input.get(buildJdkDep, "home_path")
             ),
             default_make_targets: ["all-docs-bundles"],
             artifacts: {

From c1fb521694817c3f680b5709fc7ce89419d20786 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Thu, 7 Jan 2021 15:02:45 +0000
Subject: [PATCH 065/129] 8259227: C2 crashes with SIGFPE due to a division
 that floats above its zero check

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/ifnode.cpp             | 10 ++-
 src/hotspot/share/opto/loopnode.hpp           |  1 -
 src/hotspot/share/opto/loopopts.cpp           | 21 +----
 src/hotspot/share/opto/phaseX.cpp             | 19 +++++
 src/hotspot/share/opto/phaseX.hpp             |  1 +
 .../loopopts/TestDivZeroDominatedBy.java      | 78 +++++++++++++++++++
 .../loopopts/TestDivZeroWithSplitIf.java      |  5 +-
 7 files changed, 109 insertions(+), 26 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/TestDivZeroDominatedBy.java

diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 4d1ef3cf8651f..3e74127a01ad3 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -1477,14 +1477,16 @@ Node* IfNode::dominated_by(Node* prev_dom, PhaseIterGVN *igvn) {
     // Loop ends when projection has no more uses.
     for (DUIterator_Last jmin, j = ifp->last_outs(jmin); j >= jmin; --j) {
       Node* s = ifp->last_out(j);   // Get child of IfTrue/IfFalse
-      if( !s->depends_only_on_test() ) {
+      if (s->depends_only_on_test() && igvn->no_dependent_zero_check(s)) {
+        // For control producers.
+        // Do not rewire Div and Mod nodes which could have a zero divisor to avoid skipping their zero check.
+        igvn->replace_input_of(s, 0, data_target); // Move child to data-target
+      } else {
         // Find the control input matching this def-use edge.
         // For Regions it may not be in slot 0.
         uint l;
-        for( l = 0; s->in(l) != ifp; l++ ) { }
+        for (l = 0; s->in(l) != ifp; l++) { }
         igvn->replace_input_of(s, l, ctrl_target);
-      } else {                      // Else, for control producers,
-        igvn->replace_input_of(s, 0, data_target); // Move child to data-target
       }
     } // End for each child of a projection
 
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 5eb5efaaa6064..aa89d475ef8ab 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1451,7 +1451,6 @@ class PhaseIdealLoop : public PhaseTransform {
   // Mark an IfNode as being dominated by a prior test,
   // without actually altering the CFG (and hence IDOM info).
   void dominated_by( Node *prevdom, Node *iff, bool flip = false, bool exclude_loop_predicate = false );
-  bool no_dependent_zero_check(Node* n) const;
 
   // Split Node 'n' through merge point
   Node *split_thru_region( Node *n, Node *region );
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 8c160c058cffa..54d13cb9d6c90 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -283,7 +283,7 @@ void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exc
   for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) {
     Node* cd = dp->fast_out(i); // Control-dependent node
     // Do not rewire Div and Mod nodes which could have a zero divisor to avoid skipping their zero check.
-    if (cd->depends_only_on_test() && no_dependent_zero_check(cd)) {
+    if (cd->depends_only_on_test() && _igvn.no_dependent_zero_check(cd)) {
       assert(cd->in(0) == dp, "");
       _igvn.replace_input_of(cd, 0, prevdom);
       set_early_ctrl(cd, false);
@@ -302,25 +302,6 @@ void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exc
   }
 }
 
-// Check if the type of a divisor of a Div or Mod node includes zero.
-bool PhaseIdealLoop::no_dependent_zero_check(Node* n) const {
-  switch (n->Opcode()) {
-    case Op_DivI:
-    case Op_ModI: {
-      // Type of divisor includes 0?
-      const TypeInt* type_divisor = _igvn.type(n->in(2))->is_int();
-      return (type_divisor->_hi < 0 || type_divisor->_lo > 0);
-    }
-    case Op_DivL:
-    case Op_ModL: {
-      // Type of divisor includes 0?
-      const TypeLong* type_divisor = _igvn.type(n->in(2))->is_long();
-      return (type_divisor->_hi < 0 || type_divisor->_lo > 0);
-    }
-  }
-  return true;
-}
-
 //------------------------------has_local_phi_input----------------------------
 // Return TRUE if 'n' has Phi inputs from its local block and no other
 // block-local inputs (all non-local-phi inputs come from earlier blocks)
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 03e0d3ce97b86..d6929ab9f32c6 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1659,6 +1659,25 @@ void PhaseIterGVN::remove_speculative_types()  {
   _table.check_no_speculative_types();
 }
 
+// Check if the type of a divisor of a Div or Mod node includes zero.
+bool PhaseIterGVN::no_dependent_zero_check(Node* n) const {
+  switch (n->Opcode()) {
+    case Op_DivI:
+    case Op_ModI: {
+      // Type of divisor includes 0?
+      const TypeInt* type_divisor = type(n->in(2))->is_int();
+      return (type_divisor->_hi < 0 || type_divisor->_lo > 0);
+    }
+    case Op_DivL:
+    case Op_ModL: {
+      // Type of divisor includes 0?
+      const TypeLong* type_divisor = type(n->in(2))->is_long();
+      return (type_divisor->_hi < 0 || type_divisor->_lo > 0);
+    }
+  }
+  return true;
+}
+
 //=============================================================================
 #ifndef PRODUCT
 uint PhaseCCP::_total_invokes   = 0;
diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp
index f197536e73dc9..49ae866cccc04 100644
--- a/src/hotspot/share/opto/phaseX.hpp
+++ b/src/hotspot/share/opto/phaseX.hpp
@@ -546,6 +546,7 @@ class PhaseIterGVN : public PhaseGVN {
   }
 
   bool is_dominator(Node *d, Node *n) { return is_dominator_helper(d, n, false); }
+  bool no_dependent_zero_check(Node* n) const;
 
 #ifndef PRODUCT
 protected:
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestDivZeroDominatedBy.java b/test/hotspot/jtreg/compiler/loopopts/TestDivZeroDominatedBy.java
new file mode 100644
index 0000000000000..80b5b552eef31
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestDivZeroDominatedBy.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @key stress randomness
+ * @bug 8259227
+ * @summary Verify that zero check is executed before division/modulo operation.
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroDominatedBy::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=917280111 compiler.loopopts.TestDivZeroDominatedBy
+ * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroDominatedBy::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM compiler.loopopts.TestDivZeroDominatedBy
+ */
+
+package compiler.loopopts;
+
+public class TestDivZeroDominatedBy {
+
+    public static int iFld = 1;
+    public static int iFld1 = 2;
+    public static int iFld2 = 3;
+    public static int iArrFld[] = new int[10];
+    public static double dFld = 1.0;
+
+    public static void test() {
+        int x = 1;
+        int y = 2;
+        int z = 3;
+
+        iFld = y;
+        iArrFld[5] += iFld1;
+        int i = 1;
+        do {
+            for (int j = 0; j < 10; j++) {
+                iFld2 += iFld2;
+                iFld1 = iFld2;
+                int k = 1;
+                do {
+                    iArrFld[k] = y;
+                    z = iFld2;
+                    dFld = x;
+                    try {
+                        y = iArrFld[k];
+                        iArrFld[8] = 5;
+                        iFld = (100 / z);
+                    } catch (ArithmeticException a_e) {}
+                } while (++k < 2);
+            }
+        } while (++i < 10);
+    }
+
+    public static void main(String[] strArr) {
+        test();
+    }
+}
+
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestDivZeroWithSplitIf.java b/test/hotspot/jtreg/compiler/loopopts/TestDivZeroWithSplitIf.java
index eff1f1ca1d896..c842152684d3e 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestDivZeroWithSplitIf.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestDivZeroWithSplitIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,14 @@
 
 /*
  * @test
+ * @key stress randomness
  * @bug 8257822
  * @summary Verify that zero check is executed before division/modulo operation.
  * @requires vm.compiler2.enabled
  * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroWithSplitIf::test
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=873732072 compiler.loopopts.TestDivZeroWithSplitIf
+ * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=compiler/loopopts/TestDivZeroWithSplitIf::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM compiler.loopopts.TestDivZeroWithSplitIf
  */
 
 package compiler.loopopts;

From acdd90b699267db59967a21c4e75be033af0e5ce Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 7 Jan 2021 16:38:53 +0000
Subject: [PATCH 066/129] 8258972: unexpected compilation error with generic
 sealed interface

Reviewed-by: jlahoda
---
 .../share/classes/com/sun/tools/javac/code/Types.java |  4 ++--
 .../tools/javac/sealed/SealedCompilationTests.java    | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index de2a73e2e3a8c..e112281c3b9ea 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -1667,11 +1667,11 @@ public boolean isCastable(Type t, Type s, Warner warn) {
     }
     // where
         private boolean areDisjoint(ClassSymbol ts, ClassSymbol ss) {
-            if (isSubtype(ts.type, ss.type)) {
+            if (isSubtype(erasure(ts.type), erasure(ss.type))) {
                 return false;
             }
             // if both are classes or both are interfaces, shortcut
-            if (ts.isInterface() == ss.isInterface() && isSubtype(ss.type, ts.type)) {
+            if (ts.isInterface() == ss.isInterface() && isSubtype(erasure(ss.type), erasure(ts.type))) {
                 return false;
             }
             if (ts.isInterface() && !ss.isInterface()) {
diff --git a/test/langtools/tools/javac/sealed/SealedCompilationTests.java b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
index 50e64d10b8139..f61fe5b87e2a8 100644
--- a/test/langtools/tools/javac/sealed/SealedCompilationTests.java
+++ b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
@@ -1247,6 +1247,17 @@ void m(A a, C c) {
                      a = (A)c;
                   }
                 }
+                """,
+                """
+                sealed interface A<T> {
+                    final class B implements A<Object> { }
+                }
+
+                class Test {
+                    void f(A.B a, A<Object> b) {
+                        a = (A.B)b;
+                    }
+                }
                 """
         )) {
             assertOK(s);

From 8530ef0e4dda328d5b9856b03e29b764d06229fb Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Thu, 7 Jan 2021 17:13:41 +0000
Subject: [PATCH 067/129] 8259375: JvmtiExport::jni_Get/SetField_probe calls do
 not need ResetNoHandleMark

Reviewed-by: lfoltan, dcubed
---
 src/hotspot/share/prims/jni.cpp         |  8 +-------
 src/hotspot/share/prims/jvmtiExport.cpp | 14 +++-----------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index a87b9446dc153..82561c5a28da1 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1941,8 +1941,6 @@ JNI_ENTRY_NO_PRESERVE(Return, jni_Get##Result##Field(JNIEnv *env, jobject obj, j
   Klass* k = o->klass(); \
   int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID);  \
   /* Keep JVMTI addition small and only check enabled flag here.       */ \
-  /* jni_GetField_probe_nh() assumes that is not okay to create handles */ \
-  /* and creates a ResetNoHandleMark.                                   */ \
   if (JvmtiExport::should_post_field_access()) { \
     o = JvmtiExport::jni_GetField_probe_nh(thread, obj, o, k, fieldID, false); \
   } \
@@ -2008,8 +2006,6 @@ JNI_ENTRY_NO_PRESERVE(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldI
   Klass* k = o->klass();
   int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID);
   // Keep JVMTI addition small and only check enabled flag here.
-  // jni_SetField_probe_nh() assumes that is not okay to create handles
-  // and creates a ResetNoHandleMark.
   if (JvmtiExport::should_post_field_modification()) {
     jvalue field_value;
     field_value.l = value;
@@ -2032,8 +2028,6 @@ JNI_ENTRY_NO_PRESERVE(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfi
   Klass* k = o->klass(); \
   int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID);  \
   /* Keep JVMTI addition small and only check enabled flag here.       */ \
-  /* jni_SetField_probe_nh() assumes that is not okay to create handles */ \
-  /* and creates a ResetNoHandleMark.                                   */ \
   if (JvmtiExport::should_post_field_modification()) { \
     jvalue field_value; \
     field_value.unionType = value; \
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 14766c61468b7..73c07b876fd23 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1886,11 +1886,7 @@ oop JvmtiExport::jni_GetField_probe(JavaThread *thread, jobject jobj, oop obj,
 oop JvmtiExport::jni_GetField_probe_nh(JavaThread *thread, jobject jobj, oop obj,
                                        Klass* klass, jfieldID fieldID, bool is_static) {
   if (*((int *)get_field_access_count_addr()) > 0 && thread->has_last_Java_frame()) {
-    // At least one field access watch is set so we have more work
-    // to do. This wrapper is used by "quick" entry points that don't
-    // allow us to create handles in post_field_access_by_jni(). We
-    // override that with a ResetNoHandleMark.
-    ResetNoHandleMark rnhm;
+    // At least one field access watch is set so we have more work to do.
     post_field_access_by_jni(thread, obj, klass, fieldID, is_static);
     // event posting can block so refetch oop if we were passed a jobj
     if (jobj != NULL) return JNIHandles::resolve_non_null(jobj);
@@ -1981,11 +1977,7 @@ oop JvmtiExport::jni_SetField_probe_nh(JavaThread *thread, jobject jobj, oop obj
                                        Klass* klass, jfieldID fieldID, bool is_static,
                                        char sig_type, jvalue *value) {
   if (*((int *)get_field_modification_count_addr()) > 0 && thread->has_last_Java_frame()) {
-    // At least one field modification watch is set so we have more work
-    // to do. This wrapper is used by "quick" entry points that don't
-    // allow us to create handles in post_field_modification_by_jni(). We
-    // override that with a ResetNoHandleMark.
-    ResetNoHandleMark rnhm;
+    // At least one field modification watch is set so we have more work to do.
     post_field_modification_by_jni(thread, obj, klass, fieldID, is_static, sig_type, value);
     // event posting can block so refetch oop if we were passed a jobj
     if (jobj != NULL) return JNIHandles::resolve_non_null(jobj);

From 2e99e28fc61ebea91bf2c7fe982af896b6a8cf35 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 7 Jan 2021 17:49:48 +0000
Subject: [PATCH 068/129] 8213126:
 java/awt/Window/MainKeyWindow/TestMainKeyWindow.java time-out on mac10.13

Reviewed-by: psadhukhan
---
 test/jdk/ProblemList.txt                      |  1 -
 .../MainKeyWindowTest/TestMainKeyWindow.java  | 55 ++++++++++++-------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index b223a7e9ab5d5..64c8e917c54de 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -517,7 +517,6 @@ java/awt/im/memoryleak/InputContextMemoryLeakTest.java 8023814 linux-all
 java/awt/Frame/DisposeParentGC/DisposeParentGC.java 8079786 macosx-all
 java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java 8169468 macosx-all
 java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java 8213120 macosx-all
-java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java 8213126 macosx-all
 
 java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java 7099223 linux-all,windows-all
 java/awt/Window/WindowResizing/DoubleClickTitleBarTest.java 8233557 macosx-all
diff --git a/test/jdk/java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java b/test/jdk/java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java
index cc7b2434f0813..b1604d4261ef2 100644
--- a/test/jdk/java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java
+++ b/test/jdk/java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @bug 8194327
  * @summary [macosx] AWT windows have incorrect main/key window behaviors
  * @author Alan Snyder
+ * @library /test/lib
  * @run main/othervm/native TestMainKeyWindow
  * @requires (os.family == "mac")
  */
@@ -42,6 +43,8 @@
 import java.util.Objects;
 import javax.swing.*;
 
+import jdk.test.lib.process.ProcessTools;
+
 public class TestMainKeyWindow
 {
     static TestMainKeyWindow theTest;
@@ -65,7 +68,7 @@ public class TestMainKeyWindow
     private Object actionTarget;
 
     private int failureCount;
-    private boolean isApplicationOpened;
+    private Process process;
 
     public TestMainKeyWindow()
     {
@@ -83,7 +86,7 @@ public TestMainKeyWindow()
 
         try {
             robot = new Robot();
-            robot.setAutoDelay(50);
+            robot.setAutoDelay(150);
         } catch (AWTException ex) {
             throw new RuntimeException(ex);
         }
@@ -146,19 +149,21 @@ private void performTest(Object windowIdentification, boolean selectColorPanel)
         performMenuItemTest(windowIdentification, selectColorPanel);
     }
 
-    private void openOtherApplication() {
+    private Process execute() {
         try {
-            String[] cmd = { "/usr/bin/open", "/Applications/System Preferences.app" };
-            Runtime.getRuntime().exec(cmd);
-            if (!isApplicationOpened) {
-                String[] cmd2 = { "/usr/bin/osascript", "-e",
-                    "tell application \"System Preferences\" to set bounds of window 1 to {400, 180, 1068, 821}" };
-                Runtime.getRuntime().exec(cmd2);
-            }
-            isApplicationOpened = true;
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    TestMainKeyWindow.class.getSimpleName(), "mark");
+            return ProcessTools.startProcess("Other frame", pb);
         } catch (IOException ex) {
-            throw new RuntimeException("Unable to deactivate test application");
+            throw new RuntimeException("Unable to execute command");
         }
+    }
+
+    private void openOtherApplication() {
+        if (process != null) {
+            process.destroyForcibly();
+        }
+        process = execute();
         robot.delay(1000);
     }
 
@@ -341,13 +346,8 @@ void dispose()
         frame2.dispose();
         takedown();
         Desktop.getDesktop().setDefaultMenuBar(null);
-        if (isApplicationOpened) {
-            try {
-                String[] cmd = { "/usr/bin/osascript", "-e", "tell application \"System Preferences\" to close window 1" };
-                Process p = Runtime.getRuntime().exec(cmd);
-                p.waitFor();
-            } catch (IOException | InterruptedException ex) {
-            }
+        if (process != null) {
+            process.destroyForcibly();
         }
     }
 
@@ -374,7 +374,7 @@ public void actionPerformed(ActionEvent e)
     private static native void takedown();
     private static native void activateApplication();
 
-    public static void main(String[] args)
+    public static void main(String[] args) throws Exception
     {
         if (!System.getProperty("os.name").contains("OS X")) {
             System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
@@ -383,6 +383,19 @@ public static void main(String[] args)
 
         System.setProperty("apple.laf.useScreenMenuBar", "true");
 
+        if (args.length != 0) {
+            Frame frame = new Frame();
+            MenuBar mb = new MenuBar();
+            mb.add(new Menu("Hello"));
+            frame.setMenuBar(mb);
+            frame.setBounds(400, 180, 1068, 821);
+            frame.setVisible(true);
+            frame.toFront();
+            Thread.sleep(20_000);
+            System.exit(0);
+            return;
+        }
+
         try {
             runSwing(() -> {
                 theTest = new TestMainKeyWindow();

From 4ce83f2a3a6c5fe11c298bed557c341e286e068a Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Thu, 7 Jan 2021 18:47:43 +0000
Subject: [PATCH 069/129] 8039278: console.sh failed Automatically with exit
 code 1

Reviewed-by: xuelei, weijun
---
 test/jdk/TEST.groups                          |   3 +-
 .../jdk/sun/security/tools/keytool/console.sh | 128 ------------------
 2 files changed, 1 insertion(+), 130 deletions(-)
 delete mode 100644 test/jdk/sun/security/tools/keytool/console.sh

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index c5bed118dd789..1b08ca1bc8fb0 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -1,4 +1,4 @@
-#  Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 #  This code is free software; you can redistribute it and/or modify it
@@ -553,7 +553,6 @@ jdk_core_manual_no_input_security = \
     sun/security/smartcardio/TestPresent.java \
     sun/security/smartcardio/TestTransmit.java \
     sun/security/tools/jarsigner/compatibility/Compatibility.java \
-    sun/security/tools/keytool/console.sh \
     sun/security/tools/keytool/i18n.java
 
 jdk_core_manual_requires_human_input = \
diff --git a/test/jdk/sun/security/tools/keytool/console.sh b/test/jdk/sun/security/tools/keytool/console.sh
deleted file mode 100644
index 5c6c349e39172..0000000000000
--- a/test/jdk/sun/security/tools/keytool/console.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 6418647 8005527
-# @summary Doc bug 5035358 shows sun.security.util.Password.readPassword() is buggy.
-# @author Weijun Wang
-# @run shell/manual console.sh
-
-if [ "$ALT_PASS" = "" ]; then
-	PASSW=äöäöäö
-else
-  	PASSW=$ALT_PASS
-fi
-
-KS=/tmp/kkk.$$
-
-cat <<____
-
-ATTENTION
-===============================================================
-
-This test is about non-ASCII password input compatibility between
-JDK 5.0 and later versions. Before running the test, make sure that --
-
-    \$J5 points to a JDK 5.0 installation
-    \$JM points to the current installation
-
-The password string used in this test is $PASSW. If you find difficulty
-entering it in in your system, feel free to change it to something else
-by providing \$ALT_PASS. It should be no less than 6 characters and include
-some non-ASCII characters.
-
-For each test, type into the characters as described in the test header.
-<R> means the RETURN (or ENTER key). Please wait for a little while
-after <R> is pressed each time.
-
-\$J5 is now $J5
-\$JM is now $JM
-
-____
-
-
-if [ "$J5" = "" -o "$JM" = "" ]; then
-	echo "Define \$J5 and \$JM first"
-	exit 1
-fi
-
-echo "Press ENTER to start the test, or Ctrl-C to stop it"
-read x
-
-echo
-echo "=========================================="
-echo "Test #1: 5->6, non-prompt. Please type <R>"
-echo "=========================================="
-echo
-rm $KS 2> /dev/null
-$J5/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala -storepass $PASSW || exit 1
-$JM/bin/keytool -keystore $KS -list -storepass $PASSW || exit 2
-
-echo "=========================================="
-echo "Test #2: 6->5, non-prompt. Please type <R>"
-echo "=========================================="
-echo
-
-rm $KS 2> /dev/null
-$JM/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala -storepass $PASSW || exit 3
-$J5/bin/keytool -keystore $KS -list -storepass $PASSW || exit 4
-
-echo "============================================================"
-echo "Test #3: 5->6, prompt. Please type $PASSW <R> <R> $PASSW <R>"
-echo "============================================================"
-echo
-
-rm $KS 2> /dev/null
-$J5/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala || exit 5
-$JM/bin/keytool -keystore $KS -list || exit 6
-echo $PASSW| $J5/bin/keytool -keystore $KS -list || exit 7
-echo $PASSW| $JM/bin/keytool -keystore $KS -list || exit 8
-
-echo "======================================================================="
-echo "Test #4: 6->5, prompt. Please type $PASSW <R> $PASSW <R> <R> $PASSW <R>"
-echo "======================================================================="
-echo
-
-rm $KS 2> /dev/null
-$JM/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala || exit 9
-$J5/bin/keytool -keystore $KS -list || exit 10
-echo $PASSW| $JM/bin/keytool -keystore $KS -list || exit 11
-echo $PASSW| $J5/bin/keytool -keystore $KS -list || exit 12
-
-echo "==========================================="
-echo "Test #5: 5->6, pipe. Please type $PASSW <R>"
-echo "==========================================="
-echo
-
-rm $KS 2> /dev/null
-echo $PASSW| $J5/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala || exit 13
-$JM/bin/keytool -keystore $KS -list || exit 14
-echo $PASSW| $J5/bin/keytool -keystore $KS -list || exit 15
-echo $PASSW| $JM/bin/keytool -keystore $KS -list || exit 16
-
-rm $KS 2> /dev/null
-
-echo
-echo "Success"
-
-exit 0

From d8ad63019a8fae6665c2c5545635e6f0b750a780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Thu, 7 Jan 2021 18:57:58 +0000
Subject: [PATCH 070/129] 8258772: Some runtime/cds tests fail with
 +LogCompilation or +StressX

Emit warning about TraceDependencies results in
ClassHierarchyWalker::count_find_witness_calls() only if TraceDependencies is
actually enabled. Use standard warning() function instead of ad hoc printing.
Remove warning about using Stress(LCM|GCM|IGVN) without LogCompilation in
Compile::Compile(), and add the information to the description of the StressSeed
option instead. These changes prevent false test failures when using
LogCompilation or Stress(LCM|GCM|IGVN).

Reviewed-by: chagedorn, kvn, thartmann
---
 src/hotspot/share/code/dependencies.cpp | 6 +++---
 src/hotspot/share/opto/c2_globals.hpp   | 5 +++--
 src/hotspot/share/opto/compile.cpp      | 4 +---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp
index cbf591eb638c5..9fc912635e36f 100644
--- a/src/hotspot/share/code/dependencies.cpp
+++ b/src/hotspot/share/code/dependencies.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1312,8 +1312,8 @@ static bool count_find_witness_calls() {
     bool occasional_print = ((pcount & ((1<<10) - 1)) == 0);
     if (pcount < 0)  pcount = 1; // crude overflow protection
     deps_find_witness_print = pcount;
-    if (VerifyDependencies && initial_call) {
-      tty->print_cr("Warning:  TraceDependencies results may be inflated by VerifyDependencies");
+    if (TraceDependencies && VerifyDependencies && initial_call) {
+      warning("TraceDependencies results may be inflated by VerifyDependencies");
     }
     if (occasional_print || final_stats) {
       // Every now and then dump a little info about dependency searching.
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index aa908dc6a2326..442eae5dccc17 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,8 @@
                                                                             \
   product(uint, StressSeed, 0, DIAGNOSTIC,                                  \
           "Seed for randomized stress testing (if unset, a random one is "  \
-          "generated)")                                                     \
+          "generated). The seed is recorded in the compilation log, if "    \
+          "available.")                                                     \
           range(0, max_juint)                                               \
                                                                             \
   develop(bool, StressMethodHandleLinkerInlining, false,                    \
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 0da0ca537b4c6..77ef6e427dd67 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -774,8 +774,6 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
       static_cast<uint>(Ticks::now().nanoseconds()) : StressSeed;
     if (_log != NULL) {
       _log->elem("stress_test seed='%u'", _stress_seed);
-    } else if (FLAG_IS_DEFAULT(StressSeed)) {
-      tty->print_cr("Warning:  set +LogCompilation to log the seed.");
     }
   }
 

From 1973fbee379b0cd5f552dfc66fce551a1e59d8a7 Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Thu, 7 Jan 2021 19:21:41 +0000
Subject: [PATCH 071/129] 8039278: console.sh failed Automatically with exit
 code 1

Backport-of: 4ce83f2a3a6c5fe11c298bed557c341e286e068a
---
 test/jdk/TEST.groups                          |   3 +-
 .../jdk/sun/security/tools/keytool/console.sh | 128 ------------------
 2 files changed, 1 insertion(+), 130 deletions(-)
 delete mode 100644 test/jdk/sun/security/tools/keytool/console.sh

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index c5bed118dd789..1b08ca1bc8fb0 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -1,4 +1,4 @@
-#  Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 #  This code is free software; you can redistribute it and/or modify it
@@ -553,7 +553,6 @@ jdk_core_manual_no_input_security = \
     sun/security/smartcardio/TestPresent.java \
     sun/security/smartcardio/TestTransmit.java \
     sun/security/tools/jarsigner/compatibility/Compatibility.java \
-    sun/security/tools/keytool/console.sh \
     sun/security/tools/keytool/i18n.java
 
 jdk_core_manual_requires_human_input = \
diff --git a/test/jdk/sun/security/tools/keytool/console.sh b/test/jdk/sun/security/tools/keytool/console.sh
deleted file mode 100644
index 5c6c349e39172..0000000000000
--- a/test/jdk/sun/security/tools/keytool/console.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 6418647 8005527
-# @summary Doc bug 5035358 shows sun.security.util.Password.readPassword() is buggy.
-# @author Weijun Wang
-# @run shell/manual console.sh
-
-if [ "$ALT_PASS" = "" ]; then
-	PASSW=äöäöäö
-else
-  	PASSW=$ALT_PASS
-fi
-
-KS=/tmp/kkk.$$
-
-cat <<____
-
-ATTENTION
-===============================================================
-
-This test is about non-ASCII password input compatibility between
-JDK 5.0 and later versions. Before running the test, make sure that --
-
-    \$J5 points to a JDK 5.0 installation
-    \$JM points to the current installation
-
-The password string used in this test is $PASSW. If you find difficulty
-entering it in in your system, feel free to change it to something else
-by providing \$ALT_PASS. It should be no less than 6 characters and include
-some non-ASCII characters.
-
-For each test, type into the characters as described in the test header.
-<R> means the RETURN (or ENTER key). Please wait for a little while
-after <R> is pressed each time.
-
-\$J5 is now $J5
-\$JM is now $JM
-
-____
-
-
-if [ "$J5" = "" -o "$JM" = "" ]; then
-	echo "Define \$J5 and \$JM first"
-	exit 1
-fi
-
-echo "Press ENTER to start the test, or Ctrl-C to stop it"
-read x
-
-echo
-echo "=========================================="
-echo "Test #1: 5->6, non-prompt. Please type <R>"
-echo "=========================================="
-echo
-rm $KS 2> /dev/null
-$J5/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala -storepass $PASSW || exit 1
-$JM/bin/keytool -keystore $KS -list -storepass $PASSW || exit 2
-
-echo "=========================================="
-echo "Test #2: 6->5, non-prompt. Please type <R>"
-echo "=========================================="
-echo
-
-rm $KS 2> /dev/null
-$JM/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala -storepass $PASSW || exit 3
-$J5/bin/keytool -keystore $KS -list -storepass $PASSW || exit 4
-
-echo "============================================================"
-echo "Test #3: 5->6, prompt. Please type $PASSW <R> <R> $PASSW <R>"
-echo "============================================================"
-echo
-
-rm $KS 2> /dev/null
-$J5/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala || exit 5
-$JM/bin/keytool -keystore $KS -list || exit 6
-echo $PASSW| $J5/bin/keytool -keystore $KS -list || exit 7
-echo $PASSW| $JM/bin/keytool -keystore $KS -list || exit 8
-
-echo "======================================================================="
-echo "Test #4: 6->5, prompt. Please type $PASSW <R> $PASSW <R> <R> $PASSW <R>"
-echo "======================================================================="
-echo
-
-rm $KS 2> /dev/null
-$JM/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala || exit 9
-$J5/bin/keytool -keystore $KS -list || exit 10
-echo $PASSW| $JM/bin/keytool -keystore $KS -list || exit 11
-echo $PASSW| $J5/bin/keytool -keystore $KS -list || exit 12
-
-echo "==========================================="
-echo "Test #5: 5->6, pipe. Please type $PASSW <R>"
-echo "==========================================="
-echo
-
-rm $KS 2> /dev/null
-echo $PASSW| $J5/bin/keytool -keystore $KS -genkey -keyalg DSA -dname CN=olala || exit 13
-$JM/bin/keytool -keystore $KS -list || exit 14
-echo $PASSW| $J5/bin/keytool -keystore $KS -list || exit 15
-echo $PASSW| $JM/bin/keytool -keystore $KS -list || exit 16
-
-rm $KS 2> /dev/null
-
-echo
-echo "Success"
-
-exit 0

From bc56541424e248ef6acd440fd378ad3d310e525a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Thu, 7 Jan 2021 20:43:48 +0000
Subject: [PATCH 072/129] 8256535: C2: randomize CCP processing order for
 stress testing

Add 'StressCCP' option to randomize the selection of the node to be examined in
each CCP iteration.

Reviewed-by: chagedorn, kvn, thartmann
---
 src/hotspot/share/opto/c2_globals.hpp         |  3 ++
 src/hotspot/share/opto/compile.cpp            |  6 ++--
 src/hotspot/share/opto/phaseX.cpp             |  9 ++++--
 ...GVNOptions.java => TestStressOptions.java} | 24 ++++++++++----
 .../debug/TestGenerateStressSeed.java         |  5 +--
 ...essIGVN.java => TestStressIGVNAndCCP.java} | 31 +++++++++++++------
 6 files changed, 55 insertions(+), 23 deletions(-)
 rename test/hotspot/jtreg/compiler/arguments/{TestStressIGVNOptions.java => TestStressOptions.java} (56%)
 rename test/hotspot/jtreg/compiler/debug/{TestStressIGVN.java => TestStressIGVNAndCCP.java} (67%)

diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 442eae5dccc17..3a2e0394620c2 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -50,6 +50,9 @@
   product(bool, StressIGVN, false, DIAGNOSTIC,                              \
           "Randomize worklist traversal in IGVN")                           \
                                                                             \
+  product(bool, StressCCP, false, DIAGNOSTIC,                               \
+          "Randomize worklist traversal in CCP")                            \
+                                                                            \
   product(uint, StressSeed, 0, DIAGNOSTIC,                                  \
           "Seed for randomized stress testing (if unset, a random one is "  \
           "generated). The seed is recorded in the compilation log, if "    \
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 77ef6e427dd67..b303fe864cdfe 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -767,9 +767,9 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
   if (failing())  return;
   NOT_PRODUCT( verify_graph_edges(); )
 
-  // If LCM, GCM, or IGVN are randomized for stress testing, seed
-  // random number generation and log the seed for repeatability.
-  if (StressLCM || StressGCM || StressIGVN) {
+  // If any phase is randomized for stress testing, seed random number
+  // generation and log the seed for repeatability.
+  if (StressLCM || StressGCM || StressIGVN || StressCCP) {
     _stress_seed = FLAG_IS_DEFAULT(StressSeed) ?
       static_cast<uint>(Ticks::now().nanoseconds()) : StressSeed;
     if (_log != NULL) {
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 03e0d3ce97b86..dac601c4848f9 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1714,7 +1714,12 @@ void PhaseCCP::analyze() {
   // Pull from worklist; compute new value; push changes out.
   // This loop is the meat of CCP.
   while( worklist.size() ) {
-    Node *n = worklist.pop();
+    Node* n; // Node to be examined in this iteration
+    if (StressCCP) {
+      n = worklist.remove(C->random() % worklist.size());
+    } else {
+      n = worklist.pop();
+    }
     const Type *t = n->Value(this);
     if (t != type(n)) {
       assert(ccp_type_widens(t, type(n)), "ccp type must widen");
diff --git a/test/hotspot/jtreg/compiler/arguments/TestStressIGVNOptions.java b/test/hotspot/jtreg/compiler/arguments/TestStressOptions.java
similarity index 56%
rename from test/hotspot/jtreg/compiler/arguments/TestStressIGVNOptions.java
rename to test/hotspot/jtreg/compiler/arguments/TestStressOptions.java
index d55bc640e246e..016db95b7f90b 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestStressIGVNOptions.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestStressOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,31 @@
 
 /*
  * @test
- * @bug 8252219
+ * @bug 8252219 8256535
  * @requires vm.compiler2.enabled
- * @summary Tests that different combinations of the options -XX:+StressIGVN and
+ * @summary Tests that different combinations of stress options and
  *          -XX:StressSeed=N are accepted.
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN
- *      compiler.arguments.TestStressIGVNOptions
+ *      compiler.arguments.TestStressOptions
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:StressSeed=42
- *      compiler.arguments.TestStressIGVNOptions
+ *      compiler.arguments.TestStressOptions
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressCCP
+ *      compiler.arguments.TestStressOptions
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressCCP -XX:StressSeed=42
+ *      compiler.arguments.TestStressOptions
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM
+ *      compiler.arguments.TestStressOptions
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM -XX:StressSeed=42
+ *      compiler.arguments.TestStressOptions
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM
+ *      compiler.arguments.TestStressOptions
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=42
+ *      compiler.arguments.TestStressOptions
  */
 
 package compiler.arguments;
 
-public class TestStressIGVNOptions {
+public class TestStressOptions {
 
     static public void main(String[] args) {
         System.out.println("Passed");
diff --git a/test/hotspot/jtreg/compiler/debug/TestGenerateStressSeed.java b/test/hotspot/jtreg/compiler/debug/TestGenerateStressSeed.java
index 3e9e061c744c7..337afd0bca4c8 100644
--- a/test/hotspot/jtreg/compiler/debug/TestGenerateStressSeed.java
+++ b/test/hotspot/jtreg/compiler/debug/TestGenerateStressSeed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 
 /*
  * @test
- * @bug 8252219
+ * @bug 8252219 8256535
  * @requires vm.compiler2.enabled
  * @summary Tests that using a stress option without -XX:StressSeed=N generates
  *          and logs a random seed.
@@ -38,6 +38,7 @@
  * @run driver compiler.debug.TestGenerateStressSeed StressLCM
  * @run driver compiler.debug.TestGenerateStressSeed StressGCM
  * @run driver compiler.debug.TestGenerateStressSeed StressIGVN
+ * @run driver compiler.debug.TestGenerateStressSeed StressCCP
  */
 
 public class TestGenerateStressSeed {
diff --git a/test/hotspot/jtreg/compiler/debug/TestStressIGVN.java b/test/hotspot/jtreg/compiler/debug/TestStressIGVNAndCCP.java
similarity index 67%
rename from test/hotspot/jtreg/compiler/debug/TestStressIGVN.java
rename to test/hotspot/jtreg/compiler/debug/TestStressIGVNAndCCP.java
index b3ce73863f533..daea2741a9a3e 100644
--- a/test/hotspot/jtreg/compiler/debug/TestStressIGVN.java
+++ b/test/hotspot/jtreg/compiler/debug/TestStressIGVNAndCCP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,28 +29,37 @@
 
 /*
  * @test
- * @bug 8252219
+ * @bug 8252219 8256535
  * @requires vm.debug == true & vm.compiler2.enabled
- * @summary Tests that compilations with the same seed yield the same IGVN
- *          trace.
+ * @summary Tests that stress compilations with the same seed yield the same
+ *          IGVN and CCP traces.
  * @library /test/lib /
- * @run driver compiler.debug.TestStressIGVN
+ * @run driver compiler.debug.TestStressIGVNAndCCP
  */
 
-public class TestStressIGVN {
+public class TestStressIGVNAndCCP {
 
-    static String igvnTrace(int stressSeed) throws Exception {
-        String className = TestStressIGVN.class.getName();
+    static String phaseTrace(String stressOption, String traceOption,
+                             int stressSeed) throws Exception {
+        String className = TestStressIGVNAndCCP.class.getName();
         String[] procArgs = {
             "-Xcomp", "-XX:-TieredCompilation", "-XX:-Inline",
-            "-XX:CompileOnly=" + className + "::sum", "-XX:+TraceIterativeGVN",
-            "-XX:+StressIGVN", "-XX:StressSeed=" + stressSeed,
+            "-XX:CompileOnly=" + className + "::sum", "-XX:+" + traceOption,
+            "-XX:+" + stressOption, "-XX:StressSeed=" + stressSeed,
             className, "10"};
         ProcessBuilder pb  = ProcessTools.createJavaProcessBuilder(procArgs);
         OutputAnalyzer out = new OutputAnalyzer(pb.start());
         return out.getStdout();
     }
 
+    static String igvnTrace(int stressSeed) throws Exception {
+        return phaseTrace("StressIGVN", "TraceIterativeIGVN", stressSeed);
+    }
+
+    static String ccpTrace(int stressSeed) throws Exception {
+        return phaseTrace("StressCCP", "TracePhaseCCP", stressSeed);
+    }
+
     static void sum(int n) {
         int acc = 0;
         for (int i = 0; i < n; i++) acc += i;
@@ -62,6 +71,8 @@ public static void main(String[] args) throws Exception {
             for (int s = 0; s < 10; s++) {
                 Asserts.assertEQ(igvnTrace(s), igvnTrace(s),
                     "got different IGVN traces for the same seed");
+                Asserts.assertEQ(ccpTrace(s), ccpTrace(s),
+                    "got different CCP traces for the same seed");
             }
         } else if (args.length > 0) {
             sum(Integer.parseInt(args[0]));

From 2659bc449c8f09a1b9a5e336bd437e8427979fb8 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 7 Jan 2021 20:57:11 +0000
Subject: [PATCH 073/129] 8259274: Increase timeout duration in
 sun/nio/ch/TestMaxCachedBufferSize.java

Reviewed-by: lancea
---
 test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java b/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java
index c63ac004be365..ef73a15256a78 100644
--- a/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java
+++ b/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,11 +44,11 @@
  * @modules java.management
  * @library /test/lib
  * @build TestMaxCachedBufferSize
- * @run main/othervm TestMaxCachedBufferSize
- * @run main/othervm -Djdk.nio.maxCachedBufferSize=0 TestMaxCachedBufferSize
- * @run main/othervm -Djdk.nio.maxCachedBufferSize=2000 TestMaxCachedBufferSize
- * @run main/othervm -Djdk.nio.maxCachedBufferSize=100000 TestMaxCachedBufferSize
- * @run main/othervm -Djdk.nio.maxCachedBufferSize=10000000 TestMaxCachedBufferSize
+ * @run main/othervm/timeout=150 TestMaxCachedBufferSize
+ * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=0 TestMaxCachedBufferSize
+ * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=2000 TestMaxCachedBufferSize
+ * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=100000 TestMaxCachedBufferSize
+ * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=10000000 TestMaxCachedBufferSize
  * @summary Test the implementation of the jdk.nio.maxCachedBufferSize property
  * (use -Dseed=X to set PRNG seed)
  * @key randomness

From 677802d2ffea2b0132eeeca06524f8d595796cd8 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Thu, 7 Jan 2021 22:51:49 +0000
Subject: [PATCH 074/129] 8258484: AIX build fails in Harfbuzz with XLC
 16.01.0000.0006

Backport-of: 3f9f86f0d3f918b9955ba6ba73c9c58ae8fcf7cb
---
 make/modules/java.desktop/lib/Awt2dLibraries.gmk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index 3203378d00a49..b1e07006f5622 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -474,6 +474,11 @@ else
     #
 
   LIBHARFBUZZ_OPTIMIZATION := HIGH
+  # Early re-canonizing has to be disabled to workaround an internal XlC compiler error
+  # when building libharfbuzz
+  ifeq ($(call isTargetOs, aix), true)
+    LIBHARFBUZZ_CFLAGS += -qdebug=necan
+  endif
 
   LIBHARFBUZZ_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
 

From b996cccf1218aacac1b6b64f9dbe5794076516dd Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Thu, 7 Jan 2021 23:04:11 +0000
Subject: [PATCH 075/129] 8259373: c1 and jvmci runtime code use
 ResetNoHandleMark incorrectly

Reviewed-by: kvn
---
 src/hotspot/share/c1/c1_Runtime1.cpp      | 19 ++++++++-----------
 src/hotspot/share/code/compiledMethod.cpp |  4 +---
 src/hotspot/share/jvmci/jvmciRuntime.cpp  |  4 ++--
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index c017536956c1f..3550bb186d07b 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -640,7 +640,7 @@ address Runtime1::exception_handler_for_pc(JavaThread* thread) {
   oop exception = thread->exception_oop();
   address pc = thread->exception_pc();
   // Still in Java mode
-  DEBUG_ONLY(ResetNoHandleMark rnhm);
+  DEBUG_ONLY(NoHandleMark nhm);
   nmethod* nm = NULL;
   address continuation = NULL;
   {
@@ -1307,7 +1307,6 @@ int Runtime1::move_klass_patching(JavaThread* thread) {
   debug_only(NoHandleMark nhm;)
   {
     // Enter VM mode
-
     ResetNoHandleMark rnhm;
     patch_code(thread, load_klass_patching_id);
   }
@@ -1326,7 +1325,6 @@ int Runtime1::move_mirror_patching(JavaThread* thread) {
   debug_only(NoHandleMark nhm;)
   {
     // Enter VM mode
-
     ResetNoHandleMark rnhm;
     patch_code(thread, load_mirror_patching_id);
   }
@@ -1345,7 +1343,6 @@ int Runtime1::move_appendix_patching(JavaThread* thread) {
   debug_only(NoHandleMark nhm;)
   {
     // Enter VM mode
-
     ResetNoHandleMark rnhm;
     patch_code(thread, load_appendix_patching_id);
   }
@@ -1365,14 +1362,14 @@ int Runtime1::move_appendix_patching(JavaThread* thread) {
 // assembly code in the cpu directories.
 //
 int Runtime1::access_field_patching(JavaThread* thread) {
-//
-// NOTE: we are still in Java
-//
-  Thread* THREAD = thread;
-  debug_only(NoHandleMark nhm;)
+  //
+  // NOTE: we are still in Java
+  //
+  // Handles created in this function will be deleted by the
+  // HandleMarkCleaner in the transition to the VM.
+  NoHandleMark nhm;
   {
     // Enter VM mode
-
     ResetNoHandleMark rnhm;
     patch_code(thread, access_field_patching_id);
   }
diff --git a/src/hotspot/share/code/compiledMethod.cpp b/src/hotspot/share/code/compiledMethod.cpp
index 46ec64ce7cc1c..0d6ffe789c58e 100644
--- a/src/hotspot/share/code/compiledMethod.cpp
+++ b/src/hotspot/share/code/compiledMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -703,8 +703,6 @@ address CompiledMethod::continuation_for_implicit_exception(address pc, bool for
 #ifdef ASSERT
   if (cont_offset == 0) {
     Thread* thread = Thread::current();
-    ResetNoHandleMark rnm; // Might be called from LEAF/QUICK ENTRY
-    HandleMark hm(thread);
     ResourceMark rm(thread);
     CodeBlob* cb = CodeCache::find_blob(pc);
     assert(cb != NULL && cb == this, "");
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index aa82232ae4e65..4499811525548 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -368,7 +368,7 @@ address JVMCIRuntime::exception_handler_for_pc(JavaThread* thread) {
   oop exception = thread->exception_oop();
   address pc = thread->exception_pc();
   // Still in Java mode
-  DEBUG_ONLY(ResetNoHandleMark rnhm);
+  DEBUG_ONLY(NoHandleMark nhm);
   CompiledMethod* cm = NULL;
   address continuation = NULL;
   {

From 712014c5956cf74982531d212b03460843e4e5b6 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Fri, 8 Jan 2021 04:11:22 +0000
Subject: [PATCH 076/129] 8258077: Using -Xcheck:jni can lead to a double-free
 after JDK-8193234

Reviewed-by: dcubed, hseigel
---
 src/hotspot/share/prims/jniCheck.cpp          |  43 +++---
 .../TestCheckedReleaseArrayElements.java      | 122 ++++++++++++++++++
 .../TestCheckedReleaseCriticalArray.java      |  60 +++++++++
 .../libTestCheckedReleaseArrayElements.c      |  64 +++++++++
 .../libTestCheckedReleaseCriticalArray.c      |  46 +++++++
 5 files changed, 316 insertions(+), 19 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
 create mode 100644 test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseCriticalArray.java
 create mode 100644 test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseArrayElements.c
 create mode 100644 test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseCriticalArray.c

diff --git a/src/hotspot/share/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp
index fd9e2e3bab734..5bd6fe043b611 100644
--- a/src/hotspot/share/prims/jniCheck.cpp
+++ b/src/hotspot/share/prims/jniCheck.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/thread.inline.hpp"
+#include "utilities/formatBuffer.hpp"
 #include "utilities/utf8.hpp"
 
 // Complain every extra number of unplanned local refs
@@ -399,19 +400,16 @@ static void* check_wrapped_array(JavaThread* thr, const char* fn_name,
   GuardedMemory guarded(carray);
   void* orig_result = guarded.get_tag();
   if (!guarded.verify_guards()) {
-    tty->print_cr("ReleasePrimitiveArrayCritical: release array failed bounds "
-        "check, incorrect pointer returned ? array: " PTR_FORMAT " carray: "
-        PTR_FORMAT, p2i(obj), p2i(carray));
-    guarded.print_on(tty);
-    NativeReportJNIFatalError(thr, "ReleasePrimitiveArrayCritical: "
-        "failed bounds check");
+    tty->print_cr("%s: release array failed bounds check, incorrect pointer returned ? array: "
+                  PTR_FORMAT " carray: " PTR_FORMAT, fn_name, p2i(obj), p2i(carray));
+    DEBUG_ONLY(guarded.print_on(tty);) // This may crash.
+    NativeReportJNIFatalError(thr, err_msg("%s: failed bounds check", fn_name));
   }
   if (orig_result == NULL) {
-    tty->print_cr("ReleasePrimitiveArrayCritical: unrecognized elements. array: "
-        PTR_FORMAT " carray: " PTR_FORMAT, p2i(obj), p2i(carray));
-    guarded.print_on(tty);
-    NativeReportJNIFatalError(thr, "ReleasePrimitiveArrayCritical: "
-        "unrecognized elements");
+    tty->print_cr("%s: unrecognized elements. array: " PTR_FORMAT " carray: " PTR_FORMAT,
+                  fn_name, p2i(obj), p2i(carray));
+    DEBUG_ONLY(guarded.print_on(tty);) // This may crash.
+    NativeReportJNIFatalError(thr, err_msg("%s: unrecognized elements", fn_name));
   }
   if (rsz != NULL) {
     *rsz = guarded.get_user_size();
@@ -420,24 +418,30 @@ static void* check_wrapped_array(JavaThread* thr, const char* fn_name,
 }
 
 static void* check_wrapped_array_release(JavaThread* thr, const char* fn_name,
-    void* obj, void* carray, jint mode) {
+                                         void* obj, void* carray, jint mode, jboolean is_critical) {
   size_t sz;
   void* orig_result = check_wrapped_array(thr, fn_name, obj, carray, &sz);
   switch (mode) {
-  // As we never make copies, mode 0 and JNI_COMMIT are the same.
   case 0:
+    memcpy(orig_result, carray, sz);
+    GuardedMemory::free_copy(carray);
+    break;
   case JNI_COMMIT:
     memcpy(orig_result, carray, sz);
+    if (is_critical) {
+      // For ReleasePrimitiveArrayCritical we must free the internal buffer
+      // allocated through GuardedMemory.
+      GuardedMemory::free_copy(carray);
+    }
     break;
   case JNI_ABORT:
+    GuardedMemory::free_copy(carray);
     break;
   default:
     tty->print_cr("%s: Unrecognized mode %i releasing array "
-        PTR_FORMAT " elements " PTR_FORMAT, fn_name, mode, p2i(obj), p2i(carray));
+                  PTR_FORMAT " elements " PTR_FORMAT, fn_name, mode, p2i(obj), p2i(carray));
     NativeReportJNIFatalError(thr, "Unrecognized array release mode");
   }
-  // We always need to release the copy we made with GuardedMemory
-  GuardedMemory::free_copy(carray);
   return orig_result;
 }
 
@@ -1715,7 +1719,7 @@ JNI_ENTRY_CHECKED(void,  \
       typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
     ) \
     ElementType* orig_result = (ElementType *) check_wrapped_array_release( \
-        thr, "checked_jni_Release"#Result"ArrayElements", array, elems, mode); \
+        thr, "checked_jni_Release"#Result"ArrayElements", array, elems, mode, JNI_FALSE); \
     UNCHECKED()->Release##Result##ArrayElements(env, array, orig_result, mode); \
     functionExit(thr); \
 JNI_END
@@ -1884,7 +1888,8 @@ JNI_ENTRY_CHECKED(void,
       check_is_primitive_array(thr, array);
     )
     // Check the element array...
-    void* orig_result = check_wrapped_array_release(thr, "ReleasePrimitiveArrayCritical", array, carray, mode);
+    void* orig_result = check_wrapped_array_release(thr, "ReleasePrimitiveArrayCritical",
+                                                    array, carray, mode, JNI_TRUE);
     UNCHECKED()->ReleasePrimitiveArrayCritical(env, array, orig_result, mode);
     functionExit(thr);
 JNI_END
diff --git a/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
new file mode 100644
index 0000000000000..be44a9ac4f874
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8258077
+ * @summary verify multiple release calls on a copied array work when checked
+ * @library /test/lib
+ * @run main/native TestCheckedReleaseArrayElements launch
+ */
+
+import java.util.Arrays;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Utils;
+import jtreg.SkippedException;
+
+public class TestCheckedReleaseArrayElements {
+
+    static {
+        System.loadLibrary("TestCheckedReleaseArrayElements");
+    }
+
+    public static void main(String[] args) throws Throwable {
+        if (args == null || args.length == 0) {
+            test();
+        } else {
+            OutputAnalyzer output =
+                ProcessTools.executeTestJvm("-Xcheck:jni",
+                                            "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
+                                            "TestCheckedReleaseArrayElements");
+            output.shouldHaveExitValue(0);
+            output.stderrShouldBeEmpty();
+            output.stdoutShouldNotBeEmpty();
+        }
+    }
+
+    /*
+     * If GetIntArrayElements returns a copy, we update the array in slices
+     * calling ReleaseIntArrayElements with JNI_COMMIT to write-back the
+     * updates, which are then checked. Finally we use JNI_ABORT to free
+     * the copy.
+     */
+    public static void test() {
+        final int slices = 3;
+        final int sliceLength = 3;
+        int[] arr = new int[slices * sliceLength];
+
+        if (!init(arr)) {
+            throw new SkippedException("Test skipped as GetIntArrayElements did not make a copy");
+        }
+
+        System.out.println("Array before: " + Arrays.toString(arr));
+
+        // We fill the array in slices so that arr[i] = i
+        for (int i = 0; i < slices; i++) {
+            int start = i * sliceLength;
+            fill(arr, start, sliceLength);
+            System.out.println("Array during: " + Arrays.toString(arr));
+            check(arr, (i + 1) * sliceLength);
+        }
+        System.out.println("Array after: " + Arrays.toString(arr));
+        cleanup(arr);
+    }
+
+    /*
+     * Calls GetIntArrayElements and stashes the native pointer for
+     * use by fill() if a copy was made.
+     * Returns true if a copy was made else false.
+    */
+    static native boolean init(int[] arr);
+
+    /*
+     * Fills in target[start] to target[start+count-1], so that
+     * target[i] == i. The update is done natively using the raw
+     * pointer into the array.
+     */
+    static native void fill(int[] target, int start, int count);
+
+    /*
+     * Properly release the copied array
+     */
+    static native void cleanup(int[] target);
+
+
+    static void check(int[] source, int count) {
+        for (int i = 0; i < count; i++) {
+            if (source[i] != i) {
+                System.out.println("Failing source array: " + Arrays.toString(source));
+                throw new RuntimeException("Expected source[" + i + "] == " +
+                                           i + " but got " + source[i]);
+            }
+        }
+        for (int i = count; i < source.length; i++) {
+            if (source[i] != 0) {
+                System.out.println("Failing source array: " + Arrays.toString(source));
+                throw new RuntimeException("Expected source[" + i +
+                                           "] == 0 but got " + source[i]);
+            }
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseCriticalArray.java b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseCriticalArray.java
new file mode 100644
index 0000000000000..42329c0e912e3
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseCriticalArray.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8193234 8258077
+ * @summary Check ReleasePrimitiveArrayCritical doesn't leak memory with
+ * Xcheck:jni and JNI_COMMIT mode
+ * @comment This is a manual test as you need to verify memory usage externally.
+ * @library /test/lib
+ * @run main/othervm/native/manual -Xms4m -Xmx4m -Xcheck:jni TestCheckedReleaseCriticalArray
+ */
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jtreg.SkippedException;
+
+public class TestCheckedReleaseCriticalArray {
+
+    static {
+        System.loadLibrary("TestCheckedReleaseCriticalArray");
+    }
+
+    /*
+     * We repeatedly modify an array via the JNI critical functions, using
+     * JNI_COMMIT mode. No memory leak should be observed on a VM that
+     * provides direct array access.
+     */
+    public static void main(String[] args) {
+        int[] array = new int[] { 1, 2, 3 };
+        if (!modifyArray(array)) {
+            // If the VM makes copies then we will leak them if we only ever use
+            // JNI_COMMIT mode.
+            throw new SkippedException("Test skipped as GetPrimitiveArrayCritical made a copy");
+        }
+        while (true) {
+            modifyArray(array);
+        }
+    }
+
+    private static native boolean modifyArray(int[] array);
+}
diff --git a/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseArrayElements.c b/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseArrayElements.c
new file mode 100644
index 0000000000000..8a7c67c90a825
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseArrayElements.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+
+static jint* arr;
+
+JNIEXPORT jboolean JNICALL
+Java_TestCheckedReleaseArrayElements_init(JNIEnv *env,
+                                          jclass* clazz,
+                                          jintArray target) {
+  jboolean isCopy;
+  arr = (*env)->GetIntArrayElements(env, target, &isCopy);
+  if (arr == NULL) {
+    (*env)->FatalError(env, "Unexpected NULL return from GetIntArrayElements");
+  }
+  if (isCopy == JNI_FALSE) {
+    (*env)->ReleaseIntArrayElements(env, target, arr, JNI_ABORT);
+  }
+  return isCopy;
+}
+
+JNIEXPORT void JNICALL
+Java_TestCheckedReleaseArrayElements_cleanup(JNIEnv *env,
+                                             jclass* clazz,
+                                             jintArray target) {
+  (*env)->ReleaseIntArrayElements(env, target, arr, JNI_ABORT);
+}
+
+
+JNIEXPORT void JNICALL
+Java_TestCheckedReleaseArrayElements_fill(JNIEnv *env,
+                                          jclass* clazz,
+                                          jintArray target,
+                                          jint start,
+                                          jint count) {
+  // Update a slice of the raw array
+  int i;
+  for (i = start; count > 0; i++, count--) {
+    arr[i] = i;
+  }
+  // Write the results back to target, leaving it usable for future updates
+  (*env)->ReleaseIntArrayElements(env, target, arr, JNI_COMMIT);
+}
diff --git a/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseCriticalArray.c b/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseCriticalArray.c
new file mode 100644
index 0000000000000..28afd30d587e6
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedReleaseCriticalArray.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+
+JNIEXPORT jboolean JNICALL
+Java_TestCheckedReleaseCriticalArray_modifyArray(JNIEnv *env,
+                                                 jclass clazz,
+                                                 jintArray iarr) {
+  jboolean isCopy;
+  jint* arr = (jint *)(*env)->GetPrimitiveArrayCritical(env, iarr, &isCopy);
+  if (arr == NULL) {
+    (*env)->FatalError(env, "Unexpected NULL return from GetPrimitiveArrayCritical");
+  }
+  if (isCopy == JNI_FALSE) {
+    jint len = (*env)->GetArrayLength(env, iarr);
+    // make arbitrary changes to the array
+    for (int i = 0; i < len; i++) {
+      arr[i] *= 2;
+    }
+    // write-back using JNI_COMMIT to test for memory leak
+    (*env)->ReleasePrimitiveArrayCritical(env, iarr, arr, JNI_COMMIT);
+  }
+  // we skip the test if the VM makes a copy - as it will definitely leak
+  return !isCopy;
+}

From fc1d2a1e8e8dd76ddde7643f0177c0c44f6fcdf6 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Fri, 8 Jan 2021 09:20:42 +0000
Subject: [PATCH 077/129] 8259065: Optimize MessageDigest.getInstance

Reviewed-by: valeriep
---
 .../classes/java/security/MessageDigest.java  |  57 +++----
 .../share/classes/java/security/Provider.java | 160 +++++++++++-------
 .../sun/security/jca/ProviderConfig.java      |  99 ++++++-----
 .../bench/java/security/GetMessageDigest.java |  78 +++++++++
 4 files changed, 258 insertions(+), 136 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/security/GetMessageDigest.java

diff --git a/src/java.base/share/classes/java/security/MessageDigest.java b/src/java.base/share/classes/java/security/MessageDigest.java
index 623a2601b1bac..be96b0f695382 100644
--- a/src/java.base/share/classes/java/security/MessageDigest.java
+++ b/src/java.base/share/classes/java/security/MessageDigest.java
@@ -30,6 +30,7 @@
 import java.io.PrintStream;
 import java.nio.ByteBuffer;
 
+import sun.security.jca.GetInstance;
 import sun.security.util.Debug;
 import sun.security.util.MessageDigestSpi2;
 
@@ -176,30 +177,27 @@ private MessageDigest(String algorithm, Provider p) {
      * @see Provider
      */
     public static MessageDigest getInstance(String algorithm)
-    throws NoSuchAlgorithmException {
+        throws NoSuchAlgorithmException
+    {
         Objects.requireNonNull(algorithm, "null algorithm name");
-        try {
-            MessageDigest md;
-            Object[] objs = Security.getImpl(algorithm, "MessageDigest",
-                                             (String)null);
-            if (objs[0] instanceof MessageDigest) {
-                md = (MessageDigest)objs[0];
-                md.provider = (Provider)objs[1];
-            } else {
-                md = Delegate.of((MessageDigestSpi)objs[0], algorithm,
-                    (Provider) objs[1]);
-            }
-
-            if (!skipDebug && pdebug != null) {
-                pdebug.println("MessageDigest." + algorithm +
-                    " algorithm from: " + md.provider.getName());
-            }
+        MessageDigest md;
 
-            return md;
+        GetInstance.Instance instance = GetInstance.getInstance("MessageDigest",
+                MessageDigestSpi.class, algorithm);
+        if (instance.impl instanceof MessageDigest messageDigest) {
+            md = messageDigest;
+            md.provider = instance.provider;
+        } else {
+            md = Delegate.of((MessageDigestSpi)instance.impl, algorithm,
+                instance.provider);
+        }
 
-        } catch(NoSuchProviderException e) {
-            throw new NoSuchAlgorithmException(algorithm + " not found");
+        if (!skipDebug && pdebug != null) {
+            pdebug.println("MessageDigest." + algorithm +
+                " algorithm from: " + md.provider.getName());
         }
+
+        return md;
     }
 
     /**
@@ -245,17 +243,18 @@ public static MessageDigest getInstance(String algorithm, String provider)
         Objects.requireNonNull(algorithm, "null algorithm name");
         if (provider == null || provider.isEmpty())
             throw new IllegalArgumentException("missing provider");
-        Object[] objs = Security.getImpl(algorithm, "MessageDigest", provider);
-        if (objs[0] instanceof MessageDigest) {
-            MessageDigest md = (MessageDigest)objs[0];
-            md.provider = (Provider)objs[1];
-            return md;
+
+        MessageDigest md;
+        GetInstance.Instance instance = GetInstance.getInstance("MessageDigest",
+                MessageDigestSpi.class, algorithm, provider);
+        if (instance.impl instanceof MessageDigest messageDigest) {
+            md = messageDigest;
+            md.provider = instance.provider;
         } else {
-            MessageDigest delegate =
-                    Delegate.of((MessageDigestSpi)objs[0], algorithm,
-                    (Provider)objs[1]);
-            return delegate;
+            md = Delegate.of((MessageDigestSpi)instance.impl, algorithm,
+                    instance.provider);
         }
+        return md;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
index d23f6cb609665..2ab094b3a87f1 100644
--- a/src/java.base/share/classes/java/security/Provider.java
+++ b/src/java.base/share/classes/java/security/Provider.java
@@ -147,44 +147,7 @@ public abstract class Provider extends Properties {
 
     private transient boolean initialized;
 
-    private static Object newInstanceUtil(final Class<?> clazz,
-        final Class<?> ctrParamClz, final Object ctorParamObj)
-        throws Exception {
-        if (ctrParamClz == null) {
-            Constructor<?> con = clazz.getConstructor();
-            return con.newInstance();
-        } else {
-            // Looking for the constructor with a params first and fallback
-            // to one without if not found. This is to support the enhanced
-            // SecureRandom where both styles of constructors are supported.
-            // Before jdk9, there was no params support (only getInstance(alg))
-            // and an impl only had the params-less constructor. Since jdk9,
-            // there is getInstance(alg,params) and an impl can contain
-            // an Impl(params) constructor.
-            try {
-                Constructor<?> con = clazz.getConstructor(ctrParamClz);
-                return con.newInstance(ctorParamObj);
-            } catch (NoSuchMethodException nsme) {
-                // For pre-jdk9 SecureRandom implementations, they only
-                // have params-less constructors which still works when
-                // the input ctorParamObj is null.
-                //
-                // For other primitives using params, ctorParamObj should not
-                // be null and nsme is thrown, just like before.
-                if (ctorParamObj == null) {
-                    try {
-                        Constructor<?> con = clazz.getConstructor();
-                        return con.newInstance();
-                    } catch (NoSuchMethodException nsme2) {
-                        nsme.addSuppressed(nsme2);
-                        throw nsme;
-                    }
-                } else {
-                    throw nsme;
-                }
-            }
-        }
-    }
+    private static final Object[] EMPTY = new Object[0];
 
     private static double parseVersionStr(String s) {
         try {
@@ -1106,16 +1069,15 @@ private ServiceKey(String type, String algorithm, boolean intern) {
             this.algorithm = intern ? algorithm.intern() : algorithm;
         }
         public int hashCode() {
-            return Objects.hash(type, algorithm);
+            return type.hashCode() * 31 + algorithm.hashCode();
         }
         public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if (!(obj instanceof ServiceKey)) {
+            if (!(obj instanceof ServiceKey other)) {
                 return false;
             }
-            ServiceKey other = (ServiceKey)obj;
             return this.type.equals(other.type)
                 && this.algorithm.equals(other.algorithm);
         }
@@ -1192,9 +1154,7 @@ private void parseLegacyPut(String name, String value) {
             ServiceKey key = new ServiceKey(type, stdAlg, true);
             Service s = legacyMap.get(key);
             if (s == null) {
-                s = new Service(this);
-                s.type = type;
-                s.algorithm = stdAlg;
+                s = new Service(this, type, stdAlg);
                 legacyMap.put(key, s);
             }
             legacyMap.put(new ServiceKey(type, aliasAlg, true), s);
@@ -1213,9 +1173,7 @@ private void parseLegacyPut(String name, String value) {
                 ServiceKey key = new ServiceKey(type, stdAlg, true);
                 Service s = legacyMap.get(key);
                 if (s == null) {
-                    s = new Service(this);
-                    s.type = type;
-                    s.algorithm = stdAlg;
+                    s = new Service(this, type, stdAlg);
                     legacyMap.put(key, s);
                 }
                 s.className = className;
@@ -1238,9 +1196,7 @@ private void parseLegacyPut(String name, String value) {
                 ServiceKey key = new ServiceKey(type, stdAlg, true);
                 Service s = legacyMap.get(key);
                 if (s == null) {
-                    s = new Service(this);
-                    s.type = type;
-                    s.algorithm = stdAlg;
+                    s = new Service(this, type, stdAlg);
                     legacyMap.put(key, s);
                 }
                 s.addAttribute(attributeName, attributeValue);
@@ -1673,14 +1629,24 @@ private static String getEngineName(String s) {
      * @since 1.5
      */
     public static class Service {
-
-        private String type, algorithm, className;
+        private final String type;
+        private final String algorithm;
+        private String className;
         private final Provider provider;
         private List<String> aliases;
         private Map<UString,String> attributes;
+        private final EngineDescription engineDescription;
+
+        // Reference to the cached implementation Class object.
+        // Will be a Class if this service is loaded from the built-in
+        // classloader (unloading not possible), otherwise a WeakReference to a
+        // Class
+        private Object classCache;
 
-        // Reference to the cached implementation Class object
-        private volatile Reference<Class<?>> classRef;
+        // Will be a Constructor if this service is loaded from the built-in
+        // classloader (unloading not possible), otherwise a WeakReference to
+        // a Constructor
+        private Object constructorCache;
 
         // flag indicating whether this service has its attributes for
         // supportedKeyFormats or supportedKeyClasses set
@@ -1702,8 +1668,11 @@ public static class Service {
         // this constructor and these methods are used for parsing
         // the legacy string properties.
 
-        private Service(Provider provider) {
+        private Service(Provider provider, String type, String algorithm) {
             this.provider = provider;
+            this.type = type;
+            this.algorithm = algorithm;
+            engineDescription = knownEngines.get(type);
             aliases = Collections.<String>emptyList();
             attributes = Collections.<UString,String>emptyMap();
         }
@@ -1749,6 +1718,7 @@ public Service(Provider provider, String type, String algorithm,
             }
             this.provider = provider;
             this.type = getEngineName(type);
+            engineDescription = knownEngines.get(type);
             this.algorithm = algorithm;
             this.className = className;
             if (aliases == null) {
@@ -1863,7 +1833,7 @@ public Object newInstance(Object constructorParameter)
             }
             Class<?> ctrParamClz;
             try {
-                EngineDescription cap = knownEngines.get(type);
+                EngineDescription cap = engineDescription;
                 if (cap == null) {
                     // unknown engine type, use generic code
                     // this is the code path future for non-core
@@ -1890,7 +1860,7 @@ public Object newInstance(Object constructorParameter)
                     }
                 }
                 // constructorParameter can be null if not provided
-                return newInstanceUtil(getImplClass(), ctrParamClz, constructorParameter);
+                return newInstanceUtil(ctrParamClz, constructorParameter);
             } catch (NoSuchAlgorithmException e) {
                 throw e;
             } catch (InvocationTargetException e) {
@@ -1906,11 +1876,59 @@ public Object newInstance(Object constructorParameter)
             }
         }
 
+        private Object newInstanceOf() throws Exception {
+            Constructor<?> con = getDefaultConstructor();
+            return con.newInstance(EMPTY);
+        }
+
+        private Object newInstanceUtil(Class<?> ctrParamClz, Object ctorParamObj)
+                throws Exception
+        {
+            if (ctrParamClz == null) {
+                return newInstanceOf();
+            } else {
+                // Looking for the constructor with a params first and fallback
+                // to one without if not found. This is to support the enhanced
+                // SecureRandom where both styles of constructors are supported.
+                // Before jdk9, there was no params support (only getInstance(alg))
+                // and an impl only had the params-less constructor. Since jdk9,
+                // there is getInstance(alg,params) and an impl can contain
+                // an Impl(params) constructor.
+                try {
+                    Constructor<?> con = getImplClass().getConstructor(ctrParamClz);
+                    return con.newInstance(ctorParamObj);
+                } catch (NoSuchMethodException nsme) {
+                    // For pre-jdk9 SecureRandom implementations, they only
+                    // have params-less constructors which still works when
+                    // the input ctorParamObj is null.
+                    //
+                    // For other primitives using params, ctorParamObj should not
+                    // be null and nsme is thrown, just like before.
+                    if (ctorParamObj == null) {
+                        try {
+                            return newInstanceOf();
+                        } catch (NoSuchMethodException nsme2) {
+                            nsme.addSuppressed(nsme2);
+                            throw nsme;
+                        }
+                    } else {
+                        throw nsme;
+                    }
+                }
+            }
+        }
+
         // return the implementation Class object for this service
         private Class<?> getImplClass() throws NoSuchAlgorithmException {
             try {
-                Reference<Class<?>> ref = classRef;
-                Class<?> clazz = (ref == null) ? null : ref.get();
+                Object cache = classCache;
+                if (cache instanceof Class<?> clazz) {
+                    return clazz;
+                }
+                Class<?> clazz = null;
+                if (cache instanceof WeakReference<?> ref){
+                    clazz = (Class<?>)ref.get();
+                }
                 if (clazz == null) {
                     ClassLoader cl = provider.getClass().getClassLoader();
                     if (cl == null) {
@@ -1923,7 +1941,7 @@ private Class<?> getImplClass() throws NoSuchAlgorithmException {
                             ("class configured for " + type + " (provider: " +
                             provider.getName() + ") is not public.");
                     }
-                    classRef = new WeakReference<>(clazz);
+                    classCache = (cl == null) ? clazz : new WeakReference<Class<?>>(clazz);
                 }
                 return clazz;
             } catch (ClassNotFoundException e) {
@@ -1933,6 +1951,26 @@ private Class<?> getImplClass() throws NoSuchAlgorithmException {
             }
         }
 
+        private Constructor<?> getDefaultConstructor()
+            throws NoSuchAlgorithmException, NoSuchMethodException
+        {
+            Object cache = constructorCache;
+            if (cache instanceof Constructor<?> con) {
+                return con;
+            }
+            Constructor<?> con = null;
+            if (cache instanceof WeakReference<?> ref){
+                con = (Constructor<?>)ref.get();
+            }
+            if (con == null) {
+                Class<?> clazz = getImplClass();
+                con = clazz.getConstructor();
+                constructorCache = (clazz.getClassLoader() == null)
+                        ? con : new WeakReference<Constructor<?>>(con);
+            }
+            return con;
+        }
+
         /**
          * Test whether this Service can use the specified parameter.
          * Returns false if this service cannot use the parameter. Returns
@@ -1960,7 +1998,7 @@ private Class<?> getImplClass() throws NoSuchAlgorithmException {
          * used with this type of service
          */
         public boolean supportsParameter(Object parameter) {
-            EngineDescription cap = knownEngines.get(type);
+            EngineDescription cap = engineDescription;
             if (cap == null) {
                 // unknown engine type, return true by default
                 return true;
diff --git a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
index 95c58d340b3f8..48aa3e7f31052 100644
--- a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
+++ b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
@@ -160,66 +160,73 @@ public String toString() {
      * Get the provider object. Loads the provider if it is not already loaded.
      */
     @SuppressWarnings("deprecation")
-    synchronized Provider getProvider() {
+    Provider getProvider() {
         // volatile variable load
         Provider p = provider;
         if (p != null) {
             return p;
         }
-        if (shouldLoad() == false) {
-            return null;
-        }
+        // DCL
+        synchronized (this) {
+            p = provider;
+            if (p != null) {
+                return p;
+            }
+            if (shouldLoad() == false) {
+                return null;
+            }
 
-        // Create providers which are in java.base directly
-        if (provName.equals("SUN") || provName.equals("sun.security.provider.Sun")) {
-            p = new sun.security.provider.Sun();
-        } else if (provName.equals("SunRsaSign") || provName.equals("sun.security.rsa.SunRsaSign")) {
-            p = new sun.security.rsa.SunRsaSign();
-        } else if (provName.equals("SunJCE") || provName.equals("com.sun.crypto.provider.SunJCE")) {
-            p = new com.sun.crypto.provider.SunJCE();
-        } else if (provName.equals("SunJSSE")) {
-            p = new sun.security.ssl.SunJSSE();
-        } else if (provName.equals("Apple") || provName.equals("apple.security.AppleProvider")) {
-            // need to use reflection since this class only exists on MacOsx
-            p = AccessController.doPrivileged(new PrivilegedAction<Provider>() {
-                public Provider run() {
-                    try {
-                        Class<?> c = Class.forName("apple.security.AppleProvider");
-                        if (Provider.class.isAssignableFrom(c)) {
-                            @SuppressWarnings("deprecation")
-                            Object tmp = c.newInstance();
-                            return (Provider) tmp;
-                        } else {
+            // Create providers which are in java.base directly
+            if (provName.equals("SUN") || provName.equals("sun.security.provider.Sun")) {
+                p = new sun.security.provider.Sun();
+            } else if (provName.equals("SunRsaSign") || provName.equals("sun.security.rsa.SunRsaSign")) {
+                p = new sun.security.rsa.SunRsaSign();
+            } else if (provName.equals("SunJCE") || provName.equals("com.sun.crypto.provider.SunJCE")) {
+                p = new com.sun.crypto.provider.SunJCE();
+            } else if (provName.equals("SunJSSE")) {
+                p = new sun.security.ssl.SunJSSE();
+            } else if (provName.equals("Apple") || provName.equals("apple.security.AppleProvider")) {
+                // need to use reflection since this class only exists on MacOsx
+                p = AccessController.doPrivileged(new PrivilegedAction<Provider>() {
+                    public Provider run() {
+                        try {
+                            Class<?> c = Class.forName("apple.security.AppleProvider");
+                            if (Provider.class.isAssignableFrom(c)) {
+                                @SuppressWarnings("deprecation")
+                                Object tmp = c.newInstance();
+                                return (Provider) tmp;
+                            } else {
+                                return null;
+                            }
+                        } catch (Exception ex) {
+                            if (debug != null) {
+                                debug.println("Error loading provider Apple");
+                                ex.printStackTrace();
+                            }
                             return null;
                         }
-                    } catch (Exception ex) {
-                        if (debug != null) {
-                        debug.println("Error loading provider Apple");
-                        ex.printStackTrace();
+                    }
+                });
+            } else {
+                if (isLoading) {
+                    // because this method is synchronized, this can only
+                    // happen if there is recursion.
+                    if (debug != null) {
+                        debug.println("Recursion loading provider: " + this);
+                        new Exception("Call trace").printStackTrace();
                     }
                     return null;
                 }
-             }
-             });
-        } else {
-            if (isLoading) {
-                // because this method is synchronized, this can only
-                // happen if there is recursion.
-                if (debug != null) {
-                    debug.println("Recursion loading provider: " + this);
-                    new Exception("Call trace").printStackTrace();
+                try {
+                    isLoading = true;
+                    tries++;
+                    p = doLoadProvider();
+                } finally {
+                    isLoading = false;
                 }
-                return null;
-            }
-            try {
-                isLoading = true;
-                tries++;
-                p = doLoadProvider();
-            } finally {
-                isLoading = false;
             }
+            provider = p;
         }
-        provider = p;
         return p;
     }
 
diff --git a/test/micro/org/openjdk/bench/java/security/GetMessageDigest.java b/test/micro/org/openjdk/bench/java/security/GetMessageDigest.java
new file mode 100644
index 0000000000000..17434394ba1ee
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/security/GetMessageDigest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.security;
+
+import java.security.DigestException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+/**
+ * Micros for speed of looking up and instantiating MessageDigests.
+ */
+@State(Scope.Thread)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 10, time = 1)
+@Fork(value = 3)
+public class GetMessageDigest {
+
+    @Param({"md5", "SHA-1", "SHA-256"})
+    private String digesterName;
+
+    private MessageDigest messageDigest;
+
+    @Setup
+    public void setupMessageDigestForCloning() throws NoSuchAlgorithmException {
+        messageDigest = MessageDigest.getInstance(digesterName);
+    }
+
+    @Benchmark
+    public MessageDigest getInstance() throws NoSuchAlgorithmException {
+        return MessageDigest.getInstance(digesterName);
+    }
+
+    @Benchmark
+    public MessageDigest cloneInstance() throws NoSuchAlgorithmException, CloneNotSupportedException {
+        return (MessageDigest)messageDigest.clone();
+    }
+
+    @Benchmark
+    public MessageDigest getInstanceWithProvider() throws NoSuchAlgorithmException, NoSuchProviderException {
+        return MessageDigest.getInstance(digesterName, "SUN");
+    }
+}

From b549cbd39250c5b22c6e863172d18cf247022894 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 8 Jan 2021 10:52:08 +0000
Subject: [PATCH 078/129] 8258481: gc.g1.plab.TestPLABPromotion fails on Linux
 x86

Reviewed-by: sjohanss, kbarrett
---
 test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java
index 0af28223e19b4..9b02b331782e1 100644
--- a/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java
+++ b/test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java
@@ -72,7 +72,7 @@ public class TestPLABPromotion {
     private static final int PLAB_SIZE_HIGH = 65536;
     private static final int OBJECT_SIZE_SMALL = 10;
     private static final int OBJECT_SIZE_MEDIUM = 100;
-    private static final int OBJECT_SIZE_HIGH = 3500;
+    private static final int OBJECT_SIZE_HIGH = 3250;
     private static final int GC_NUM_SMALL = 1;
     private static final int GC_NUM_MEDIUM = 3;
     private static final int GC_NUM_HIGH = 7;
@@ -222,7 +222,7 @@ private static void checkFields(PlabInfo info) {
      * @return true if checkedValue is less than MEM_DIFFERENCE_PCT percent of controlValue
      */
     private static boolean checkRatio(long checkedValue, long controlValue) {
-        return (Math.abs(checkedValue) / controlValue) * 100L < MEM_DIFFERENCE_PCT;
+        return Math.abs(checkedValue * 100.0 / controlValue) < MEM_DIFFERENCE_PCT;
     }
 
     /**
@@ -235,7 +235,7 @@ private static boolean checkRatio(long checkedValue, long controlValue) {
      * MEM_DIFFERENCE_PCT percent of controlValue
      */
     private static boolean checkDifferenceRatio(long checkedValue, long controlValue) {
-        return (Math.abs(checkedValue - controlValue) / controlValue) * 100L < MEM_DIFFERENCE_PCT;
+        return Math.abs((checkedValue - controlValue) * 100.0 / controlValue) < MEM_DIFFERENCE_PCT;
     }
 
     /**
@@ -304,6 +304,7 @@ public TestCase(int wastePct,
         public List<String> toOptions() {
             return Arrays.asList("-XX:ParallelGCThreads=" + parGCThreads,
                     "-XX:ParallelGCBufferWastePct=" + wastePct,
+                    "-XX:ParallelGCThreads=1", // Avoid dynamic sizing of threads.
                     "-XX:OldPLABSize=" + plabSize,
                     "-XX:YoungPLABSize=" + plabSize,
                     "-XX:" + (plabIsFixed ? "-" : "+") + "ResizePLAB",

From 697bf7ab51181866fe51a7f8d7410c33e4416a7f Mon Sep 17 00:00:00 2001
From: Guoxiong Li <lgxbslgx@gmail.com>
Date: Fri, 8 Jan 2021 13:56:07 +0000
Subject: [PATCH 079/129] 8257740: Compiler crash when compiling type
 annotation on multicatch inside lambda

Reviewed-by: vromero
---
 .../sun/tools/javac/comp/LambdaToMethod.java  | 12 +++++
 .../tools/javac/T8257740/T8257740_1.java      | 47 +++++++++++++++++++
 .../tools/javac/T8257740/T8257740_2.java      | 47 +++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 test/langtools/tools/javac/T8257740/T8257740_1.java
 create mode 100644 test/langtools/tools/javac/T8257740/T8257740_2.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 4a6ae3a184614..fecaa262776b8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -2070,10 +2070,22 @@ public Symbol baseSymbol() {
                     case LOCAL_VAR:
                         ret = new VarSymbol(sym.flags() & FINAL, sym.name, sym.type, translatedSym);
                         ((VarSymbol) ret).pos = ((VarSymbol) sym).pos;
+                        // If sym.data == ElementKind.EXCEPTION_PARAMETER,
+                        // set ret.data = ElementKind.EXCEPTION_PARAMETER too.
+                        // Because method com.sun.tools.javac.jvm.Code.fillExceptionParameterPositions and
+                        // com.sun.tools.javac.jvm.Code.fillLocalVarPosition would use it.
+                        // See JDK-8257740 for more information.
+                        if (((VarSymbol) sym).isExceptionParameter()) {
+                            ((VarSymbol) ret).setData(ElementKind.EXCEPTION_PARAMETER);
+                        }
                         break;
                     case PARAM:
                         ret = new VarSymbol((sym.flags() & FINAL) | PARAMETER, sym.name, types.erasure(sym.type), translatedSym);
                         ((VarSymbol) ret).pos = ((VarSymbol) sym).pos;
+                        // Set ret.data. Same as case LOCAL_VAR above.
+                        if (((VarSymbol) sym).isExceptionParameter()) {
+                            ((VarSymbol) ret).setData(ElementKind.EXCEPTION_PARAMETER);
+                        }
                         break;
                     default:
                         Assert.error(skind.name());
diff --git a/test/langtools/tools/javac/T8257740/T8257740_1.java b/test/langtools/tools/javac/T8257740/T8257740_1.java
new file mode 100644
index 0000000000000..7bcf313c5c68d
--- /dev/null
+++ b/test/langtools/tools/javac/T8257740/T8257740_1.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8257740
+ * @summary Compiler crash when compiling type annotation on uni-catch inside lambda
+ * @run compile T8257740_1.java
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+public class T8257740_1 {
+    @Target(ElementType.TYPE_USE)
+    @interface T8257740_1_Anno { }
+
+    void test() {
+        Runnable r = () -> {
+            try {
+                System.out.println();
+            } catch (@T8257740_1_Anno Exception e) { // uni-catch
+                e.printStackTrace();
+            }
+        };
+    }
+}
diff --git a/test/langtools/tools/javac/T8257740/T8257740_2.java b/test/langtools/tools/javac/T8257740/T8257740_2.java
new file mode 100644
index 0000000000000..0d51007e84b52
--- /dev/null
+++ b/test/langtools/tools/javac/T8257740/T8257740_2.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8257740
+ * @summary Compiler crash when compiling type annotation on multi-catch inside lambda
+ * @run compile T8257740_2.java
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+public class T8257740_2 {
+    @Target(ElementType.TYPE_USE)
+    @interface T8257740_2_Anno { }
+
+    void test() {
+        Runnable r = () -> {
+            try {
+                System.out.println();
+            } catch (@T8257740_2_Anno Exception | Error e) { // multi-catch
+                e.printStackTrace();
+            }
+        };
+    }
+}

From 6f7723b4ac8a4ec322b375b035e4a1078aea7653 Mon Sep 17 00:00:00 2001
From: Eric Caspole <ecaspole@openjdk.org>
Date: Fri, 8 Jan 2021 14:18:21 +0000
Subject: [PATCH 080/129] 8258792: LogCompilation: remove redundant check fixed
 by 8257518

Reviewed-by: kvn, redestad
---
 .../java/com/sun/hotspot/tools/compiler/LogCompilation.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogCompilation.java b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogCompilation.java
index b62c4c5069234..e8efb24d722b8 100644
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogCompilation.java
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogCompilation.java
@@ -482,9 +482,6 @@ public static void printTrapHistory(ArrayList<LogEvent> events, PrintStream out)
                 BasicLogEvent ble = (BasicLogEvent) e;
                 Compilation c = ble.getCompilation();
                 if (c == null) {
-                    if (!(ble instanceof NMethod)) {
-                        throw new InternalError("only nmethods should have a null compilation; here's a " + ble.getClass());
-                    }
                     continue;
                 }
                 String name = c.getMethod().getFullName();

From 10a6b0d983cf3c06a4d74c9d87f8c952aefabbb8 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 8 Jan 2021 14:25:12 +0000
Subject: [PATCH 081/129] 8234773: Fix ThreadsSMRSupport::_bootstrap_list

Make ThreadsList noncopyable, direct initializing _bootstrap_list. Avoid C-heap allocation for _bootstrap_list.

Reviewed-by: dholmes, dcubed
---
 src/hotspot/share/runtime/threadSMR.cpp | 28 ++++++++++++++++++-------
 src/hotspot/share/runtime/threadSMR.hpp |  4 +++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/runtime/threadSMR.cpp b/src/hotspot/share/runtime/threadSMR.cpp
index 9b70bdf753c90..d0c9dd0ef3240 100644
--- a/src/hotspot/share/runtime/threadSMR.cpp
+++ b/src/hotspot/share/runtime/threadSMR.cpp
@@ -76,7 +76,7 @@ volatile uint         ThreadsSMRSupport::_deleted_thread_time_max = 0;
 volatile uint         ThreadsSMRSupport::_deleted_thread_times = 0;
 
 // The bootstrap list is empty and cannot be freed.
-ThreadsList ThreadsSMRSupport::_bootstrap_list = ThreadsList(0);
+ThreadsList ThreadsSMRSupport::_bootstrap_list{0};
 
 // This is the VM's current "threads list" and it contains all of
 // the JavaThreads the VM considers to be alive at this moment in
@@ -585,18 +585,32 @@ void SafeThreadsListPtr::verify_hazard_ptr_scanned() {
 #endif
 }
 
-// 'entries + 1' so we always have at least one entry.
+// Shared singleton data for all ThreadsList(0) instances.
+// Used by _bootstrap_list to avoid static init time heap allocation.
+// No real entries, just the final NULL terminator.
+static JavaThread* const empty_threads_list_data[1] = {};
+
+// Result has 'entries + 1' elements, with the last being the NULL terminator.
+static JavaThread* const* make_threads_list_data(int entries) {
+  if (entries == 0) {
+    return empty_threads_list_data;
+  }
+  JavaThread** data = NEW_C_HEAP_ARRAY(JavaThread*, entries + 1, mtThread);
+  data[entries] = NULL;         // Make sure the final entry is NULL.
+  return data;
+}
+
 ThreadsList::ThreadsList(int entries) :
   _length(entries),
   _next_list(NULL),
-  _threads(NEW_C_HEAP_ARRAY(JavaThread*, entries + 1, mtThread)),
+  _threads(make_threads_list_data(entries)),
   _nested_handle_cnt(0)
-{
-  *(JavaThread**)(_threads + entries) = NULL;  // Make sure the extra entry is NULL.
-}
+{}
 
 ThreadsList::~ThreadsList() {
-  FREE_C_HEAP_ARRAY(JavaThread*, _threads);
+  if (_threads != empty_threads_list_data) {
+    FREE_C_HEAP_ARRAY(JavaThread*, _threads);
+  }
 }
 
 // Add a JavaThread to a ThreadsList. The returned ThreadsList is a
diff --git a/src/hotspot/share/runtime/threadSMR.hpp b/src/hotspot/share/runtime/threadSMR.hpp
index 67e1e79565e5c..79b7f8181e0e1 100644
--- a/src/hotspot/share/runtime/threadSMR.hpp
+++ b/src/hotspot/share/runtime/threadSMR.hpp
@@ -172,6 +172,8 @@ class ThreadsList : public CHeapObj<mtThread> {
   JavaThread *const *const _threads;
   volatile intx _nested_handle_cnt;
 
+  NONCOPYABLE(ThreadsList);
+
   template <class T>
   void threads_do_dispatch(T *cl, JavaThread *const thread) const;
 
@@ -185,7 +187,7 @@ class ThreadsList : public CHeapObj<mtThread> {
   static ThreadsList* remove_thread(ThreadsList* list, JavaThread* java_thread);
 
 public:
-  ThreadsList(int entries);
+  explicit ThreadsList(int entries);
   ~ThreadsList();
 
   template <class T>

From 090bd3afc37555582bde61d03e2e32350ae5d714 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Fri, 8 Jan 2021 15:30:33 +0000
Subject: [PATCH 082/129] 8259397: ThreadsSMRSupport::print_info_on() should
 use try_lock_without_rank_check()

Reviewed-by: coleenp, dholmes
---
 src/hotspot/share/runtime/threadSMR.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/threadSMR.cpp b/src/hotspot/share/runtime/threadSMR.cpp
index d0c9dd0ef3240..a44a2cd6c18d3 100644
--- a/src/hotspot/share/runtime/threadSMR.cpp
+++ b/src/hotspot/share/runtime/threadSMR.cpp
@@ -1121,7 +1121,7 @@ void ThreadsSMRSupport::print_info_on(const Thread* thread, outputStream* st) {
 // Print Threads class SMR info.
 void ThreadsSMRSupport::print_info_on(outputStream* st) {
   bool needs_unlock = false;
-  if (Threads_lock->try_lock()) {
+  if (Threads_lock->try_lock_without_rank_check()) {
     // We were able to grab the Threads_lock which makes things safe for
     // this call, but if we are error reporting, then a nested error
     // could happen with the Threads_lock held.

From fb68395dcd267e60a8eae61dbbc8ff24052ce96d Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Fri, 8 Jan 2021 15:59:45 +0000
Subject: [PATCH 083/129] 8259014: (so)
 ServerSocketChannel.bind(UnixDomainSocketAddress)/SocketChannel.bind(UnixDomainSocketAddress)
 will have unknown user and group owner (win)

Reviewed-by: alanb
---
 .../windows/native/libnio/ch/UnixDomainSockets.c      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/java.base/windows/native/libnio/ch/UnixDomainSockets.c b/src/java.base/windows/native/libnio/ch/UnixDomainSockets.c
index 1869009a1f9fc..af03367681543 100644
--- a/src/java.base/windows/native/libnio/ch/UnixDomainSockets.c
+++ b/src/java.base/windows/native/libnio/ch/UnixDomainSockets.c
@@ -92,7 +92,16 @@ Java_sun_nio_ch_UnixDomainSockets_socketSupported(JNIEnv *env, jclass cl)
         return JNI_FALSE;
     }
     closesocket(s);
-    return JNI_TRUE;
+
+    /* Check for build 18362 or newer, due to Windows bug described in 8259014 */
+
+    OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 };
+    DWORDLONG cond_mask = 0;
+
+    VER_SET_CONDITION(cond_mask, VER_BUILDNUMBER, VER_GREATER_EQUAL);
+    osvi.dwBuildNumber  = 18362; // Windows 10 (1903) or newer
+
+    return VerifyVersionInfoW(&osvi, VER_BUILDNUMBER, cond_mask) != 0;
 }
 
 JNIEXPORT jint JNICALL

From 020ec8485251698d1187204ac13321f4726e45ea Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Fri, 8 Jan 2021 18:30:38 +0000
Subject: [PATCH 084/129] 8259429: Update reference to README.md

Reviewed-by: iris
---
 make/conf/jib-profiles.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 632953e8e8887..96e0fdf66d235 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1001,9 +1001,9 @@ var getJibProfilesProfiles = function (input, common, data) {
     // test tasks. Care must however be taken not to polute that work dir by
     // setting the appropriate make variables to control output directories.
     //
-    // Use the existance of the top level README as indication of if this is
+    // Use the existance of the top level README.md as indication of if this is
     // the full source or just src.conf.
-    if (!new java.io.File(__DIR__, "../../README").exists()) {
+    if (!new java.io.File(__DIR__, "../../README.md").exists()) {
         var runTestPrebuiltSrcFullExtra = {
             dependencies: "src.full",
             work_dir: input.get("src.full", "install_path"),

From 876c7fb5f7aab9fb13f6581b79ec14b27c3944d7 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Fri, 8 Jan 2021 21:31:37 +0000
Subject: [PATCH 085/129] 8259493: [test] Use HexFormat instead of adhoc hex
 utilities in network code and locale SoftKeys

Reviewed-by: lancea, naoto
---
 test/jdk/java/net/Authenticator/B6870935.java  | 17 ++---------------
 .../SetAuthenticator/HTTPTestServer.java       | 18 +++---------------
 .../java/net/httpclient/DigestEchoServer.java  | 18 +++---------------
 test/jdk/java/util/Locale/SoftKeys.java        | 15 ++-------------
 .../sun/net/www/protocol/http/DigestTest.java  | 17 ++---------------
 5 files changed, 12 insertions(+), 73 deletions(-)

diff --git a/test/jdk/java/net/Authenticator/B6870935.java b/test/jdk/java/net/Authenticator/B6870935.java
index 766407a104ad8..9f672775ad575 100644
--- a/test/jdk/java/net/Authenticator/B6870935.java
+++ b/test/jdk/java/net/Authenticator/B6870935.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,11 +186,6 @@ private String computeDigest(
             return finalHash;
         }
 
-        private final static char charArray[] = {
-            '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-        };
-
         private String encode(String src, char[] passwd, MessageDigest md) {
             md.update(src.getBytes());
             if (passwd != null) {
@@ -201,15 +196,7 @@ private String encode(String src, char[] passwd, MessageDigest md) {
                 Arrays.fill(passwdBytes, (byte)0x00);
             }
             byte[] digest = md.digest();
-
-            StringBuffer res = new StringBuffer(digest.length * 2);
-            for (int i = 0; i < digest.length; i++) {
-                int hashchar = ((digest[i] >>> 4) & 0xf);
-                res.append(charArray[hashchar]);
-                hashchar = (digest[i] & 0xf);
-                res.append(charArray[hashchar]);
-            }
-            return res.toString();
+            return HexFormat.of().formatHex(digest);
         }
     }
 
diff --git a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java
index a896142b513b6..91efe8d736b90 100644
--- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java
+++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Objects;
 import java.util.Random;
@@ -582,11 +583,6 @@ String getQoP(String defval) {
 
         // Code stolen from DigestAuthentication:
 
-        private static final char charArray[] = {
-            '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-        };
-
         private static String encode(String src, char[] passwd, MessageDigest md) {
             try {
                 md.update(src.getBytes("ISO-8859-1"));
@@ -601,15 +597,7 @@ private static String encode(String src, char[] passwd, MessageDigest md) {
                 Arrays.fill(passwdBytes, (byte)0x00);
             }
             byte[] digest = md.digest();
-
-            StringBuilder res = new StringBuilder(digest.length * 2);
-            for (int i = 0; i < digest.length; i++) {
-                int hashchar = ((digest[i] >>> 4) & 0xf);
-                res.append(charArray[hashchar]);
-                hashchar = (digest[i] & 0xf);
-                res.append(charArray[hashchar]);
-            }
-            return res.toString();
+            return HexFormat.of().formatHex(digest);
         }
 
         public static String computeDigest(boolean isRequest,
diff --git a/test/jdk/java/net/httpclient/DigestEchoServer.java b/test/jdk/java/net/httpclient/DigestEchoServer.java
index b84b0eb5225c1..92b96bea51cbc 100644
--- a/test/jdk/java/net/httpclient/DigestEchoServer.java
+++ b/test/jdk/java/net/httpclient/DigestEchoServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -821,11 +822,6 @@ String getQoP(String defval) {
 
         // Code stolen from DigestAuthentication:
 
-        private static final char charArray[] = {
-            '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-        };
-
         private static String encode(String src, char[] passwd, MessageDigest md) {
             try {
                 md.update(src.getBytes("ISO-8859-1"));
@@ -840,15 +836,7 @@ private static String encode(String src, char[] passwd, MessageDigest md) {
                 Arrays.fill(passwdBytes, (byte)0x00);
             }
             byte[] digest = md.digest();
-
-            StringBuilder res = new StringBuilder(digest.length * 2);
-            for (int i = 0; i < digest.length; i++) {
-                int hashchar = ((digest[i] >>> 4) & 0xf);
-                res.append(charArray[hashchar]);
-                hashchar = (digest[i] & 0xf);
-                res.append(charArray[hashchar]);
-            }
-            return res.toString();
+            return HexFormat.of().formatHex(digest);
         }
 
         public static String computeDigest(boolean isRequest,
diff --git a/test/jdk/java/util/Locale/SoftKeys.java b/test/jdk/java/util/Locale/SoftKeys.java
index 8e57ed8bb57d2..6e6a60fbdefa8 100644
--- a/test/jdk/java/util/Locale/SoftKeys.java
+++ b/test/jdk/java/util/Locale/SoftKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,6 @@
 
 public class SoftKeys {
 
-    private static final char[] CHARS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
     public static void main(String[] args) {
         try {
             // With 4 characters in "language", we'll fill up a 16M heap quickly,
@@ -44,7 +42,7 @@ public static void main(String[] args) {
             // been cleared.
             for (int i = 0; i < 2; i++) {
                 for (int j = 0; j < 512*1024; j++) {
-                    new Locale(langForInt(j), "", "");
+                    new Locale(HexFormat.of().toHexDigits((short)j), "", "");
                 }
             }
         } catch (OutOfMemoryError e) {
@@ -57,14 +55,5 @@ public static void main(String[] args) {
             System.gc();
         }
     }
-
-    private static String langForInt(int val) {
-        StringBuilder buf = new StringBuilder(4);
-        buf.append(CHARS[(val >> 12) & 0xF]);
-        buf.append(CHARS[(val >>  8) & 0xF]);
-        buf.append(CHARS[(val >>  4) & 0xF]);
-        buf.append(CHARS[(val >>  0) & 0xF]);
-        return buf.toString();
-    }
 }
 
diff --git a/test/jdk/sun/net/www/protocol/http/DigestTest.java b/test/jdk/sun/net/www/protocol/http/DigestTest.java
index fe8249c1f98f5..b699c3ff47621 100644
--- a/test/jdk/sun/net/www/protocol/http/DigestTest.java
+++ b/test/jdk/sun/net/www/protocol/http/DigestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -172,11 +172,6 @@ private String computeDigest(
         return finalHash;
     }
 
-    private final static char charArray[] = {
-        '0', '1', '2', '3', '4', '5', '6', '7',
-        '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-    };
-
     private String encode(String src, char[] passwd, MessageDigest md) {
         md.update(src.getBytes());
         if (passwd != null) {
@@ -187,15 +182,7 @@ private String encode(String src, char[] passwd, MessageDigest md) {
             Arrays.fill(passwdBytes, (byte)0x00);
         }
         byte[] digest = md.digest();
-
-        StringBuffer res = new StringBuffer(digest.length * 2);
-        for (int i = 0; i < digest.length; i++) {
-            int hashchar = ((digest[i] >>> 4) & 0xf);
-            res.append(charArray[hashchar]);
-            hashchar = (digest[i] & 0xf);
-            res.append(charArray[hashchar]);
-        }
-        return res.toString();
+        return HexFormat.of().formatHex(digest);
     }
 
 }

From 628c546bea0a42086ffb4c21cc291cc7f12a1239 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Fri, 8 Jan 2021 21:32:54 +0000
Subject: [PATCH 086/129] 8258796: [test] Apply HexFormat to tests for
 java.security

Reviewed-by: xuelei
---
 .../provider/Cipher/AEAD/SameBuffer.java      | 17 +++--
 .../Cipher/Blowfish/BlowfishTestVector.java   | 31 +-------
 .../provider/Cipher/ChaCha20/ChaCha20KAT.java | 17 ++---
 .../ChaCha20/ChaCha20KeyGeneratorTest.java    |  9 +--
 .../Cipher/ChaCha20/ChaCha20NoReuse.java      | 19 ++---
 .../ChaCha20/ChaCha20Poly1305ParamTest.java   | 18 ++---
 .../unittest/ChaCha20CipherUnitTest.java      | 12 +--
 .../KeyAgreement/DHKeyAgreement2.java         | 28 ++-----
 .../KeyAgreement/DHKeyAgreement3.java         | 29 ++-----
 .../KeyFactory/PBKDF2HmacSHA1FactoryTest.java | 37 ++-------
 .../provider/TLS/TestLeadingZeroes.java       | 38 ++--------
 .../security/KeyAgreement/KeySizeTest.java    | 11 ++-
 .../security/KeyAgreement/NegativeTest.java   | 13 ++--
 .../SecretKeyFactory/SecKeyFacSunJCEPrf.java  | 13 ++--
 .../security/ec/SignatureDigestTruncate.java  | 19 ++---
 test/jdk/sun/security/ec/SignatureKAT.java    |  6 +-
 test/jdk/sun/security/ec/ed/EdDSAKeySize.java |  8 +-
 .../sun/security/ec/ed/EdDSANegativeTest.java | 15 ++--
 .../sun/security/ec/ed/EdDSAParamSpec.java    | 14 ++--
 test/jdk/sun/security/ec/ed/EdDSATest.java    |  8 +-
 .../jdk/sun/security/ec/ed/EdECKeyFormat.java |  8 +-
 test/jdk/sun/security/ec/ed/TestEdDSA.java    | 19 +++--
 test/jdk/sun/security/ec/ed/TestEdOps.java    | 26 +++----
 test/jdk/sun/security/ec/xec/TestXDH.java     | 32 +++++---
 test/jdk/sun/security/ec/xec/TestXECOps.java  | 14 ++--
 .../jdk/sun/security/ec/xec/XECIterative.java | 13 ++--
 .../jdk/sun/security/ec/xec/XECKeyFormat.java |  9 +--
 test/jdk/sun/security/krb5/RFC396xTest.java   | 24 +-----
 .../krb5/auto/ReplayCacheTestProc.java        | 17 +----
 .../security/krb5/etype/KerberosAesSha2.java  |  9 +--
 .../security/lib/cacerts/VerifyCACerts.java   | 21 ++----
 .../sun/security/pkcs/pkcs8/PKCS8Test.java    | 18 +++--
 .../pkcs11/tls/TestLeadingZeroesP11.java      | 39 ++--------
 .../sun/security/provider/DSA/TestDSA.java    | 75 +++----------------
 .../provider/MessageDigest/DigestKAT.java     | 68 ++---------------
 test/jdk/sun/security/rsa/SigRecord.java      | 33 ++------
 test/jdk/sun/security/rsa/TestSigGen15.java   |  9 ++-
 test/jdk/sun/security/rsa/pss/SigRecord.java  | 33 ++------
 .../sun/security/rsa/pss/TestSigGenPSS.java   | 17 ++---
 .../util/math/TestIntegerModuloP.java         | 16 +---
 .../x509/X500Name/DerValueConstructor.java    | 54 ++++++-------
 test/lib/jdk/test/lib/Convert.java            | 27 +------
 test/lib/jdk/test/lib/Utils.java              | 26 ++-----
 43 files changed, 292 insertions(+), 677 deletions(-)

diff --git a/test/jdk/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java
index 574e87a579046..756fd624223af 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/SameBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 import java.security.AlgorithmParameters;
 import java.security.Provider;
 import java.security.Security;
+import java.util.HexFormat;
 import javax.crypto.SecretKey;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -102,7 +103,7 @@ static void runTest(Provider p, String algo, String mode,
             String padding, int keyLength, int textLength, int AADLength,
             int offset) throws Exception {
         System.out.println("Testing " + keyLength + " key length; "
-                + textLength + " text lenght; " + AADLength + " AAD length; "
+                + textLength + " text length; " + AADLength + " AAD length; "
                 + offset + " offset");
         if (keyLength > Cipher.getMaxAllowedKeyLength(algo)) {
             // skip this if this key length is larger than what's
@@ -239,12 +240,12 @@ private void doTestWithSameBuffer(int offset, AlgorithmParameters params)
      * Check if two results are equal
      */
     private void runGCMWithSeparateArray(int mode, byte[] AAD, byte[] text,
-            int txtOffset, int lenght, int offset, AlgorithmParameters params)
+            int txtOffset, int length, int offset, AlgorithmParameters params)
             throws Exception {
         // first, generate the cipher text at an allocated buffer
         Cipher cipher = createCipher(mode, params);
         cipher.updateAAD(AAD);
-        byte[] outputText = cipher.doFinal(text, txtOffset, lenght);
+        byte[] outputText = cipher.doFinal(text, txtOffset, length);
 
         // new cipher for encrypt operation
         Cipher anotherCipher = createCipher(mode, params);
@@ -252,17 +253,17 @@ private void runGCMWithSeparateArray(int mode, byte[] AAD, byte[] text,
 
         // next, generate cipher text again at the same buffer of plain text
         int myoff = offset;
-        int off = anotherCipher.update(text, txtOffset, lenght, text, myoff);
+        int off = anotherCipher.update(text, txtOffset, length, text, myoff);
         anotherCipher.doFinal(text, myoff + off);
 
         // check if two resutls are equal
         if (!isEqual(text, myoff, outputText, 0, outputText.length)) {
             System.err.println(
                 "\noutputText:   len = " + outputText.length + "  txtOffset = " + txtOffset + "\n" +
-                jdk.test.lib.Convert.byteArrayToHexString(outputText) + "\n" +
+                HexFormat.of().withUpperCase().formatHex(outputText) + "\n" +
                 "text:  len = " + text.length + "  myoff = " + myoff + "\n" +
-                jdk.test.lib.Convert.byteArrayToHexString(text) + "\n" +
-                    "lenght " + lenght);
+                HexFormat.of().withUpperCase().formatHex(text) + "\n" +
+                "length " + length);
             System.err.println("tlen = " + params.getParameterSpec(GCMParameterSpec.class).getTLen() / 8);
             throw new RuntimeException("Two results not equal, mode:" + mode);
         }
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java b/test/jdk/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java
index 20d460f3c65f2..42069ed67b8f3 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,33 +112,4 @@ public static void main(String[] argv) throws Exception {
         }
         System.out.println("Test passed");
     }
-
-    /*
-     * Converts a byte to hex digit and writes to the supplied buffer
-     */
-    static private void byte2hex(byte b, StringBuffer buf) {
-        char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
-                            '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        int high = ((b & 0xf0) >> 4);
-        int low = (b & 0x0f);
-        buf.append(hexChars[high]);
-        buf.append(hexChars[low]);
-    }
-
-    /*
-     * Converts a byte array to hex string
-     */
-    static private String toHexString(byte[] block) {
-        StringBuffer buf = new StringBuffer();
-
-        int len = block.length;
-
-        for (int i = 0; i < len; i++) {
-             byte2hex(block[i], buf);
-             if (i < len-1) {
-                 buf.append(":");
-             }
-        }
-        return buf.toString();
-    }
 }
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KAT.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KAT.java
index 613085ed239d4..c54cf0c7097f5 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KAT.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KAT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,9 +45,9 @@ public static class TestData {
         public TestData(String name, String keyStr, String nonceStr, int ctr,
                 int dir, String inputStr, String aadStr, String outStr) {
             testName = Objects.requireNonNull(name);
-            key = Convert.hexStringToByteArray(Objects.requireNonNull(keyStr));
-            nonce = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(nonceStr));
+            HexFormat hex = HexFormat.of();
+            key = hex.parseHex(Objects.requireNonNull(keyStr));
+            nonce = hex.parseHex(Objects.requireNonNull(nonceStr));
             if ((counter = ctr) < 0) {
                 throw new IllegalArgumentException(
                         "counter must be 0 or greater");
@@ -58,12 +58,9 @@ public TestData(String name, String keyStr, String nonceStr, int ctr,
                 throw new IllegalArgumentException(
                         "Direction must be ENCRYPT_MODE or DECRYPT_MODE");
             }
-            input = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(inputStr));
-            aad = (aadStr != null) ?
-                Convert.hexStringToByteArray(aadStr) : null;
-            expOutput = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(outStr));
+            input = hex.parseHex(Objects.requireNonNull(inputStr));
+            aad = (aadStr != null) ? hex.parseHex(aadStr) : null;
+            expOutput = hex.parseHex(Objects.requireNonNull(outStr));
         }
 
         public final String testName;
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java
index 773c77be4c9aa..ad2e88309f524 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,13 +30,12 @@
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidParameterException;
+import java.util.HexFormat;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.ChaCha20ParameterSpec;
 
-import jdk.test.lib.Utils;
-
 public class ChaCha20KeyGeneratorTest {
 
     public static void main(String[] args) throws Exception {
@@ -44,7 +43,7 @@ public static void main(String[] args) throws Exception {
 
         try {
             generator.init(new ChaCha20ParameterSpec(
-                    Utils.toByteArray("100000000000000000000000"), 0));
+                    HexFormat.of().parseHex("100000000000000000000000"), 0));
             throw new RuntimeException(
                     "ChaCha20 key generation should not consume AlgorithmParameterSpec");
         } catch (InvalidAlgorithmParameterException e) {
@@ -65,7 +64,7 @@ public static void main(String[] args) throws Exception {
         generator.init(256);
         SecretKey key = generator.generateKey();
         byte[] keyValue = key.getEncoded();
-        System.out.println("Key: " + Utils.toHexString(keyValue));
+        System.out.println("Key: " + HexFormat.of().formatHex(keyValue));
         if (keyValue.length != 32) {
             throw new RuntimeException("The size of generated key must be 256");
         }
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20NoReuse.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20NoReuse.java
index b6300f6f88484..345aee8d8af17 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20NoReuse.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20NoReuse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @bug 8153029
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @run main ChaCha20NoReuse
  * @summary ChaCha20 Cipher Implementation (key/nonce reuse protection)
  */
@@ -39,7 +38,6 @@
 import javax.crypto.AEADBadTagException;
 import javax.crypto.SecretKey;
 import java.security.InvalidKeyException;
-import jdk.test.lib.Convert;
 
 public class ChaCha20NoReuse {
 
@@ -76,9 +74,9 @@ public static class TestData {
         public TestData(String name, String keyStr, String nonceStr, int ctr,
                 int dir, String inputStr, String aadStr, String outStr) {
             testName = Objects.requireNonNull(name);
-            key = Convert.hexStringToByteArray(Objects.requireNonNull(keyStr));
-            nonce = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(nonceStr));
+            HexFormat hex = HexFormat.of();
+            key = hex.parseHex(keyStr);
+            nonce = hex.parseHex(nonceStr);
             if ((counter = ctr) < 0) {
                 throw new IllegalArgumentException(
                         "counter must be 0 or greater");
@@ -89,12 +87,9 @@ public TestData(String name, String keyStr, String nonceStr, int ctr,
                 throw new IllegalArgumentException(
                         "Direction must be ENCRYPT_MODE or DECRYPT_MODE");
             }
-            input = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(inputStr));
-            aad = (aadStr != null) ?
-                Convert.hexStringToByteArray(aadStr) : null;
-            expOutput = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(outStr));
+            input = hex.parseHex(inputStr);
+            aad = (aadStr != null) ? hex.parseHex(aadStr) : null;
+            expOutput = hex.parseHex(outStr);
         }
 
         public final String testName;
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20Poly1305ParamTest.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20Poly1305ParamTest.java
index 9fc657edb1bc9..3eb3965f4d8c9 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20Poly1305ParamTest.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20Poly1305ParamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @bug 8153029 8257769
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @run main ChaCha20Poly1305ParamTest
  * @summary ChaCha20 Cipher Implementation (parameters)
  */
@@ -53,9 +52,9 @@ public static class TestData {
         public TestData(String name, String keyStr, String nonceStr, int ctr,
                 int dir, String inputStr, String aadStr, String outStr) {
             testName = Objects.requireNonNull(name);
-            key = Convert.hexStringToByteArray(Objects.requireNonNull(keyStr));
-            nonce = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(nonceStr));
+            HexFormat hex = HexFormat.of();
+            key = hex.parseHex(keyStr);
+            nonce = hex.parseHex(nonceStr);
             if ((counter = ctr) < 0) {
                 throw new IllegalArgumentException(
                         "counter must be 0 or greater");
@@ -66,12 +65,9 @@ public TestData(String name, String keyStr, String nonceStr, int ctr,
                 throw new IllegalArgumentException(
                         "Direction must be ENCRYPT_MODE or DECRYPT_MODE");
             }
-            input = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(inputStr));
-            aad = (aadStr != null) ?
-                Convert.hexStringToByteArray(aadStr) : null;
-            expOutput = Convert.hexStringToByteArray(
-                    Objects.requireNonNull(outStr));
+            input = hex.parseHex(inputStr);
+            aad = (aadStr != null) ? hex.parseHex(aadStr) : null;
+            expOutput = hex.parseHex(outStr);
         }
 
         public final String testName;
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/unittest/ChaCha20CipherUnitTest.java b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/unittest/ChaCha20CipherUnitTest.java
index 8e7f47d020cda..5216f48d5c3bc 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/unittest/ChaCha20CipherUnitTest.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/unittest/ChaCha20CipherUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Arrays;
+import java.util.HexFormat;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.ChaCha20ParameterSpec;
@@ -46,10 +47,9 @@
 public class ChaCha20CipherUnitTest {
 
     private static final byte[] NONCE
-            = Utils.toByteArray("012345670123456701234567");
+            = HexFormat.of().parseHex("012345670123456701234567");
     private static final SecretKeySpec KEY = new SecretKeySpec(
-            Utils.toByteArray(
-                    "0123456701234567012345670123456701234567012345670123456701234567"),
+            HexFormat.of().parseHex("0123456701234567012345670123456701234567012345670123456701234567"),
             "ChaCha20");
     private static final ChaCha20ParameterSpec CHACHA20_PARAM_SPEC
             = new ChaCha20ParameterSpec(NONCE, 0);
@@ -165,7 +165,7 @@ private static void testInitOnWrap(int opMode) throws Exception {
     }
 
     private static void testAEAD() throws Exception {
-        byte[] expectedPlainttext = Utils.toByteArray("01234567");
+        byte[] expectedPlainttext = HexFormat.of().parseHex("01234567");
         byte[] ciphertext = testUpdateAAD(Cipher.ENCRYPT_MODE, expectedPlainttext);
         byte[] plaintext = testUpdateAAD(Cipher.DECRYPT_MODE, ciphertext);
         if (!Arrays.equals(plaintext, expectedPlainttext)) {
@@ -180,7 +180,7 @@ private static byte[] testUpdateAAD(int opMode, byte[] input)
         String opModeName = getOpModeName(opMode);
         System.out.println("== updateAAD (" + opModeName + ") ==");
 
-        byte[] aad = Utils.toByteArray("0000");
+        byte[] aad = HexFormat.of().parseHex("0000");
         ByteBuffer aadBuf = ByteBuffer.wrap(aad);
 
         Cipher cipher = Cipher.getInstance("ChaCha20");
diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
index be1e4c98030af..c7a0c4aeb331b 100644
--- a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
+++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 import java.security.*;
 import java.security.spec.*;
 import java.security.interfaces.*;
+import java.util.HexFormat;
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import javax.crypto.interfaces.*;
@@ -51,6 +52,10 @@
 public class DHKeyAgreement2 {
 
     private static final String SUNJCE = "SunJCE";
+
+    // Hex formatter to upper case with ":" delimiter
+    private static final HexFormat HEX_FORMATTER = HexFormat.ofDelimiter(":").withUpperCase();
+
     private DHKeyAgreement2() {}
 
     public static void main(String argv[]) throws Exception {
@@ -209,8 +214,8 @@ private void run(String mode) throws Exception {
             System.out.println("EXPECTED:  " + e.getMessage());
         }
 
-        System.out.println("Alice secret: " + toHexString(aliceSharedSecret));
-        System.out.println("Bob secret: " + toHexString(bobSharedSecret));
+        System.out.println("Alice secret: " + HEX_FORMATTER.formatHex(aliceSharedSecret));
+        System.out.println("Bob secret: " + HEX_FORMATTER.formatHex(bobSharedSecret));
 
         if (aliceLen != bobLen) {
             throw new Exception("Shared secrets have different lengths");
@@ -262,23 +267,6 @@ private void byte2hex(byte b, StringBuffer buf) {
         buf.append(hexChars[low]);
     }
 
-    /*
-     * Converts a byte array to hex string
-     */
-    private String toHexString(byte[] block) {
-        StringBuffer buf = new StringBuffer();
-
-        int len = block.length;
-
-        for (int i = 0; i < len; i++) {
-             byte2hex(block[i], buf);
-             if (i < len-1) {
-                 buf.append(":");
-             }
-        }
-        return buf.toString();
-    }
-
     /*
      * Prints the usage of this test.
      */
diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
index 8815d9bd5e3e5..6cdcf1dad2e5b 100644
--- a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
+++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 import java.security.*;
 import java.security.spec.*;
 import java.security.interfaces.*;
+import java.util.HexFormat;
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import javax.crypto.interfaces.*;
@@ -47,6 +48,9 @@
 
 public class DHKeyAgreement3 {
 
+    // Hex formatter to upper case with ":" delimiter
+    private static final HexFormat HEX_FORMATTER = HexFormat.ofDelimiter(":").withUpperCase();
+
     private DHKeyAgreement3() {}
 
     public static void main(String argv[]) throws Exception {
@@ -120,15 +124,15 @@ private void run() throws Exception {
         // Alice, Bob and Carol compute their secrets
         byte[] aliceSharedSecret = aliceKeyAgree.generateSecret();
         int aliceLen = aliceSharedSecret.length;
-        System.out.println("Alice secret: " + toHexString(aliceSharedSecret));
+        System.out.println("Alice secret: " + HEX_FORMATTER.formatHex(aliceSharedSecret));
 
         byte[] bobSharedSecret = bobKeyAgree.generateSecret();
         int bobLen = bobSharedSecret.length;
-        System.out.println("Bob secret: " + toHexString(bobSharedSecret));
+        System.out.println("Bob secret: " + HEX_FORMATTER.formatHex(bobSharedSecret));
 
         byte[] carolSharedSecret = carolKeyAgree.generateSecret();
         int carolLen = carolSharedSecret.length;
-        System.out.println("Carol secret: " + toHexString(carolSharedSecret));
+        System.out.println("Carol secret: " + HEX_FORMATTER.formatHex(carolSharedSecret));
 
 
         // Compare Alice and Bob
@@ -167,23 +171,6 @@ private void byte2hex(byte b, StringBuffer buf) {
         buf.append(hexChars[low]);
     }
 
-    /*
-     * Converts a byte array to hex string
-     */
-    private String toHexString(byte[] block) {
-        StringBuffer buf = new StringBuffer();
-
-        int len = block.length;
-
-        for (int i = 0; i < len; i++) {
-             byte2hex(block[i], buf);
-             if (i < len-1) {
-                 buf.append(":");
-             }
-        }
-        return buf.toString();
-    }
-
     /*
      * Prints the usage of this test.
      */
diff --git a/test/jdk/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java b/test/jdk/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java
index 12a4bb32fccbb..1f2fa128db8f8 100644
--- a/test/jdk/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java
+++ b/test/jdk/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,8 @@
 
 public class PBKDF2HmacSHA1FactoryTest {
 
+    // Hex formatter to upper case with "" delimiter
+    private static final HexFormat HEX_FORMATTER = HexFormat.of();
     private static final String ALGO = "PBKDF2WithHmacSHA1";
     static final int[] KEY_SIZES = { 128, 256 }; // in bits
 
@@ -51,7 +53,7 @@ public class PBKDF2HmacSHA1FactoryTest {
         "01dbee7f4a9e243e988b62c73cda935da05378b93244ec8f48a99e61ad799d86"),
         new TestVector(1200, "password", "ATHENA.MIT.EDUraeburn",
         "5c08eb61fdf71e4e4ec3cf6ba1f5512ba7e52ddbc5e5142f708a31e2e62b1e13"),
-        new TestVector(5, "password", fromHexString("1234567878563412"),
+        new TestVector(5, "password", HEX_FORMATTER.parseHex("1234567878563412"),
         "d1daa78615f287e6a1c8b120d7062a493f98d203e6be49a6adf4fa574b6e64ee"),
         new TestVector(1200,
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
@@ -61,7 +63,7 @@ public class PBKDF2HmacSHA1FactoryTest {
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "pass phrase exceeds block size",
         "9ccad6d468770cd51b10e6a68721be611a8b4d282601db3b36be9246915ec82a"),
-        new TestVector(50, fromHexString("f09d849e"),
+        new TestVector(50, HEX_FORMATTER.parseHex("f09d849e"),
         "EXAMPLE.COMpianist",
         "6b9cf26d45455a43a5b8bb276a403b39e7fe37a0c41e02c281ff3069e1e94f52"),
     };
@@ -83,8 +85,8 @@ private static void test() throws Exception {
                     throw new Exception("Wrong length for derived key");
                 }
                 // Test generateSecret(...) using test vectors
-                if (!tv.expectedVals[j].equals(toHexString(derivedKey))) {
-                    System.out.println("got:      " + toHexString(derivedKey));
+                if (!tv.expectedVals[j].equals(HEX_FORMATTER.formatHex(derivedKey))) {
+                    System.out.println("got:      " + HEX_FORMATTER.formatHex(derivedKey));
                     System.out.println("expected: " + tv.expectedVals[j]);
                     throw new Exception("Wrong value for derived key");
                 }
@@ -109,31 +111,6 @@ private static boolean isEqual(PBEKeySpec spec1, PBEKeySpec spec2) {
         return false;
     }
 
-   private static String toHexString(byte[] bytes) {
-        String mapping = "0123456789abcdef";
-        StringBuilder sb = new StringBuilder(bytes.length*2);
-        for (int i = 0; i < bytes.length; i++) {
-            int low = bytes[i] & 0x0f;
-            int high = ((bytes[i] >> 4) & 0x0f);
-            char[] res = new char[2];
-            res[0] = mapping.charAt(high);
-            res[1] = mapping.charAt(low);
-            sb.append(res);
-        }
-        return sb.toString();
-    }
-    private static byte[] fromHexString(String value) {
-        byte[] bytes = new byte[value.length()/2];
-        String mapping = "0123456789abcdef";
-        StringBuilder sb = new StringBuilder(bytes.length*2);
-        for (int i = 0; i < bytes.length; i++) {
-            String high = value.substring(2*i, 2*i+1);
-            String low = value.substring(2*i+1, 2*i+2);
-            bytes[i] = (byte) ((mapping.indexOf(high) << 4) +
-                               mapping.indexOf(low));
-        }
-        return bytes;
-    }
     public static void main (String[] args) throws Exception {
         test();
         System.out.println("Test Passed!");
diff --git a/test/jdk/com/sun/crypto/provider/TLS/TestLeadingZeroes.java b/test/jdk/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
index 5d4bd5cc4d0c9..bf47477b1350e 100644
--- a/test/jdk/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
+++ b/test/jdk/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 import java.security.*;
 import java.security.spec.*;
 import java.security.interfaces.*;
+import java.util.HexFormat;
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import javax.crypto.interfaces.*;
@@ -47,6 +48,8 @@
 public class TestLeadingZeroes {
 
     private static final String SUNJCE = "SunJCE";
+    // Hex formatter to upper case with ":" delimiter
+    private static final HexFormat HEX_FORMATTER = HexFormat.ofDelimiter(":").withUpperCase();
 
     private TestLeadingZeroes() {}
 
@@ -74,7 +77,7 @@ private void run() throws Exception {
         aliceKeyAgree.init(alicePrivKey);
         aliceKeyAgree.doPhase(bobPubKey, true);
         byte[] sharedSecret = aliceKeyAgree.generateSecret();
-        System.out.println("shared secret:\n" + toHexString(sharedSecret));
+        System.out.println("shared secret:\n" + HEX_FORMATTER.formatHex(sharedSecret));
 
         // verify that leading zero is present
         if (sharedSecret.length != 128) {
@@ -90,7 +93,7 @@ private void run() throws Exception {
         byte[] tlsPremasterSecret =
             aliceKeyAgree.generateSecret("TlsPremasterSecret").getEncoded();
         System.out.println(
-            "tls premaster secret:\n" + toHexString(tlsPremasterSecret));
+            "tls premaster secret:\n" + HEX_FORMATTER.formatHex(tlsPremasterSecret));
 
         // check that leading zero has been stripped
         if (tlsPremasterSecret.length != 127) {
@@ -107,35 +110,6 @@ private void run() throws Exception {
 
     }
 
-    /*
-     * Converts a byte to hex digit and writes to the supplied buffer
-     */
-    private void byte2hex(byte b, StringBuffer buf) {
-        char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
-                            '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        int high = ((b & 0xf0) >> 4);
-        int low = (b & 0x0f);
-        buf.append(hexChars[high]);
-        buf.append(hexChars[low]);
-    }
-
-    /*
-     * Converts a byte array to hex string
-     */
-    private String toHexString(byte[] block) {
-        StringBuffer buf = new StringBuffer();
-
-        int len = block.length;
-
-        for (int i = 0; i < len; i++) {
-             byte2hex(block[i], buf);
-             if (i < len-1) {
-                 buf.append(":");
-             }
-        }
-        return buf.toString();
-    }
-
     private static final byte alicePubKeyEnc[] = {
         (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x24,
         (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
diff --git a/test/jdk/java/security/KeyAgreement/KeySizeTest.java b/test/jdk/java/security/KeyAgreement/KeySizeTest.java
index 492f64abd8b1a..5dfb2dc731521 100644
--- a/test/jdk/java/security/KeyAgreement/KeySizeTest.java
+++ b/test/jdk/java/security/KeyAgreement/KeySizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary KeyLength support test for DiffieHellman, EC, XDH.
  *  Arguments order <KeyExchangeAlgorithm> <Provider> <KeyGenAlgorithm> <keyLen>
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 512
  * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 768
  * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 832
@@ -55,10 +54,10 @@
 import java.security.spec.X509EncodedKeySpec;
 import java.security.spec.NamedParameterSpec;
 import java.util.Arrays;
+import java.util.HexFormat;
 import javax.crypto.KeyAgreement;
 import javax.crypto.interfaces.DHPrivateKey;
 import javax.crypto.interfaces.DHPublicKey;
-import jdk.test.lib.Convert;
 
 public class KeySizeTest {
 
@@ -229,9 +228,9 @@ private static boolean equals(Object actual, Object expected) {
     private static boolean equals(byte[] actual, byte[] expected) {
         boolean equals = Arrays.equals(actual, expected);
         if (!equals) {
-            throw new RuntimeException(String.format("Actual array: %s, "
-                    + "Expected array:%s", Convert.byteArrayToHexString(actual),
-                    Convert.byteArrayToHexString(expected)));
+            throw new RuntimeException(String.format("Actual array: %s, Expected array:%s",
+                    HexFormat.of().withUpperCase().formatHex(actual),
+                    HexFormat.of().withUpperCase().formatHex(expected)));
         }
         return equals;
     }
diff --git a/test/jdk/java/security/KeyAgreement/NegativeTest.java b/test/jdk/java/security/KeyAgreement/NegativeTest.java
index 2e797e1ac5c62..864bf09aeebad 100644
--- a/test/jdk/java/security/KeyAgreement/NegativeTest.java
+++ b/test/jdk/java/security/KeyAgreement/NegativeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
  *  Arguments order <KeyExchangeAlgorithm> <Provider> <KeyGenAlgorithm>
  *                  <keySize> <Curve*>
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @run main NegativeTest DiffieHellman SunJCE DiffieHellman 1024
  * @run main NegativeTest ECDH SunEC EC 256
  * @run main NegativeTest XDH SunEC XDH 255 X25519
@@ -58,8 +57,8 @@
 import java.security.spec.XECPrivateKeySpec;
 import java.security.spec.XECPublicKeySpec;
 import java.util.Arrays;
+import java.util.HexFormat;
 import javax.crypto.KeyAgreement;
-import jdk.test.lib.Convert;
 
 public class NegativeTest {
 
@@ -128,8 +127,8 @@ private static void testModifiedKeyEncodingTest(String provider,
         } catch (InvalidKeySpecException e) {
             System.out.printf("Expected InvalidKeySpecException for invalid "
                     + "PrivateKey %s%n and modified encoding: %s, %s%n",
-                    Convert.byteArrayToHexString(encoded),
-                    Convert.byteArrayToHexString(modified), e.getMessage());
+                    HexFormat.of().withUpperCase().formatHex(encoded),
+                    HexFormat.of().withUpperCase().formatHex(modified), e.getMessage());
         }
         // Test modified PublicKey encoding
         encoded = kp.getPublic().getEncoded();
@@ -143,8 +142,8 @@ private static void testModifiedKeyEncodingTest(String provider,
         } catch (InvalidKeySpecException e) {
             System.out.printf("Expected InvalidKeySpecException for invalid "
                     + "PublicKey %s%n and modified encoding: %s, %s%n",
-                    Convert.byteArrayToHexString(encoded),
-                    Convert.byteArrayToHexString(modified), e.getMessage());
+                    HexFormat.of().withUpperCase().formatHex(encoded),
+                    HexFormat.of().withUpperCase().formatHex(modified), e.getMessage());
         }
     }
 
diff --git a/test/jdk/javax/crypto/SecretKeyFactory/SecKeyFacSunJCEPrf.java b/test/jdk/javax/crypto/SecretKeyFactory/SecKeyFacSunJCEPrf.java
index 356beb31a53b7..c5080ba33c5fc 100644
--- a/test/jdk/javax/crypto/SecretKeyFactory/SecKeyFacSunJCEPrf.java
+++ b/test/jdk/javax/crypto/SecretKeyFactory/SecKeyFacSunJCEPrf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,17 @@
  * @summary Use SunJCE Mac in SecretKeyFactory PBKDF2 implementation
  * @library evilprov.jar
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @run main/othervm SecKeyFacSunJCEPrf
  */
 
 import java.util.Arrays;
+import java.util.HexFormat;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.PBEKeySpec;
 import java.security.Provider;
 import java.security.Security;
 import com.evilprovider.*;
-import jdk.test.lib.Convert;
 
 public class SecKeyFacSunJCEPrf {
 
@@ -46,8 +45,8 @@ public class SecKeyFacSunJCEPrf {
     private static final byte[] SALT = "salt".getBytes();
     private static final char[] PASS = "password".toCharArray();
     private static final int ITER = 4096;
-    private static final byte[] EXP_OUT = Convert.hexStringToByteArray(
-            "4B007901B765489ABEAD49D926F721D065A429C1");
+    private static final byte[] EXP_OUT =
+            HexFormat.of().parseHex("4B007901B765489ABEAD49D926F721D065A429C1");
 
     public static void main(String[] args) throws Exception {
         // Instantiate the Evil Provider and insert it in the
@@ -62,13 +61,13 @@ public static void main(String[] args) throws Exception {
 
         SecretKey secKey1 = pbkdf2.generateSecret(pbks);
         System.out.println("PBKDF2WithHmacSHA1:\n" +
-                    Convert.byteArrayToHexString(secKey1.getEncoded()));
+                    HexFormat.of().withUpperCase().formatHex(secKey1.getEncoded()));
         if (Arrays.equals(secKey1.getEncoded(), EXP_OUT)) {
             System.out.println("Test Vector Passed");
         } else {
             System.out.println("Test Vector Failed");
             System.out.println("Expected Output:\n" +
-                    Convert.byteArrayToHexString(EXP_OUT));
+                    HexFormat.of().withUpperCase().formatHex(EXP_OUT));
             throw new RuntimeException();
         }
     }
diff --git a/test/jdk/sun/security/ec/SignatureDigestTruncate.java b/test/jdk/sun/security/ec/SignatureDigestTruncate.java
index 384568eda0f46..47f0123a49164 100644
--- a/test/jdk/sun/security/ec/SignatureDigestTruncate.java
+++ b/test/jdk/sun/security/ec/SignatureDigestTruncate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,6 @@
  * questions.
  */
 
-import jdk.test.lib.Convert;
-
 import java.security.*;
 import java.security.spec.*;
 import java.math.*;
@@ -79,10 +77,8 @@ public void nextBytes(byte[] bytes) {
     private static void assertEquals(byte[] expected, byte[] actual,
             String name) {
         if (!Arrays.equals(actual, expected)) {
-            System.out.println("expect: "
-                    + Convert.byteArrayToHexString(expected));
-            System.out.println("actual: "
-                    + Convert.byteArrayToHexString(actual));
+            System.out.println("expect: " + HexFormat.of().withUpperCase().formatHex(expected));
+            System.out.println("actual: " + HexFormat.of().withUpperCase().formatHex(actual));
             throw new RuntimeException("Incorrect " + name + " value");
         }
     }
@@ -93,10 +89,11 @@ private static void runTest(String alg, String curveName,
 
         System.out.println("Testing " + alg + " with " + curveName);
 
-        byte[] privateKey = Convert.hexStringToByteArray(privateKeyStr);
-        byte[] msg = Convert.hexStringToByteArray(msgStr);
-        byte[] k = Convert.hexStringToByteArray(kStr);
-        byte[] expectedSig = Convert.hexStringToByteArray(sigStr);
+        HexFormat hex = HexFormat.of();
+        byte[] privateKey = hex.parseHex(privateKeyStr);
+        byte[] msg = hex.parseHex(msgStr);
+        byte[] k = hex.parseHex(kStr);
+        byte[] expectedSig = hex.parseHex(sigStr);
 
         AlgorithmParameters params =
             AlgorithmParameters.getInstance("EC", "SunEC");
diff --git a/test/jdk/sun/security/ec/SignatureKAT.java b/test/jdk/sun/security/ec/SignatureKAT.java
index d1fa6f702cfa6..542d90d6ca52c 100644
--- a/test/jdk/sun/security/ec/SignatureKAT.java
+++ b/test/jdk/sun/security/ec/SignatureKAT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ private static class CurveData {
         private BigInteger pubY;
 
         private static BigInteger toBigInteger(String hex) {
-            byte[] bytes = Convert.hexStringToByteArray(checkHex(hex));
+            byte[] bytes = HexFormat.of().parseHex(checkHex(hex));
             return new BigInteger(1, bytes);
         }
         CurveData(String name, String msg, String priv, String pubX,
@@ -79,7 +79,7 @@ private static class TestData {
                 s != checkHex(s)) {
                 throw new RuntimeException("Error: invalid r, s");
             }
-            this.expSig = Convert.hexStringToByteArray(r + s);
+            this.expSig = HexFormat.of().parseHex(r + s);
         }
     }
 
diff --git a/test/jdk/sun/security/ec/ed/EdDSAKeySize.java b/test/jdk/sun/security/ec/ed/EdDSAKeySize.java
index f415e6517423c..d5a6bec6f5a68 100644
--- a/test/jdk/sun/security/ec/ed/EdDSAKeySize.java
+++ b/test/jdk/sun/security/ec/ed/EdDSAKeySize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.NamedParameterSpec;
 import java.util.Arrays;
+import java.util.HexFormat;
+
 import jdk.test.lib.Convert;
 
 /*
@@ -214,8 +216,8 @@ private static void equals(Object actual, Object expected) {
     private static void equals(byte[] actual, byte[] expected) {
         if (!Arrays.equals(actual, expected)) {
             throw new RuntimeException(String.format("Actual array: %s, "
-                    + "Expected array:%s", Convert.byteArrayToHexString(actual),
-                    Convert.byteArrayToHexString(expected)));
+                    + "Expected array:%s", HexFormat.of().withUpperCase().formatHex(actual),
+                    HexFormat.of().withUpperCase().formatHex(expected)));
         }
     }
 }
diff --git a/test/jdk/sun/security/ec/ed/EdDSANegativeTest.java b/test/jdk/sun/security/ec/ed/EdDSANegativeTest.java
index 88645827d3d5b..c03249e8553c6 100644
--- a/test/jdk/sun/security/ec/ed/EdDSANegativeTest.java
+++ b/test/jdk/sun/security/ec/ed/EdDSANegativeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,14 +34,13 @@
 import java.security.interfaces.EdECPublicKey;
 import java.security.spec.EdDSAParameterSpec;
 import java.util.Arrays;
-import jdk.test.lib.Convert;
+import java.util.HexFormat;
 
 /*
  * @test
  * @bug 8209632
  * @summary Negative cases for EDDSA.
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @run main EdDSANegativeTest
  */
 public class EdDSANegativeTest {
@@ -138,7 +137,7 @@ private static void testParam(String name) throws Exception {
             new byte[255], new byte[500]}) {
                 System.out.printf("Testing signature for name: %s, algorithm "
                         + "spec: (prehash:%s, context:%s)%n", name, preHash,
-                        Convert.byteArrayToHexString(context));
+                        HexFormat.of().withUpperCase().formatHex(context));
                 try {
                     verify(sig, kp.getPublic(), MSG,
                             new EdDSAParameterSpec(preHash, context),
@@ -219,8 +218,8 @@ private static void verify(Signature sig, PublicKey pubKey, byte[] msg,
                 throw new RuntimeException(String.format("Signature verification"
                         + " success with different param context(actual:%s, "
                         + "expected:%s), Prehash(actual:%s, expected:%s)",
-                        Convert.byteArrayToHexString(context),
-                        Convert.byteArrayToHexString(initContext),
+                        HexFormat.of().withUpperCase().formatHex(context),
+                        HexFormat.of().withUpperCase().formatHex(initContext),
                         preHash, initPreHash));
             } else {
                 System.out.println("Atleast a case matched");
@@ -253,8 +252,8 @@ private static boolean equals(byte[] actual, byte[] expected) {
         boolean equals = Arrays.equals(actual, expected);
         if (!equals) {
             throw new RuntimeException(String.format("Actual array: %s, "
-                    + "Expected array:%s", Convert.byteArrayToHexString(actual),
-                    Convert.byteArrayToHexString(expected)));
+                    + "Expected array:%s", HexFormat.of().withUpperCase().formatHex(actual),
+                    HexFormat.of().withUpperCase().formatHex(expected)));
         }
         return equals;
     }
diff --git a/test/jdk/sun/security/ec/ed/EdDSAParamSpec.java b/test/jdk/sun/security/ec/ed/EdDSAParamSpec.java
index 1ef6b02987718..046134f220d9c 100644
--- a/test/jdk/sun/security/ec/ed/EdDSAParamSpec.java
+++ b/test/jdk/sun/security/ec/ed/EdDSAParamSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import java.security.Signature;
 import java.security.spec.EdDSAParameterSpec;
 import java.util.Arrays;
-import jdk.test.lib.Convert;
+import java.util.HexFormat;
 
 /*
  * @test
@@ -78,7 +78,7 @@ private static void testParam(String provider, String name)
             for (byte[] context : new byte[][]{"others".getBytes(), maxCtx}) {
                 System.out.printf("Testing signature for name: %s,"
                         + " algorithm spec: (prehash:%s, context:%s)%n",
-                        name, preHash, Convert.byteArrayToHexString(context));
+                        name, preHash, HexFormat.of().withUpperCase().formatHex(context));
                 EdDSAParameterSpec params
                         = new EdDSAParameterSpec(preHash, context);
                 verifyPublic(sig, kp.getPublic(), MSG, params, initParam,
@@ -129,8 +129,8 @@ private static void verifyPublic(Signature sig, PublicKey pubKey,
                 throw new RuntimeException(String.format("Signature verification"
                         + " success with different param context(actual:%s, "
                         + "expected:%s), Prehash(actual:%s, expected:%s)",
-                        Convert.byteArrayToHexString(context),
-                        Convert.byteArrayToHexString(initContext),
+                        HexFormat.of().withUpperCase().formatHex(context),
+                        HexFormat.of().withUpperCase().formatHex(initContext),
                         preHash, initPreHash));
             } else {
                 System.out.println("Atleast a case matched");
@@ -165,8 +165,8 @@ private static boolean equals(byte[] actual, byte[] expected) {
         boolean equals = Arrays.equals(actual, expected);
         if (!equals) {
             throw new RuntimeException(String.format("Actual array: %s, "
-                    + "Expected array:%s", Convert.byteArrayToHexString(actual),
-                    Convert.byteArrayToHexString(expected)));
+                    + "Expected array:%s", HexFormat.of().withUpperCase().formatHex(actual),
+                    HexFormat.of().withUpperCase().formatHex(expected)));
         }
         return equals;
     }
diff --git a/test/jdk/sun/security/ec/ed/EdDSATest.java b/test/jdk/sun/security/ec/ed/EdDSATest.java
index f61dbd61fe392..5ba06b8970a1d 100644
--- a/test/jdk/sun/security/ec/ed/EdDSATest.java
+++ b/test/jdk/sun/security/ec/ed/EdDSATest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
 import java.security.spec.NamedParameterSpec;
 import java.security.spec.EdDSAParameterSpec;
 import java.util.Arrays;
-import jdk.test.lib.Convert;
+import java.util.HexFormat;
 
 /*
  * @test
@@ -349,8 +349,8 @@ private static void equals(Object actual, Object expected) {
     private static void equals(byte[] actual, byte[] expected) {
         if (!Arrays.equals(actual, expected)) {
             throw new RuntimeException(String.format("Actual array: %s, "
-                    + "Expected array:%s", Convert.byteArrayToHexString(actual),
-                    Convert.byteArrayToHexString(expected)));
+                    + "Expected array:%s", HexFormat.of().withUpperCase().formatHex(actual),
+                    HexFormat.of().withUpperCase().formatHex(expected)));
         }
     }
 }
diff --git a/test/jdk/sun/security/ec/ed/EdECKeyFormat.java b/test/jdk/sun/security/ec/ed/EdECKeyFormat.java
index 81c1fbef14db6..82ed544d61a7d 100644
--- a/test/jdk/sun/security/ec/ed/EdECKeyFormat.java
+++ b/test/jdk/sun/security/ec/ed/EdECKeyFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,6 @@
 import java.math.*;
 import java.util.*;
 
-import jdk.test.lib.Convert;
-
 import sun.security.util.*;
 
 public class EdECKeyFormat {
@@ -98,7 +96,7 @@ private static void pubKeyTest(Provider p) throws Exception {
 
     private static void pubKeyTest(Provider p, String key) throws Exception {
         // ensure that a properly-formatted key can be read
-        byte[] encodedKey = Convert.hexStringToByteArray(key);
+        byte[] encodedKey = HexFormat.of().parseHex(key);
         X509EncodedKeySpec keySpec = new X509EncodedKeySpec(encodedKey);
         KeyFactory kf = KeyFactory.getInstance("EdDSA", p);
         kf.generatePublic(keySpec);
@@ -125,7 +123,7 @@ private static void privKeyTest(String algName, Provider p)
         checkPrivKeyFormat(keySpec.getEncoded());
 
         // ensure that a properly-formatted key can be read
-        byte[] encodedKey = Convert.hexStringToByteArray(privKeys.get(algName));
+        byte[] encodedKey = HexFormat.of().parseHex(privKeys.get(algName));
         keySpec = new PKCS8EncodedKeySpec(encodedKey);
         kf.generatePrivate(keySpec);
     }
diff --git a/test/jdk/sun/security/ec/ed/TestEdDSA.java b/test/jdk/sun/security/ec/ed/TestEdDSA.java
index 7c7e536757c28..511d92ab997e1 100644
--- a/test/jdk/sun/security/ec/ed/TestEdDSA.java
+++ b/test/jdk/sun/security/ec/ed/TestEdDSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,7 +116,7 @@ private static void runKAT() throws Exception {
             "09351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704");
 
         // Ed25519ctx
-        byte[] context = Convert.hexStringToByteArray("666f6f");
+        byte[] context = HexFormat.of().parseHex("666f6f");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6",
             "dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292",
@@ -124,7 +124,7 @@ private static void runKAT() throws Exception {
             "55a4cc2f70a54e04288c5f4cd1e45a7bb520b36292911876cada7323198dd87a" +
             "8b36950b95130022907a7fb7c4e9b2d5f6cca685a587b4b21f4b888e4e7edb0d");
 
-       context = Convert.hexStringToByteArray("626172");
+       context = HexFormat.of().parseHex("626172");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6",
             "dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292",
@@ -132,7 +132,7 @@ private static void runKAT() throws Exception {
             "fc60d5872fc46b3aa69f8b5b4351d5808f92bcc044606db097abab6dbcb1aee3" +
             "216c48e8b3b66431b5b186d1d28f8ee15a5ca2df6668346291c2043d4eb3e90d");
 
-        context = Convert.hexStringToByteArray("666f6f");
+        context = HexFormat.of().parseHex("666f6f");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6",
             "dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292",
@@ -140,7 +140,7 @@ private static void runKAT() throws Exception {
             "8b70c1cc8310e1de20ac53ce28ae6e7207f33c3295e03bb5c0732a1d20dc6490" +
             "8922a8b052cf99b7c4fe107a5abb5b2c4085ae75890d02df26269d8945f84b0b");
 
-        context = Convert.hexStringToByteArray("666f6f");
+        context = HexFormat.of().parseHex("666f6f");
         runSignTest("Ed25519", new EdDSAParameterSpec(false, context),
             "ab9c2853ce297ddab85c993b3ae14bcad39b2c682beabc27d6d4eb20711d6560",
             "0f1d1274943b91415889152e893d80e93275a1fc0b65fd71b4b0dda10ad7d772",
@@ -179,7 +179,7 @@ private static void runKAT() throws Exception {
             "cee1afb2e027df36bc04dcecbf154336c19f0af7e0a6472905e799f1953d2a0f" +
             "f3348ab21aa4adafd1d234441cf807c03a00");
 
-        context = Convert.hexStringToByteArray("666f6f");
+        context = HexFormat.of().parseHex("666f6f");
         runSignTest("Ed448", new EdDSAParameterSpec(false, context),
             "c4eab05d357007c632f3dbb48489924d552b08fe0c353a0d4a1f00acda2c463a" +
             "fbea67c5e8d2877c5e3bc397a659949ef8021e954e0a12274e",
@@ -325,9 +325,9 @@ private static void runSignTest(String algorithm,
             AlgorithmParameterSpec params, String privateKey, String publicKey,
             String message, String signature) throws Exception {
 
-        byte[] privKeyBytes = Convert.hexStringToByteArray(privateKey);
+        byte[] privKeyBytes = HexFormat.of().parseHex(privateKey);
         EdECPoint pubKeyPoint = Convert.hexStringToEdPoint(publicKey);
-        byte[] msgBytes = Convert.hexStringToByteArray(message);
+        byte[] msgBytes = HexFormat.of().parseHex(message);
         byte[] computedSig;
 
         NamedParameterSpec namedSpec = new NamedParameterSpec(algorithm);
@@ -342,8 +342,7 @@ private static void runSignTest(String algorithm,
         sig.initSign(privKey);
         sig.update(msgBytes);
         computedSig = sig.sign();
-        if (!Arrays.equals(computedSig,
-            Convert.hexStringToByteArray(signature))) {
+        if (!Arrays.equals(computedSig, HexFormat.of().parseHex(signature))) {
             throw new RuntimeException("Incorrect signature");
         }
 
diff --git a/test/jdk/sun/security/ec/ed/TestEdOps.java b/test/jdk/sun/security/ec/ed/TestEdOps.java
index b67577cec4fed..79502be45e0c4 100644
--- a/test/jdk/sun/security/ec/ed/TestEdOps.java
+++ b/test/jdk/sun/security/ec/ed/TestEdOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8166597
  * @summary Test EdDSA basic operations
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @modules java.base/sun.security.provider
  *          java.base/sun.security.util
  *          java.base/sun.security.util.math
@@ -39,8 +38,9 @@
 import java.security.*;
 import java.security.spec.*;
 import java.util.Arrays;
+import java.util.HexFormat;
+
 import sun.security.provider.SHAKE256;
-import jdk.test.lib.Convert;
 
 public class TestEdOps {
 
@@ -71,8 +71,8 @@ private static void testShake() {
     }
 
     private static void runShakeTest(int outputLen, String msg, String digest) {
-        byte[] msgBytes = Convert.hexStringToByteArray(msg);
-        byte[] digestBytes = Convert.hexStringToByteArray(digest);
+        byte[] msgBytes = HexFormat.of().parseHex(msg);
+        byte[] digestBytes = HexFormat.of().parseHex(digest);
         SHAKE256 md = new SHAKE256(outputLen);
         md.update(msgBytes, 0, msgBytes.length);
         byte[] computed = md.digest();
@@ -178,14 +178,14 @@ private static void runSignTest(EdDSAOperations ops, String privateKey,
 
         EdDSAParameterSpec sigParams = new EdDSAParameterSpec(false);
 
-        byte[] privKeyBytes = Convert.hexStringToByteArray(privateKey);
-        byte[] pubKeyBytes = Convert.hexStringToByteArray(publicKey);
-        byte[] msgBytes = Convert.hexStringToByteArray(message);
+        HexFormat hex = HexFormat.of();
+        byte[] privKeyBytes = hex.parseHex(privateKey);
+        byte[] pubKeyBytes = hex.parseHex(publicKey);
+        byte[] msgBytes = hex.parseHex(message);
         byte[] computedSig = ops.sign(sigParams, privKeyBytes, msgBytes);
-        if (!Arrays.equals(computedSig,
-                           Convert.hexStringToByteArray(signature))) {
+        if (!Arrays.equals(computedSig, hex.parseHex(signature))) {
             throw new RuntimeException("Incorrect signature: " +
-                Convert.byteArrayToHexString(computedSig) + " != " + signature);
+                HexFormat.of().withUpperCase().formatHex(computedSig) + " != " + signature);
         }
         // Test public key computation
         EdECPoint pubPoint = ops.computePublic(privKeyBytes);
@@ -262,7 +262,7 @@ private static void testInvalidPoints() throws Exception {
         // y value too large
         testInvalidPoint(NamedParameterSpec.ED448,
             "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" +
-            "fffffffffffffffffffffffffffffffffffffffffffffffffff00");
+            "ffffffffffffffffffffffffffffffffffffffffffffffffffff00");
         // not square
         testInvalidPoint(NamedParameterSpec.ED448,
             "43ba28f430cdfe456ae531545f7ecd0ac834a55c9358c0372bfa0c6c6798c086" +
@@ -277,7 +277,7 @@ private static void testInvalidPoints() throws Exception {
     private static void testInvalidPoint(NamedParameterSpec curve,
                                          String pointStr) throws Exception {
 
-        byte[] encodedPoint = Convert.hexStringToByteArray(pointStr);
+        byte[] encodedPoint = HexFormat.of().parseHex(pointStr);
         EdDSAParameters params =
             EdDSAParameters.get(RuntimeException::new, curve);
         EdDSAOperations ops = new EdDSAOperations(params);
diff --git a/test/jdk/sun/security/ec/xec/TestXDH.java b/test/jdk/sun/security/ec/xec/TestXDH.java
index 11dabfe815ad2..a32da875fa58f 100644
--- a/test/jdk/sun/security/ec/xec/TestXDH.java
+++ b/test/jdk/sun/security/ec/xec/TestXDH.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,11 @@
 import java.security.spec.*;
 import javax.crypto.*;
 import java.util.Arrays;
-import java.math.BigInteger;
+import java.util.HexFormat;
+
 import jdk.test.lib.Convert;
+import jdk.test.lib.hexdump.ASN1Formatter;
+import jdk.test.lib.hexdump.HexPrinter;
 
 public class TestXDH {
 
@@ -334,10 +337,10 @@ private static void runDiffieHellmanTest(String a_pri,
         String b_pub, String result) throws Exception {
 
         KeyFactory kf = KeyFactory.getInstance("XDH");
-        byte[] a_pri_ba = Convert.hexStringToByteArray(a_pri);
+        byte[] a_pri_ba = HexFormat.of().parseHex(a_pri);
         KeySpec privateSpec = new PKCS8EncodedKeySpec(a_pri_ba);
         PrivateKey privateKey = kf.generatePrivate(privateSpec);
-        byte[] b_pub_ba = Convert.hexStringToByteArray(b_pub);
+        byte[] b_pub_ba = HexFormat.of().parseHex(b_pub);
         KeySpec publicSpec = new X509EncodedKeySpec(b_pub_ba);
         PublicKey publicKey = kf.generatePublic(publicSpec);
 
@@ -346,10 +349,10 @@ private static void runDiffieHellmanTest(String a_pri,
         ka.doPhase(publicKey, true);
 
         byte[] sharedSecret = ka.generateSecret();
-        byte[] expectedResult = Convert.hexStringToByteArray(result);
+        byte[] expectedResult = HexFormat.of().parseHex(result);
         if (!Arrays.equals(sharedSecret, expectedResult)) {
             throw new RuntimeException("fail: expected=" + result + ", actual="
-                + Convert.byteArrayToHexString(sharedSecret));
+                + HexFormat.of().withUpperCase().formatHex(sharedSecret));
         }
 
     }
@@ -360,7 +363,7 @@ private static void runDiffieHellmanTest(String curveName, String a_pri,
         NamedParameterSpec paramSpec = new NamedParameterSpec(curveName);
         KeyFactory kf = KeyFactory.getInstance("XDH");
         KeySpec privateSpec = new XECPrivateKeySpec(paramSpec,
-            Convert.hexStringToByteArray(a_pri));
+            HexFormat.of().parseHex(a_pri));
         PrivateKey privateKey = kf.generatePrivate(privateSpec);
         boolean clearHighBit = curveName.equals("X25519");
         KeySpec publicSpec = new XECPublicKeySpec(paramSpec,
@@ -369,20 +372,25 @@ private static void runDiffieHellmanTest(String curveName, String a_pri,
 
         byte[] encodedPrivateKey = privateKey.getEncoded();
         System.out.println("Encoded private: " +
-            Convert.byteArrayToHexString(encodedPrivateKey));
+            HexFormat.of().withUpperCase().formatHex(encodedPrivateKey));
+        System.out.println(HexPrinter.simple()
+                .formatter(ASN1Formatter.formatter())
+                .toString(encodedPrivateKey));
         byte[] encodedPublicKey = publicKey.getEncoded();
         System.out.println("Encoded public: " +
-            Convert.byteArrayToHexString(encodedPublicKey));
-
+            HexFormat.of().withUpperCase().formatHex(encodedPublicKey));
+        System.out.println(HexPrinter.simple()
+                .formatter(ASN1Formatter.formatter())
+                .toString(encodedPublicKey));
         KeyAgreement ka = KeyAgreement.getInstance("XDH");
         ka.init(privateKey);
         ka.doPhase(publicKey, true);
 
         byte[] sharedSecret = ka.generateSecret();
-        byte[] expectedResult = Convert.hexStringToByteArray(result);
+        byte[] expectedResult = HexFormat.of().parseHex(result);
         if (!Arrays.equals(sharedSecret, expectedResult)) {
             throw new RuntimeException("fail: expected=" + result + ", actual="
-                + Convert.byteArrayToHexString(sharedSecret));
+                + HexFormat.of().withUpperCase().formatHex(sharedSecret));
         }
     }
 
diff --git a/test/jdk/sun/security/ec/xec/TestXECOps.java b/test/jdk/sun/security/ec/xec/TestXECOps.java
index 83adba8b4655b..15f5a813bb296 100644
--- a/test/jdk/sun/security/ec/xec/TestXECOps.java
+++ b/test/jdk/sun/security/ec/xec/TestXECOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,9 +95,9 @@ private void runDiffieHellmanTest(String opName, String a_str,
 
         byte[] basePoint = Convert.byteToByteArray(settings.getBasePoint(),
             settings.getBytes());
-        byte[] a = Convert.hexStringToByteArray(a_str);
-        byte[] b = Convert.hexStringToByteArray(b_str);
-        byte[] expectedResult = Convert.hexStringToByteArray(result_str);
+        byte[] a = HexFormat.of().parseHex(a_str);
+        byte[] b = HexFormat.of().parseHex(b_str);
+        byte[] expectedResult = HexFormat.of().parseHex(result_str);
 
         byte[] a_copy = Arrays.copyOf(a, a.length);
         byte[] b_copy = Arrays.copyOf(b, b.length);
@@ -118,9 +118,9 @@ private void runDiffieHellmanTest(String opName, String a_str,
     private void runTest(String opName, String k_in_str,
         String u_in_str, String u_out_str) {
 
-        byte[] k_in = Convert.hexStringToByteArray(k_in_str);
-        byte[] u_in = Convert.hexStringToByteArray(u_in_str);
-        byte[] u_out_expected = Convert.hexStringToByteArray(u_out_str);
+        byte[] k_in = HexFormat.of().parseHex(k_in_str);
+        byte[] u_in = HexFormat.of().parseHex(u_in_str);
+        byte[] u_out_expected = HexFormat.of().parseHex(u_out_str);
 
         NamedParameterSpec paramSpec = new NamedParameterSpec(opName);
         XECParameters settings =
diff --git a/test/jdk/sun/security/ec/xec/XECIterative.java b/test/jdk/sun/security/ec/xec/XECIterative.java
index 4bf1dadf1c7d6..0d5d293114548 100644
--- a/test/jdk/sun/security/ec/xec/XECIterative.java
+++ b/test/jdk/sun/security/ec/xec/XECIterative.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@
 import java.io.*;
 import java.security.spec.NamedParameterSpec;
 import java.util.*;
-import jdk.test.lib.Convert;
 
 /*
  * This test is derived from the iterative test in RFC 7748. To produce the
@@ -95,7 +94,7 @@ private void runIterativeTest(String opName, long start, long end)
             StringTokenizer tok = new StringTokenizer(line, ",");
             long iter = Long.parseLong(tok.nextToken());
             String kOrU = tok.nextToken();
-            byte[] value = Convert.hexStringToByteArray(tok.nextToken());
+            byte[] value = HexFormat.of().parseHex(tok.nextToken());
             KU entry = testIters.get(iter);
             if (entry == null) {
                 entry = new KU();
@@ -117,13 +116,13 @@ private void runIterativeTest(String opName, long start, long end)
             if (i % 1000 == 0 && (curEntry = testIters.get(i)) != null) {
                 if (!Arrays.equals(k, curEntry.k)) {
                     throw new RuntimeException("At iter " + i + ": expected k: "
-                        + Convert.byteArrayToHexString(curEntry.k)
-                        + ", computed k: " + Convert.byteArrayToHexString(k));
+                        + HexFormat.of().withUpperCase().formatHex(curEntry.k)
+                        + ", computed k: " + HexFormat.of().withUpperCase().formatHex(k));
                 }
                 if (!Arrays.equals(u, curEntry.u)) {
                     throw new RuntimeException("At iter " + i + ": expected u: "
-                     + Convert.byteArrayToHexString(curEntry.u)
-                     + ", computed u: " + Convert.byteArrayToHexString(u));
+                     + HexFormat.of().withUpperCase().formatHex(curEntry.u)
+                     + ", computed u: " + HexFormat.of().withUpperCase().formatHex(u));
                 }
                 System.out.println(opName + " checkpoint passed at " + i);
             }
diff --git a/test/jdk/sun/security/ec/xec/XECKeyFormat.java b/test/jdk/sun/security/ec/xec/XECKeyFormat.java
index e0d9235a875da..3bf1ce9ae3487 100644
--- a/test/jdk/sun/security/ec/xec/XECKeyFormat.java
+++ b/test/jdk/sun/security/ec/xec/XECKeyFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8213363
  * @summary Check for correct formatting of X25519/X448 private keys
  * @library /test/lib
- * @build jdk.test.lib.Convert
  * @modules java.base/sun.security.util
  * @run main XECKeyFormat
  */
@@ -39,7 +38,7 @@
 import java.math.*;
 import java.util.*;
 
-import jdk.test.lib.Convert;
+import java.util.HexFormat;
 
 import sun.security.util.*;
 
@@ -98,7 +97,7 @@ private static void pubKeyTest(Provider p) throws Exception {
 
     private static void pubKeyTest(Provider p, String key) throws Exception {
         // ensure that a properly-formatted key can be read
-        byte[] encodedKey = Convert.hexStringToByteArray(key);
+        byte[] encodedKey = HexFormat.of().parseHex(key);
         X509EncodedKeySpec keySpec = new X509EncodedKeySpec(encodedKey);
         KeyFactory kf = KeyFactory.getInstance("XDH", p);
         kf.generatePublic(keySpec);
@@ -125,7 +124,7 @@ private static void privKeyTest(String algName, Provider p)
         checkPrivKeyFormat(keySpec.getEncoded());
 
         // ensure that a properly-formatted key can be read
-        byte[] encodedKey = Convert.hexStringToByteArray(privKeys.get(algName));
+        byte[] encodedKey = HexFormat.of().parseHex(privKeys.get(algName));
         keySpec = new PKCS8EncodedKeySpec(encodedKey);
         kf.generatePrivate(keySpec);
     }
diff --git a/test/jdk/sun/security/krb5/RFC396xTest.java b/test/jdk/sun/security/krb5/RFC396xTest.java
index 18814aca89ad0..e8f48d7c4887b 100644
--- a/test/jdk/sun/security/krb5/RFC396xTest.java
+++ b/test/jdk/sun/security/krb5/RFC396xTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
 import sun.security.krb5.internal.crypto.dk.Des3DkCrypto;
 import sun.security.krb5.internal.crypto.dk.DkCrypto;
 import java.nio.*;
+import java.util.HexFormat;
 import javax.crypto.*;
 import javax.crypto.spec.*;
 
@@ -216,29 +217,12 @@ static byte[] i2b(int i) {
     }
 
     static String hex(byte[] bs) {
-        StringBuffer sb = new StringBuffer(bs.length * 2);
-        for(byte b: bs) {
-            char c = (char)((b+256)%256);
-            if (c / 16 < 10)
-                sb.append((char)(c/16+'0'));
-            else
-                sb.append((char)(c/16-10+'a'));
-            if (c % 16 < 10)
-                sb.append((char)(c%16+'0'));
-            else
-                sb.append((char)(c%16-10+'a'));
-        }
-        return new String(sb);
+        return HexFormat.of().formatHex(bs);
     }
 
     static byte[] xeh(String in) {
         in = in.replaceAll(" ", "");
-        int len = in.length()/2;
-        byte[] out = new byte[len];
-        for (int i=0; i<len; i++) {
-            out[i] = (byte)Integer.parseInt(in.substring(i*2, i*2+2), 16);
-        }
-        return out;
+        return HexFormat.of().parseHex(in);
     }
 
     static void assertStringEquals(String a, String b) {
diff --git a/test/jdk/sun/security/krb5/auto/ReplayCacheTestProc.java b/test/jdk/sun/security/krb5/auto/ReplayCacheTestProc.java
index b9d70074032e5..ff99cf940c484 100644
--- a/test/jdk/sun/security/krb5/auto/ReplayCacheTestProc.java
+++ b/test/jdk/sun/security/krb5/auto/ReplayCacheTestProc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -408,22 +408,11 @@ private static void record(String label, Req req) throws Exception {
             ps.printf("%s:\nmsg: %s\nMD5: %s\nSHA-256: %s\n\n",
                     label,
                     req.msg,
-                    hex(md5.digest(data)),
-                    hex(sha256.digest(data)));
+                    HexFormat.of().withUpperCase().formatHex(md5.digest(data)),
+                    HexFormat.of().withUpperCase().formatHex(sha256.digest(data)));
         }
     }
 
-    // Returns a compact hexdump for a byte array
-    private static String hex(byte[] hash) {
-        char[] h = new char[hash.length * 2];
-        char[] hexConst = "0123456789ABCDEF".toCharArray();
-        for (int i=0; i<hash.length; i++) {
-            h[2*i] = hexConst[(hash[i]&0xff)>>4];
-            h[2*i+1] = hexConst[hash[i]&0xf];
-        }
-        return new String(h);
-    }
-
     // return size of dfl file, excluding the null hash ones
     private static int csize(int p) throws Exception {
         try (SeekableByteChannel chan = Files.newByteChannel(
diff --git a/test/jdk/sun/security/krb5/etype/KerberosAesSha2.java b/test/jdk/sun/security/krb5/etype/KerberosAesSha2.java
index c738e063e0268..f7feefadf3117 100644
--- a/test/jdk/sun/security/krb5/etype/KerberosAesSha2.java
+++ b/test/jdk/sun/security/krb5/etype/KerberosAesSha2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 import javax.crypto.Cipher;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.HexFormat;
 
 import sun.security.krb5.internal.crypto.dk.AesSha2DkCrypto;
 import jdk.test.lib.hexdump.HexPrinter;
@@ -190,11 +191,7 @@ private static byte[] checksum(AesSha2DkCrypto dk, byte[] baseKey, byte[] text)
 
     private static byte[] hex(String var) {
         var = var.replaceAll("\\s", "");
-        byte[] data = new byte[var.length()/2];
-        for (int i=0; i<data.length; i++) {
-            data[i] = Integer.valueOf(var.substring(2*i,2*i+2), 16).byteValue();
-        }
-        return data;
+        return HexFormat.of().parseHex(var);
     }
 
     private static void check(byte[] b1, byte[] b2) throws Exception {
diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index 814ded8a4f856..126e8b5b7aa2a 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.HexFormat;
 import java.util.Map;
 
 public class VerifyCACerts {
@@ -60,6 +61,9 @@ public class VerifyCACerts {
     private static final String CHECKSUM
             = "50:97:53:06:1B:40:32:71:D6:CD:3B:29:89:7C:BF:BF:41:6F:56:B1:0D:E9:B8:2A:8C:7C:C2:CD:CD:9F:10:EF";
 
+    // Hex formatter to upper case with ":" delimiter
+    private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
+
     // map of cert alias to SHA-256 fingerprint
     @SuppressWarnings("serial")
     private static final Map<String, String> FINGERPRINT_MAP = new HashMap<>() {
@@ -279,7 +283,7 @@ public static void main(String[] args) throws Exception {
         md = MessageDigest.getInstance("SHA-256");
 
         byte[] data = Files.readAllBytes(Path.of(CACERTS));
-        String checksum = toHexString(md.digest(data));
+        String checksum = HEX.formatHex(md.digest(data));
         if (!checksum.equals(CHECKSUM)) {
             atLeastOneFailed = true;
             System.err.println("ERROR: wrong checksum\n" + checksum);
@@ -368,18 +372,7 @@ private static boolean checkFingerprint(String alias, Certificate cert)
         }
         System.out.println("Checking fingerprint of " + alias);
         byte[] digest = md.digest(cert.getEncoded());
-        return fingerprint.equals(toHexString(digest));
+        return fingerprint.equals(HEX.formatHex(digest));
     }
 
-    private static String toHexString(byte[] block) {
-        StringBuilder buf = new StringBuilder();
-        int len = block.length;
-        for (int i = 0; i < len; i++) {
-            buf.append(String.format("%02X", block[i]));
-            if (i < len - 1) {
-                buf.append(":");
-            }
-        }
-        return buf.toString();
-    }
 }
diff --git a/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java b/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
index b86ab9dceb39a..fbe09e5e3070c 100644
--- a/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
+++ b/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,10 @@
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.HexFormat;
 
-import jdk.test.lib.Utils;
+import jdk.test.lib.hexdump.ASN1Formatter;
+import jdk.test.lib.hexdump.HexPrinter;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import sun.security.pkcs.PKCS8Key;
@@ -52,7 +54,7 @@ public class PKCS8Test {
             "\tp:     02\n\tq:     03\n\tg:     04\n";
     static final String ALGORITHM = "DSA";
 
-    static final byte[] EXPECTED = Utils.toByteArray(
+    static final byte[] EXPECTED = HexFormat.of().parseHex(
             "301e" + // SEQUENCE
                 "020100" +  // Version int 0
                 "3014" +    // PrivateKeyAlgorithmIdentifier
@@ -70,7 +72,9 @@ public void test() throws IOException {
                 BigInteger.valueOf(4)).getEncoded();
 
         Assert.assertTrue(Arrays.equals(encodedKey, EXPECTED),
-                Utils.toHexString(encodedKey));
+                HexPrinter.simple()
+                        .formatter(ASN1Formatter.formatter())
+                        .toString(encodedKey));
 
         PKCS8Key decodedKey = (PKCS8Key)PKCS8Key.parseKey(
                 new DerValue(encodedKey));
@@ -82,7 +86,9 @@ public void test() throws IOException {
 
         byte[] encodedOutput = decodedKey.getEncoded();
         Assert.assertTrue(Arrays.equals(encodedOutput, EXPECTED),
-                Utils.toHexString(encodedOutput));
+                HexPrinter.simple()
+                        .formatter(ASN1Formatter.formatter())
+                        .toString(encodedOutput));
 
         // Test additional fields
         enlarge(0, "8000");    // attributes
@@ -106,7 +112,7 @@ static void enlarge(int newVersion, String... fields) throws IOException {
         byte[] original = EXPECTED.clone();
         int length = original.length;
         for (String field : fields) {   // append fields
-            byte[] add = Utils.toByteArray(field);
+            byte[] add = HexFormat.of().parseHex(field);
             original = Arrays.copyOf(original, length + add.length);
             System.arraycopy(add, 0, original, length, add.length);
             length += add.length;
diff --git a/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java b/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java
index beae7253df346..b594b3e066e10 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestLeadingZeroesP11.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@
 import java.security.PublicKey;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.HexFormat;
 import javax.crypto.KeyAgreement;
 
 /**
@@ -51,6 +52,9 @@
 
 public class TestLeadingZeroesP11 extends PKCS11Test {
 
+    // Hex formatter to upper case with ":" delimiter
+    private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
+
     public static void main(String[] args) throws Exception {
         main(new TestLeadingZeroesP11(), args);
     }
@@ -74,7 +78,7 @@ public void main(Provider p) throws Exception {
         aliceKeyAgree.init(alicePrivKey);
         aliceKeyAgree.doPhase(bobPubKey, true);
         byte[] sharedSecret = aliceKeyAgree.generateSecret();
-        System.out.println("shared secret:\n" + toHexString(sharedSecret));
+        System.out.println("shared secret:\n" + HEX.formatHex(sharedSecret));
 
         // verify that leading zero is present
         if (sharedSecret.length != 128) {
@@ -90,7 +94,7 @@ public void main(Provider p) throws Exception {
         byte[] tlsPremasterSecret =
             aliceKeyAgree.generateSecret("TlsPremasterSecret").getEncoded();
         System.out.println(
-            "tls premaster secret:\n" + toHexString(tlsPremasterSecret));
+            "tls premaster secret:\n" + HEX.formatHex(tlsPremasterSecret));
 
         // check that leading zero has been stripped
         if (tlsPremasterSecret.length != 127) {
@@ -107,35 +111,6 @@ public void main(Provider p) throws Exception {
 
     }
 
-    /*
-     * Converts a byte to hex digit and writes to the supplied buffer
-     */
-    private void byte2hex(byte b, StringBuffer buf) {
-        char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
-                            '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        int high = ((b & 0xf0) >> 4);
-        int low = (b & 0x0f);
-        buf.append(hexChars[high]);
-        buf.append(hexChars[low]);
-    }
-
-    /*
-     * Converts a byte array to hex string
-     */
-    private String toHexString(byte[] block) {
-        StringBuffer buf = new StringBuffer();
-
-        int len = block.length;
-
-        for (int i = 0; i < len; i++) {
-             byte2hex(block[i], buf);
-             if (i < len-1) {
-                 buf.append(":");
-             }
-        }
-        return buf.toString();
-    }
-
     private static final byte alicePubKeyEnc[] = {
         (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x24,
         (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
diff --git a/test/jdk/sun/security/provider/DSA/TestDSA.java b/test/jdk/sun/security/provider/DSA/TestDSA.java
index d730b69f6cb8e..5d3228949f5cd 100644
--- a/test/jdk/sun/security/provider/DSA/TestDSA.java
+++ b/test/jdk/sun/security/provider/DSA/TestDSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,17 +71,22 @@ public class TestDSA {
     private final static BigInteger y = new BigInteger(ys, 16);
 
     // data for test 1, original and SHA-1 hashed
-    private final static byte[] data1Raw = b("0102030405060708090a0b0c0d0e0f10111213");
-    private final static byte[] data1SHA = b("00:e2:5f:c9:1c:8f:d6:8c:6a:dc:c6:bd:f0:46:60:5e:a2:cd:8d:ad");
+    private final static byte[] data1Raw = HexFormat.of()
+            .parseHex("0102030405060708090a0b0c0d0e0f10111213");
+    private final static byte[] data1SHA = HexFormat.ofDelimiter(":")
+            .parseHex("00:e2:5f:c9:1c:8f:d6:8c:6a:dc:c6:bd:f0:46:60:5e:a2:cd:8d:ad");
 
     // valid signatures of data1. sig1b uses incorrect ASN.1 encoding,
     // which we want to accept anyway for compatibility
-    private final static byte[] sig1a = b("30:2d:02:14:53:06:3f:7d:ec:48:3c:99:17:9a:2c:a9:4d:e8:00:da:70:fb:35:d7:02:15:00:92:6a:39:6b:15:63:2f:e7:32:90:35:bf:af:47:55:e7:ff:33:a5:13");
-    private final static byte[] sig1b = b("30:2c:02:14:53:06:3f:7d:ec:48:3c:99:17:9a:2c:a9:4d:e8:00:da:70:fb:35:d7:02:14:92:6a:39:6b:15:63:2f:e7:32:90:35:bf:af:47:55:e7:ff:33:a5:13");
+    private final static byte[] sig1a = HexFormat.ofDelimiter(":")
+            .parseHex("30:2d:02:14:53:06:3f:7d:ec:48:3c:99:17:9a:2c:a9:4d:e8:00:da:70:fb:35:d7:02:15:00:92:6a:39:6b:15:63:2f:e7:32:90:35:bf:af:47:55:e7:ff:33:a5:13");
+    private final static byte[] sig1b = HexFormat.ofDelimiter(":")
+            .parseHex("30:2c:02:14:53:06:3f:7d:ec:48:3c:99:17:9a:2c:a9:4d:e8:00:da:70:fb:35:d7:02:14:92:6a:39:6b:15:63:2f:e7:32:90:35:bf:af:47:55:e7:ff:33:a5:13");
 
     // data for test 2 (invalid signatures)
     private final static byte[] data2Raw = {};
-    private final static byte[] data2SHA = b("da:39:a3:ee:5e:6b:4b:0d:32:55:bf:ef:95:60:18:90:af:d8:07:09");
+    private final static byte[] data2SHA = HexFormat.ofDelimiter(":")
+            .parseHex("da:39:a3:ee:5e:6b:4b:0d:32:55:bf:ef:95:60:18:90:af:d8:07:09");
 
     private static void verify(Provider provider, String alg, PublicKey key, byte[] data, byte[] sig, boolean result) throws Exception {
         Signature s = Signature.getInstance(alg, provider);
@@ -182,62 +187,4 @@ public static void main(String[] args) throws Exception {
         long stop = System.currentTimeMillis();
         System.out.println("All tests passed (" + (stop - start) + " ms).");
     }
-
-    private final static char[] hexDigits = "0123456789abcdef".toCharArray();
-
-    public static String toString(byte[] b) {
-        StringBuffer sb = new StringBuffer(b.length * 3);
-        for (int i = 0; i < b.length; i++) {
-            int k = b[i] & 0xff;
-            if (i != 0) {
-                sb.append(':');
-            }
-            sb.append(hexDigits[k >>> 4]);
-            sb.append(hexDigits[k & 0xf]);
-        }
-        return sb.toString();
-    }
-
-    public static byte[] parse(String s) {
-        try {
-            int n = s.length();
-            ByteArrayOutputStream out = new ByteArrayOutputStream(n / 3);
-            StringReader r = new StringReader(s);
-            while (true) {
-                int b1 = nextNibble(r);
-                if (b1 < 0) {
-                    break;
-                }
-                int b2 = nextNibble(r);
-                if (b2 < 0) {
-                    throw new RuntimeException("Invalid string " + s);
-                }
-                int b = (b1 << 4) | b2;
-                out.write(b);
-            }
-            return out.toByteArray();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static byte[] b(String s) {
-        return parse(s);
-    }
-
-    private static int nextNibble(StringReader r) throws IOException {
-        while (true) {
-            int ch = r.read();
-            if (ch == -1) {
-                return -1;
-            } else if ((ch >= '0') && (ch <= '9')) {
-                return ch - '0';
-            } else if ((ch >= 'a') && (ch <= 'f')) {
-                return ch - 'a' + 10;
-            } else if ((ch >= 'A') && (ch <= 'F')) {
-                return ch - 'A' + 10;
-            }
-        }
-    }
-
 }
diff --git a/test/jdk/sun/security/provider/MessageDigest/DigestKAT.java b/test/jdk/sun/security/provider/MessageDigest/DigestKAT.java
index eba1f59c4d79b..1f797330c4811 100644
--- a/test/jdk/sun/security/provider/MessageDigest/DigestKAT.java
+++ b/test/jdk/sun/security/provider/MessageDigest/DigestKAT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,62 +36,7 @@
 
 public class DigestKAT {
 
-    private final static char[] hexDigits = "0123456789abcdef".toCharArray();
-
-    public static String toString(byte[] b) {
-        StringBuffer sb = new StringBuffer(b.length * 3);
-        for (int i = 0; i < b.length; i++) {
-            int k = b[i] & 0xff;
-            if (i != 0) {
-                sb.append(':');
-            }
-            sb.append(hexDigits[k >>> 4]);
-            sb.append(hexDigits[k & 0xf]);
-        }
-        return sb.toString();
-    }
-
-    public static byte[] parse(String s) {
-        try {
-            int n = s.length();
-            ByteArrayOutputStream out = new ByteArrayOutputStream(n / 3);
-            StringReader r = new StringReader(s);
-            while (true) {
-                int b1 = nextNibble(r);
-                if (b1 < 0) {
-                    break;
-                }
-                int b2 = nextNibble(r);
-                if (b2 < 0) {
-                    throw new RuntimeException("Invalid string " + s);
-                }
-                int b = (b1 << 4) | b2;
-                out.write(b);
-            }
-            return out.toByteArray();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static byte[] b(String s) {
-        return parse(s);
-    }
-
-    private static int nextNibble(StringReader r) throws IOException {
-        while (true) {
-            int ch = r.read();
-            if (ch == -1) {
-                return -1;
-            } else if ((ch >= '0') && (ch <= '9')) {
-                return ch - '0';
-            } else if ((ch >= 'a') && (ch <= 'f')) {
-                return ch - 'a' + 10;
-            } else if ((ch >= 'A') && (ch <= 'F')) {
-                return ch - 'A' + 10;
-            }
-        }
-    }
+    private static final HexFormat HEX = HexFormat.ofDelimiter(":");
 
     static abstract class Test {
         abstract void run(Provider p) throws Exception;
@@ -118,10 +63,10 @@ void run(Provider p) throws Exception {
             if (Arrays.equals(digest, myDigest) == false) {
                 System.out.println("Digest test for " + alg + " failed:");
                 if (data.length < 256) {
-                    System.out.println("data: " + DigestKAT.toString(data));
+                    System.out.println("data: " + HEX.formatHex(data));
                 }
-                System.out.println("dig:  " + DigestKAT.toString(digest));
-                System.out.println("out:  " + DigestKAT.toString(myDigest));
+                System.out.println("dig:  " + HEX.formatHex(digest));
+                System.out.println("out:  " + HEX.formatHex(myDigest));
                 throw new Exception("Digest test for " + alg + " failed");
             }
 //          System.out.println("Passed " + alg);
@@ -137,7 +82,8 @@ private static byte[] s(String s) {
     }
 
     private static Test t(String alg, byte[] data, String digest) {
-        return new DigestTest(alg, data, parse(digest));
+        HexFormat hex = (digest.indexOf(':') < 0) ? HexFormat.of() : HexFormat.ofDelimiter(":");
+        return new DigestTest(alg, data, hex.parseHex(digest));
     }
 
     private final static byte[] ALONG, BLONG;
diff --git a/test/jdk/sun/security/rsa/SigRecord.java b/test/jdk/sun/security/rsa/SigRecord.java
index 5fc9326cfdf00..be5747ad4583b 100644
--- a/test/jdk/sun/security/rsa/SigRecord.java
+++ b/test/jdk/sun/security/rsa/SigRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,36 +30,13 @@
 import java.security.*;
 import java.security.spec.*;
 import java.util.ArrayList;
+import java.util.HexFormat;
 import java.util.List;
 
 public final class SigRecord {
 
     static final String TEST_SRC = System.getProperty("test.src", ".");
 
-    // utility method for converting byte array to hex string
-    static String toHexString(byte[] array) {
-        StringBuilder sb = new StringBuilder(array.length * 2);
-        for (byte b : array) {
-            // The single digits 0123456789abcdef get a leading 0
-            if ((b >= 0x00) && (b < 0x10)) {
-                sb.append('0');
-            }
-            sb.append(Integer.toHexString(b & 0xff));
-        }
-        return sb.toString();
-    }
-
-    // utility method for converting hex string to byte array
-    static byte[] toByteArray(String s) {
-        byte[] bytes = new byte[s.length() / 2];
-        for (int i = 0; i < bytes.length; i++) {
-            int index = i * 2;
-            int v = Integer.parseInt(s.substring(index, index + 2), 16);
-            bytes[i] = (byte) v;
-        }
-        return bytes;
-    }
-
     public static final class SigVector {
         // digest algorithm to use
         final String mdAlg;
@@ -115,9 +92,9 @@ public String toString() {
             throw new IllegalArgumentException("One or more test vectors must be specified");
         }
 
-        BigInteger n = new BigInteger(1, toByteArray(mod));
-        BigInteger e = new BigInteger(1, toByteArray(pubExp));
-        BigInteger d = new BigInteger(1, toByteArray(privExp));
+        BigInteger n = new BigInteger(1, HexFormat.of().parseHex(mod));
+        BigInteger e = new BigInteger(1, HexFormat.of().parseHex(pubExp));
+        BigInteger d = new BigInteger(1, HexFormat.of().parseHex(privExp));
         this.id = ("n=" + mod + ", e=" + pubExp);
         this.pubKeySpec = new RSAPublicKeySpec(n, e);
         this.privKeySpec = new RSAPrivateKeySpec(n, d);
diff --git a/test/jdk/sun/security/rsa/TestSigGen15.java b/test/jdk/sun/security/rsa/TestSigGen15.java
index 08ce334b89e34..12cc028b07249 100644
--- a/test/jdk/sun/security/rsa/TestSigGen15.java
+++ b/test/jdk/sun/security/rsa/TestSigGen15.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 import java.security.spec.*;
 import java.security.interfaces.*;
 import java.util.ArrayList;
+import java.util.HexFormat;
 import java.util.List;
 
 /*
@@ -100,8 +101,8 @@ static boolean check(PrivateKey privKey, PublicKey pubKey,
                     " due to no support");
                 continue;
             }
-            byte[] msgBytes = SigRecord.toByteArray(v.msg);
-            byte[] expSigBytes = SigRecord.toByteArray(v.sig);
+            byte[] msgBytes = HexFormat.of().parseHex(v.msg);
+            byte[] expSigBytes = HexFormat.of().parseHex(v.sig);
 
             sig.initSign(privKey);
             sig.update(msgBytes);
@@ -114,7 +115,7 @@ static boolean check(PrivateKey privKey, PublicKey pubKey,
                 System.out.println("\tSHAALG       = " + v.mdAlg);
                 System.out.println("\tMsg          = " + v.msg);
                 System.out.println("\tExpected Sig = " + v.sig);
-                System.out.println("\tActual Sig   = " + SigRecord.toHexString(actualSigBytes));
+                System.out.println("\tActual Sig   = " + HexFormat.of().formatHex(actualSigBytes));
             } else {
                 System.out.println("\t" + v.mdAlg + " Test Vector Passed");
             }
diff --git a/test/jdk/sun/security/rsa/pss/SigRecord.java b/test/jdk/sun/security/rsa/pss/SigRecord.java
index fbea8c9634f0e..faf3142d0a84e 100644
--- a/test/jdk/sun/security/rsa/pss/SigRecord.java
+++ b/test/jdk/sun/security/rsa/pss/SigRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,36 +30,13 @@
 import java.security.*;
 import java.security.spec.*;
 import java.util.ArrayList;
+import java.util.HexFormat;
 import java.util.List;
 
 public final class SigRecord {
 
     static final String TEST_SRC = System.getProperty("test.src", ".");
 
-    // utility method for converting byte array to hex string
-    static String toHexString(byte[] array) {
-        StringBuilder sb = new StringBuilder(array.length * 2);
-        for (byte b : array) {
-            // The single digits 0123456789abcdef get a leading 0
-            if ((b >= 0x00) && (b < 0x10)) {
-                sb.append('0');
-            }
-            sb.append(Integer.toHexString(b & 0xff));
-        }
-        return sb.toString();
-    }
-
-    // utility method for converting hex string to byte array
-    static byte[] toByteArray(String s) {
-        byte[] bytes = new byte[s.length() / 2];
-        for (int i = 0; i < bytes.length; i++) {
-            int index = i * 2;
-            int v = Integer.parseInt(s.substring(index, index + 2), 16);
-            bytes[i] = (byte) v;
-        }
-        return bytes;
-    }
-
     public static final class SigVector {
         // digest algorithm to use
         final String mdAlg;
@@ -120,9 +97,9 @@ public String toString() {
             throw new IllegalArgumentException("One or more test vectors must be specified");
         }
 
-        BigInteger n = new BigInteger(1, toByteArray(mod));
-        BigInteger e = new BigInteger(1, toByteArray(pubExp));
-        BigInteger d = new BigInteger(1, toByteArray(privExp));
+        BigInteger n = new BigInteger(1, HexFormat.of().parseHex(mod));
+        BigInteger e = new BigInteger(1, HexFormat.of().parseHex(pubExp));
+        BigInteger d = new BigInteger(1, HexFormat.of().parseHex(privExp));
         this.id = ("n=" + mod + ", e=" + pubExp);
         this.pubKeySpec = new RSAPublicKeySpec(n, e);
         this.privKeySpec = new RSAPrivateKeySpec(n, d);
diff --git a/test/jdk/sun/security/rsa/pss/TestSigGenPSS.java b/test/jdk/sun/security/rsa/pss/TestSigGenPSS.java
index 50a608ef271c2..dfadef03f04ed 100644
--- a/test/jdk/sun/security/rsa/pss/TestSigGenPSS.java
+++ b/test/jdk/sun/security/rsa/pss/TestSigGenPSS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,10 @@
  * questions.
  */
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.security.*;
 import java.security.spec.*;
-import java.security.interfaces.*;
-import java.util.ArrayList;
+import java.util.HexFormat;
 import java.util.List;
 
 /*
@@ -50,7 +45,7 @@ static final class MyKnownRandomSrc extends SecureRandom {
         int numBytes;
 
         MyKnownRandomSrc(String srcString) {
-            this.srcBytes = SigRecord.toByteArray(srcString);
+            this.srcBytes = HexFormat.of().parseHex(srcString);
             this.numBytes = this.srcBytes.length;
         }
         @Override
@@ -120,8 +115,8 @@ static boolean check(Signature sig, PrivateKey privKey, PublicKey pubKey,
         boolean success = true;
         for (SigRecord.SigVector v : vectors) {
             System.out.println("\tAgainst " + v.mdAlg);
-            byte[] msgBytes = SigRecord.toByteArray(v.msg);
-            byte[] expSigBytes = SigRecord.toByteArray(v.sig);
+            byte[] msgBytes = HexFormat.of().parseHex(v.msg);
+            byte[] expSigBytes = HexFormat.of().parseHex(v.sig);
 
             MyKnownRandomSrc saltSrc = new MyKnownRandomSrc(v.salt);
             sig.initSign(privKey, saltSrc);
@@ -145,7 +140,7 @@ static boolean check(Signature sig, PrivateKey privKey, PublicKey pubKey,
                 System.out.println("\tMsg          = " + v.msg);
                 System.out.println("\tSalt          = " + v.salt);
                 System.out.println("\tExpected Sig = " + v.sig);
-                System.out.println("\tActual Sig   = " + SigRecord.toHexString(actualSigBytes));
+                System.out.println("\tActual Sig   = " + HexFormat.of().formatHex(actualSigBytes));
             } else {
                 System.out.println("\t" + v.mdAlg + " Test Vector Passed");
             }
diff --git a/test/jdk/sun/security/util/math/TestIntegerModuloP.java b/test/jdk/sun/security/util/math/TestIntegerModuloP.java
index a887e8ef1ace2..75a3d2dbc2214 100644
--- a/test/jdk/sun/security/util/math/TestIntegerModuloP.java
+++ b/test/jdk/sun/security/util/math/TestIntegerModuloP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -195,23 +195,13 @@ void applyAndCheckArray(BiFunction<T, R, byte[]> func,
             byte[] baselineResult = func.apply(baseline, right.baseline);
             if (!Arrays.equals(testResult, baselineResult)) {
                 throw new RuntimeException("Array values do not match: "
-                    + byteArrayToHexString(testResult) + " != "
-                    + byteArrayToHexString(baselineResult));
+                    + HexFormat.of().withUpperCase().formatHex(testResult) + " != "
+                    + HexFormat.of().withUpperCase().formatHex(baselineResult));
             }
         }
 
     }
 
-    static String byteArrayToHexString(byte[] arr) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < arr.length; ++i) {
-            byte curVal = arr[i];
-            result.append(Character.forDigit(curVal >> 4 & 0xF, 16));
-            result.append(Character.forDigit(curVal & 0xF, 16));
-        }
-        return result.toString();
-    }
-
     static TestPair<IntegerModuloP>
     applyAndCheck(ElemFunction func, TestPair<MutableIntegerModuloP> left,
                   TestPair<IntegerModuloP> right) {
diff --git a/test/jdk/sun/security/x509/X500Name/DerValueConstructor.java b/test/jdk/sun/security/x509/X500Name/DerValueConstructor.java
index 0a9f835194439..463d21db72660 100644
--- a/test/jdk/sun/security/x509/X500Name/DerValueConstructor.java
+++ b/test/jdk/sun/security/x509/X500Name/DerValueConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,23 @@
 
 /* @test
  * @bug 4228833
+ * @library /test/lib
  * @summary Make sure constructor that takes DerValue argument works
  * @modules java.base/sun.security.util
  *          java.base/sun.security.x509
  */
 
+import jdk.test.lib.hexdump.ASN1Formatter;
+import jdk.test.lib.hexdump.HexPrinter;
 import sun.security.util.*;
 import sun.security.x509.*;
 
+import java.util.HexFormat;
+
 public class DerValueConstructor {
+    // Hex formatter to upper case with ":" delimiter
+    private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
+
 
     public static void main(String[] args) throws Exception {
         String name = "CN=anne test";
@@ -50,7 +58,10 @@ public static void main(String[] args) throws Exception {
         dn.encode(debugDER);
         ba = debugDER.toByteArray();
         System.err.print("DEBUG: encoded X500Name bytes: ");
-        System.out.println(toHexString(ba));
+        System.out.println(HEX.formatHex(ba));
+        System.out.println(HexPrinter.simple()
+                .formatter(ASN1Formatter.formatter())
+                .toString(ba));
         System.err.println();
 
         // decode
@@ -76,7 +87,10 @@ public static void main(String[] args) throws Exception {
         gn.encode(debugDER);
         ba = debugDER.toByteArray();
         System.err.print("DEBUG: encoded GeneralName bytes: ");
-        System.out.println(toHexString(ba));
+        System.out.println(HEX.formatHex(ba));
+        System.out.println(HexPrinter.simple()
+                .formatter(ASN1Formatter.formatter())
+                .toString(ba));
         System.err.println();
 
         // decode
@@ -96,39 +110,13 @@ public static void main(String[] args) throws Exception {
         subTree.encode(debugDER);
         ba = debugDER.toByteArray();
         System.err.print("DEBUG: encoded GeneralSubtree bytes: ");
-        System.out.println(toHexString(ba));
+        System.out.println(HEX.formatHex(ba));
+        System.out.println(HexPrinter.simple()
+                .formatter(ASN1Formatter.formatter())
+                .toString(ba));
         System.err.println();
 
         // decode
         GeneralSubtree debugSubtree = new GeneralSubtree(new DerValue(ba));
     }
-
-    /*
-     * Converts a byte to hex digit and writes to the supplied buffer
-     */
-    private static void byte2hex(byte b, StringBuffer buf) {
-        char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
-                            '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        int high = ((b & 0xf0) >> 4);
-        int low = (b & 0x0f);
-        buf.append(hexChars[high]);
-        buf.append(hexChars[low]);
-    }
-
-    /*
-     * Converts a byte array to hex string
-     */
-    private static String toHexString(byte[] block) {
-        StringBuffer buf = new StringBuffer();
-
-        int len = block.length;
-
-        for (int i = 0; i < len; i++) {
-            byte2hex(block[i], buf);
-            if (i < len-1) {
-                buf.append(":");
-            }
-        }
-        return buf.toString();
-    }
 }
diff --git a/test/lib/jdk/test/lib/Convert.java b/test/lib/jdk/test/lib/Convert.java
index 2f87a49ca75e6..7ed1112c94d5b 100644
--- a/test/lib/jdk/test/lib/Convert.java
+++ b/test/lib/jdk/test/lib/Convert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 package jdk.test.lib;
 
 import java.math.BigInteger;
+import java.util.HexFormat;
 import java.security.spec.EdECPoint;
 
 /**
@@ -33,17 +34,6 @@
 
 public class Convert {
 
-    // Convert from a byte array to a hexadecimal representation as a string.
-    public static String byteArrayToHexString(byte[] arr) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < arr.length; ++i) {
-            byte curVal = arr[i];
-            result.append(Character.forDigit(curVal >> 4 & 0xF, 16));
-            result.append(Character.forDigit(curVal & 0xF, 16));
-        }
-        return result.toString();
-    }
-
     // Expand a single byte to a byte array
     public static byte[] byteToByteArray(byte v, int length) {
         byte[] result = new byte[length];
@@ -51,17 +41,6 @@ public static byte[] byteToByteArray(byte v, int length) {
         return result;
     }
 
-    // Convert a hexadecimal string to a byte array
-    public static byte[] hexStringToByteArray(String str) {
-        byte[] result = new byte[str.length() / 2];
-        for (int i = 0; i < result.length; i++) {
-            result[i] = (byte) Character.digit(str.charAt(2 * i), 16);
-            result[i] <<= 4;
-            result[i] += Character.digit(str.charAt(2 * i + 1), 16);
-        }
-        return result;
-    }
-
     /*
      * Convert a hexadecimal string to the corresponding little-ending number
      * as a BigInteger. The clearHighBit argument determines whether the most
@@ -92,7 +71,7 @@ private static EdECPoint byteArrayToEdPoint(byte[] arr) {
     }
 
     public static EdECPoint hexStringToEdPoint(String str) {
-        return byteArrayToEdPoint(hexStringToByteArray(str));
+        return byteArrayToEdPoint(HexFormat.of().parseHex(str));
     }
 
     private static void swap(byte[] arr, int i, int j) {
diff --git a/test/lib/jdk/test/lib/Utils.java b/test/lib/jdk/test/lib/Utils.java
index 59558802bc5fa..be91030ebdb8e 100644
--- a/test/lib/jdk/test/lib/Utils.java
+++ b/test/lib/jdk/test/lib/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HexFormat;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.HashMap;
@@ -462,24 +463,17 @@ public static String fileAsString(String filename) throws IOException {
         return new String(Files.readAllBytes(filePath));
     }
 
-    private static final char[] hexArray = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
     /**
      * Returns hex view of byte array
      *
      * @param bytes byte array to process
      * @return space separated hexadecimal string representation of bytes
+     * @deprecated replaced by {@link java.util.HexFormat#ofDelimiter(String)
+     * HexFormat.ofDelimiter(" ").format (byte[], char)}.
      */
+     @Deprecated
      public static String toHexString(byte[] bytes) {
-         char[] hexView = new char[bytes.length * 3 - 1];
-         for (int i = 0; i < bytes.length - 1; i++) {
-             hexView[i * 3] = hexArray[(bytes[i] >> 4) & 0x0F];
-             hexView[i * 3 + 1] = hexArray[bytes[i] & 0x0F];
-             hexView[i * 3 + 2] = ' ';
-         }
-         hexView[hexView.length - 2] = hexArray[(bytes[bytes.length - 1] >> 4) & 0x0F];
-         hexView[hexView.length - 1] = hexArray[bytes[bytes.length - 1] & 0x0F];
-         return new String(hexView);
+         return HexFormat.ofDelimiter(" ").withUpperCase().formatHex(bytes);
      }
 
      /**
@@ -489,13 +483,7 @@ public static String toHexString(byte[] bytes) {
       * @return byte array
       */
      public static byte[] toByteArray(String hex) {
-         int length = hex.length();
-         byte[] bytes = new byte[length / 2];
-         for (int i = 0; i < length; i += 2) {
-             bytes[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4)
-                     + Character.digit(hex.charAt(i + 1), 16));
-         }
-         return bytes;
+         return HexFormat.of().parseHex(hex);
      }
 
     /**

From 7e6677b532f18e8b15c302bf1c3cb08ff3198a44 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Fri, 8 Jan 2021 22:25:21 +0000
Subject: [PATCH 087/129] 8259446:
 runtime/jni/checked/TestCheckedReleaseArrayElements.java fails with stderr
 not empty

Reviewed-by: dcubed
---
 .../jni/checked/TestCheckedReleaseArrayElements.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
index be44a9ac4f874..1e5145feca51d 100644
--- a/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedReleaseArrayElements.java
@@ -44,10 +44,13 @@ public static void main(String[] args) throws Throwable {
         if (args == null || args.length == 0) {
             test();
         } else {
-            OutputAnalyzer output =
-                ProcessTools.executeTestJvm("-Xcheck:jni",
-                                            "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
-                                            "TestCheckedReleaseArrayElements");
+            // Uses executeProcess() instead of executeTestJvm() to avoid passing options
+            // that might generate output on stderr (which should be empty for this test).
+            ProcessBuilder pb =
+                ProcessTools.createJavaProcessBuilder("-Xcheck:jni",
+                                                      "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
+                                                      "TestCheckedReleaseArrayElements");
+            OutputAnalyzer output = ProcessTools.executeProcess(pb);
             output.shouldHaveExitValue(0);
             output.stderrShouldBeEmpty();
             output.stdoutShouldNotBeEmpty();

From a653928230c4153af04b1b32acd1af366eefa6ac Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Sat, 9 Jan 2021 00:03:32 +0000
Subject: [PATCH 088/129] 8259512: Update --release 16 symbol information for
 JDK 16 build 31

Reviewed-by: jjg
---
 make/data/symbols/jdk.incubator.vector-G.sym.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/make/data/symbols/jdk.incubator.vector-G.sym.txt b/make/data/symbols/jdk.incubator.vector-G.sym.txt
index a8cdeef1d701b..dec09658dc0d8 100644
--- a/make/data/symbols/jdk.incubator.vector-G.sym.txt
+++ b/make/data/symbols/jdk.incubator.vector-G.sym.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,8 @@ method name castShape descriptor (Ljdk/incubator/vector/VectorSpecies;I)Ljdk/inc
 method name convertShape descriptor (Ljdk/incubator/vector/VectorOperators$Conversion;Ljdk/incubator/vector/VectorSpecies;I)Ljdk/incubator/vector/Vector; flags 401 signature <F:Ljava/lang/Object;>(Ljdk/incubator/vector/VectorOperators$Conversion<TE;TF;>;Ljdk/incubator/vector/VectorSpecies<TF;>;I)Ljdk/incubator/vector/Vector<TF;>; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
 method name slice descriptor (ILjdk/incubator/vector/Vector;)Ljdk/incubator/vector/AbstractVector; flags 401 signature (ILjdk/incubator/vector/Vector<TE;>;)Ljdk/incubator/vector/AbstractVector<TE;>;
 method name slice descriptor (ILjdk/incubator/vector/Vector;)Ljdk/incubator/vector/Vector; flags 1041
+method name slice descriptor (I)Ljdk/incubator/vector/AbstractVector; flags 401 signature (I)Ljdk/incubator/vector/AbstractVector<TE;>;
+method name slice descriptor (I)Ljdk/incubator/vector/Vector; flags 1041
 
 class name jdk/incubator/vector/ByteVector
 header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Byte;>;
@@ -223,6 +225,7 @@ method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Lj
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Ljdk/incubator/vector/Vector;)Ljdk/incubator/vector/Vector; flags 1041
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;Ljdk/incubator/vector/VectorMask;)Ljdk/incubator/vector/Vector; flags 1041 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;)Ljdk/incubator/vector/Vector; flags 1041
+method name slice descriptor (I)Ljdk/incubator/vector/AbstractVector; flags 1041
 
 class name jdk/incubator/vector/DoubleVector
 header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Double;>;
@@ -394,6 +397,7 @@ method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Lj
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Ljdk/incubator/vector/Vector;)Ljdk/incubator/vector/Vector; flags 1041
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;Ljdk/incubator/vector/VectorMask;)Ljdk/incubator/vector/Vector; flags 1041 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;)Ljdk/incubator/vector/Vector; flags 1041
+method name slice descriptor (I)Ljdk/incubator/vector/AbstractVector; flags 1041
 
 class name jdk/incubator/vector/FloatVector
 header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Float;>;
@@ -565,6 +569,7 @@ method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Lj
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Ljdk/incubator/vector/Vector;)Ljdk/incubator/vector/Vector; flags 1041
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;Ljdk/incubator/vector/VectorMask;)Ljdk/incubator/vector/Vector; flags 1041 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;)Ljdk/incubator/vector/Vector; flags 1041
+method name slice descriptor (I)Ljdk/incubator/vector/AbstractVector; flags 1041
 
 class name jdk/incubator/vector/IntVector
 header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Integer;>;
@@ -740,6 +745,7 @@ method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Lj
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Ljdk/incubator/vector/Vector;)Ljdk/incubator/vector/Vector; flags 1041
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;Ljdk/incubator/vector/VectorMask;)Ljdk/incubator/vector/Vector; flags 1041 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;)Ljdk/incubator/vector/Vector; flags 1041
+method name slice descriptor (I)Ljdk/incubator/vector/AbstractVector; flags 1041
 
 class name jdk/incubator/vector/LongVector
 header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Long;>;
@@ -908,6 +914,7 @@ method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Lj
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Ljdk/incubator/vector/Vector;)Ljdk/incubator/vector/Vector; flags 1041
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;Ljdk/incubator/vector/VectorMask;)Ljdk/incubator/vector/Vector; flags 1041 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;)Ljdk/incubator/vector/Vector; flags 1041
+method name slice descriptor (I)Ljdk/incubator/vector/AbstractVector; flags 1041
 
 class name jdk/incubator/vector/ShortVector
 header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Short;>;
@@ -1082,6 +1089,7 @@ method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Lj
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Binary;Ljdk/incubator/vector/Vector;)Ljdk/incubator/vector/Vector; flags 1041
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;Ljdk/incubator/vector/VectorMask;)Ljdk/incubator/vector/Vector; flags 1041 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
 method name lanewise descriptor (Ljdk/incubator/vector/VectorOperators$Unary;)Ljdk/incubator/vector/Vector; flags 1041
+method name slice descriptor (I)Ljdk/incubator/vector/AbstractVector; flags 1041
 
 class name jdk/incubator/vector/Vector
 header extends jdk/internal/vm/vector/VectorSupport$Vector flags 421 signature <E:Ljava/lang/Object;>Ljdk/internal/vm/vector/VectorSupport$Vector<TE;>;

From 6472104e18d697eb243f26a17fdbc642fb879867 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Sat, 9 Jan 2021 07:22:20 +0000
Subject: [PATCH 089/129] 6278172: TextComponent.getSelectedText() throws
 StringIndexOutOfBoundsException

Reviewed-by: aivanov
---
 .../share/classes/java/awt/TextComponent.java |  21 ++--
 .../awt/TextComponent/SetTextSelection.java   | 107 ++++++++++++++++++
 2 files changed, 116 insertions(+), 12 deletions(-)
 create mode 100644 test/jdk/java/awt/TextComponent/SetTextSelection.java

diff --git a/src/java.desktop/share/classes/java/awt/TextComponent.java b/src/java.desktop/share/classes/java/awt/TextComponent.java
index ff4001472eff3..e7f2c8ebfc5da 100644
--- a/src/java.desktop/share/classes/java/awt/TextComponent.java
+++ b/src/java.desktop/share/classes/java/awt/TextComponent.java
@@ -240,21 +240,18 @@ public void removeNotify() {
      * @see         java.awt.TextComponent#getText
      */
     public synchronized void setText(String t) {
-        if (t == null) {
-            t = "";
-        }
-        TextComponentPeer peer = (TextComponentPeer)this.peer;
-        if (peer != null) {
-            text = peer.getText();
+        text = (t != null) ? t : "";
+        int selectionStart = getSelectionStart();
+        int selectionEnd = getSelectionEnd();
+        TextComponentPeer peer = (TextComponentPeer) this.peer;
+        if (peer != null && !text.equals(peer.getText())) {
             // Please note that we do not want to post an event
             // if TextArea.setText() or TextField.setText() replaces text
             // by same text, that is, if component's text remains unchanged.
-            if (!t.equals(text)) {
-                text = t;
-                peer.setText(text);
-            }
-        } else {
-            text = t;
+            peer.setText(text);
+        }
+        if (selectionStart != selectionEnd) {
+            select(selectionStart, selectionEnd);
         }
     }
 
diff --git a/test/jdk/java/awt/TextComponent/SetTextSelection.java b/test/jdk/java/awt/TextComponent/SetTextSelection.java
new file mode 100644
index 0000000000000..fe8decf40dc27
--- /dev/null
+++ b/test/jdk/java/awt/TextComponent/SetTextSelection.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Frame;
+import java.awt.TextArea;
+import java.awt.TextComponent;
+import java.awt.TextField;
+
+/**
+ * @test
+ * @key headful
+ * @bug 6278172
+ * @summary Tests that TextComponent#setText() preserves the selection
+ */
+public final class SetTextSelection {
+
+    private static final String LONG_TEXT = "text field";
+    private static final String SHORT_TEXT = "text";
+
+    public static void main(String[] args) {
+        testNoFrame(true);
+        testNoFrame(false);
+        for (int i = 0; i < 5; i++) {
+            testFrame(true, i);
+            testFrame(false, i);
+        }
+        testDisposedFrame(true);
+        testDisposedFrame(false);
+    }
+
+    private static void testNoFrame(boolean field) {
+        TextComponent tf = field ? new TextField(LONG_TEXT) :
+                                   new TextArea(LONG_TEXT);
+        tf.selectAll();
+        tf.setText(SHORT_TEXT);
+        test(tf);
+    }
+
+    private static void testDisposedFrame(boolean field) {
+        Frame frame = new Frame();
+        try {
+            TextComponent tf = field ? new TextField(LONG_TEXT) :
+                                       new TextArea(LONG_TEXT);
+            frame.add(tf);
+            frame.pack();
+            tf.selectAll();
+            frame.dispose();
+            tf.setText(SHORT_TEXT);
+            test(tf);
+        } finally {
+            frame.dispose();
+        }
+    }
+
+    private static void testFrame(boolean field, int step) {
+        Frame frame = new Frame();
+        try {
+            TextComponent tf = field ? new TextField(LONG_TEXT) :
+                                       new TextArea(LONG_TEXT);
+            if (step == 1) {
+                frame.pack();
+            }
+            frame.add(tf);
+            if (step == 2) {
+                frame.pack();
+            }
+            tf.selectAll();
+            if (step == 3) {
+                frame.pack();
+            }
+            tf.setText(SHORT_TEXT);
+            if (step == 4) {
+                frame.pack();
+            }
+            test(tf);
+        } finally {
+            frame.dispose();
+        }
+    }
+
+    private static void test(TextComponent tf) {
+        String str = tf.getSelectedText();
+        if (!str.equals(SHORT_TEXT)) {
+            throw new RuntimeException(str);
+        }
+    }
+}

From 5cfa8c94d6765b93f910fc01cd1ac2a56b16d78a Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Sat, 9 Jan 2021 20:57:52 +0000
Subject: [PATCH 090/129] 8246585: ForkJoin updates 8229253:
 forkjoin/FJExceptionTableLeak.java fails "AssertionError: failed to satisfy
 condition"

Reviewed-by: dl
---
 .../util/concurrent/CountedCompleter.java     |   48 +-
 .../java/util/concurrent/ForkJoinPool.java    | 3042 +++++++++--------
 .../java/util/concurrent/ForkJoinTask.java    |  965 +++---
 .../util/concurrent/ForkJoinWorkerThread.java |  100 +-
 .../concurrent/forkjoin/AsyncShutdownNow.java |  177 +
 .../forkjoin/AsyncShutdownNowInvokeAny.java   |  100 +
 .../AsyncShutdownNowInvokeAnyRace.java        |  199 ++
 .../forkjoin/FJExceptionTableLeak.java        |  204 --
 .../util/concurrent/tck/ForkJoinTaskTest.java |   16 +
 9 files changed, 2674 insertions(+), 2177 deletions(-)
 create mode 100644 test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNow.java
 create mode 100644 test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAny.java
 create mode 100644 test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAnyRace.java
 delete mode 100644 test/jdk/java/util/concurrent/forkjoin/FJExceptionTableLeak.java

diff --git a/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java b/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
index a91d12dfea08e..549e1c71a2934 100644
--- a/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
+++ b/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
@@ -357,7 +357,7 @@
  * within this method to ensure thread safety of accesses to fields of
  * this task or other completed tasks.
  *
- * <p><b>Completion Traversals</b>. If using {@code onCompletion} to
+ * <p><b>Completion Traversals.</b> If using {@code onCompletion} to
  * process completions is inapplicable or inconvenient, you can use
  * methods {@link #firstComplete} and {@link #nextComplete} to create
  * custom traversals.  For example, to define a MapReducer that only
@@ -553,6 +553,11 @@ public final boolean compareAndSetPendingCount(int expected, int count) {
         return PENDING.compareAndSet(this, expected, count);
     }
 
+    // internal-only weak version
+    final boolean weakCompareAndSetPendingCount(int expected, int count) {
+        return PENDING.weakCompareAndSet(this, expected, count);
+    }
+
     /**
      * If the pending count is nonzero, (atomically) decrements it.
      *
@@ -562,7 +567,7 @@ public final boolean compareAndSetPendingCount(int expected, int count) {
     public final int decrementPendingCountUnlessZero() {
         int c;
         do {} while ((c = pending) != 0 &&
-                     !PENDING.weakCompareAndSet(this, c, c - 1));
+                     !weakCompareAndSetPendingCount(c, c - 1));
         return c;
     }
 
@@ -595,7 +600,7 @@ public final void tryComplete() {
                     return;
                 }
             }
-            else if (PENDING.weakCompareAndSet(a, c, c - 1))
+            else if (a.weakCompareAndSetPendingCount(c, c - 1))
                 return;
         }
     }
@@ -618,7 +623,7 @@ public final void propagateCompletion() {
                     return;
                 }
             }
-            else if (PENDING.weakCompareAndSet(a, c, c - 1))
+            else if (a.weakCompareAndSetPendingCount(c, c - 1))
                 return;
         }
     }
@@ -663,7 +668,7 @@ public final CountedCompleter<?> firstComplete() {
         for (int c;;) {
             if ((c = pending) == 0)
                 return this;
-            else if (PENDING.weakCompareAndSet(this, c, c - 1))
+            else if (weakCompareAndSetPendingCount(c, c - 1))
                 return null;
         }
     }
@@ -718,30 +723,33 @@ public final void quietlyCompleteRoot() {
      *                 processed.
      */
     public final void helpComplete(int maxTasks) {
-        Thread t; ForkJoinWorkerThread wt;
-        if (maxTasks > 0 && status >= 0) {
-            if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
-                (wt = (ForkJoinWorkerThread)t).pool.
-                    helpComplete(wt.workQueue, this, maxTasks);
-            else
-                ForkJoinPool.common.externalHelpComplete(this, maxTasks);
-        }
+        ForkJoinPool.WorkQueue q; Thread t; boolean owned;
+        if (owned = (t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
+            q = ((ForkJoinWorkerThread)t).workQueue;
+        else
+            q = ForkJoinPool.commonQueue();
+        if (q != null && maxTasks > 0)
+            q.helpComplete(this, owned, maxTasks);
     }
 
+    // ForkJoinTask overrides
+
     /**
      * Supports ForkJoinTask exception propagation.
      */
-    void internalPropagateException(Throwable ex) {
-        CountedCompleter<?> a = this, s = a;
-        while (a.onExceptionalCompletion(ex, s) &&
-               (a = (s = a).completer) != null && a.status >= 0 &&
-               isExceptionalStatus(a.recordExceptionalCompletion(ex)))
-            ;
+    @Override
+    final int trySetException(Throwable ex) {
+        CountedCompleter<?> a = this, p = a;
+        do {} while (isExceptionalStatus(a.trySetThrown(ex)) &&
+                     a.onExceptionalCompletion(ex, p) &&
+                     (a = (p = a).completer) != null && a.status >= 0);
+        return status;
     }
 
     /**
      * Implements execution conventions for CountedCompleters.
      */
+    @Override
     protected final boolean exec() {
         compute();
         return false;
@@ -756,6 +764,7 @@ protected final boolean exec() {
      *
      * @return the result of the computation
      */
+    @Override
     public T getRawResult() { return null; }
 
     /**
@@ -765,6 +774,7 @@ protected final boolean exec() {
      * overridden to update existing objects or fields, then it must
      * in general be defined to be thread-safe.
      */
+    @Override
     protected void setRawResult(T t) { }
 
     // VarHandle mechanics
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
index bd54868e6fdfa..ef80dfcd6b672 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -49,7 +49,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.Condition;
 
 /**
  * An {@link ExecutorService} for running {@link ForkJoinTask}s.
@@ -163,7 +166,7 @@
  * using a factory that may return {@code null}. However doing so may
  * cause unjoined tasks to never be executed.
  *
- * <p><b>Implementation notes</b>: This implementation restricts the
+ * <p><b>Implementation notes:</b> This implementation restricts the
  * maximum number of running threads to 32767. Attempts to create
  * pools with greater than the maximum number result in
  * {@code IllegalArgumentException}.
@@ -230,75 +233,92 @@ public class ForkJoinPool extends AbstractExecutorService {
      * in a circular buffer:
      *    q.array[q.top++ % length] = task;
      *
-     * (The actual code needs to null-check and size-check the array,
+     * The actual code needs to null-check and size-check the array,
      * uses masking, not mod, for indexing a power-of-two-sized array,
-     * adds a release fence for publication, and possibly signals
-     * waiting workers to start scanning -- see below.)  Both a
-     * successful pop and poll mainly entail a CAS of a slot from
-     * non-null to null.
-     *
-     * The pop operation (always performed by owner) is:
-     *   if ((the task at top slot is not null) and
-     *        (CAS slot to null))
-     *           decrement top and return task;
-     *
-     * And the poll operation (usually by a stealer) is
-     *    if ((the task at base slot is not null) and
-     *        (CAS slot to null))
-     *           increment base and return task;
-     *
-     * There are several variants of each of these. Most uses occur
-     * within operations that also interleave contention or emptiness
-     * tracking or inspection of elements before extracting them, so
-     * must interleave these with the above code. When performed by
-     * owner, getAndSet is used instead of CAS (see for example method
-     * nextLocalTask) which is usually more efficient, and possible
-     * because the top index cannot independently change during the
-     * operation.
+     * enforces memory ordering, supports resizing, and possibly
+     * signals waiting workers to start scanning -- see below.
+     *
+     * The pop operation (always performed by owner) is of the form:
+     *   if ((task = getAndSet(q.array, (q.top-1) % length, null)) != null)
+     *        decrement top and return task;
+     * If this fails, the queue is empty.
+     *
+     * The poll operation by another stealer thread is, basically:
+     *   if (CAS nonnull task at q.array[q.base % length] to null)
+     *       increment base and return task;
+     *
+     * This may fail due to contention, and may be retried.
+     * Implementations must ensure a consistent snapshot of the base
+     * index and the task (by looping or trying elsewhere) before
+     * trying CAS.  There isn't actually a method of this form,
+     * because failure due to inconsistency or contention is handled
+     * in different ways in different contexts, normally by first
+     * trying other queues. (For the most straightforward example, see
+     * method pollScan.) There are further variants for cases
+     * requiring inspection of elements before extracting them, so
+     * must interleave these with variants of this code.  Also, a more
+     * efficient version (nextLocalTask) is used for polls by owners.
+     * It avoids some overhead because the queue cannot be growing
+     * during call.
      *
      * Memory ordering.  See "Correct and Efficient Work-Stealing for
      * Weak Memory Models" by Le, Pop, Cohen, and Nardelli, PPoPP 2013
      * (http://www.di.ens.fr/~zappa/readings/ppopp13.pdf) for an
      * analysis of memory ordering requirements in work-stealing
-     * algorithms similar to (but different than) the one used here.
-     * Extracting tasks in array slots via (fully fenced) CAS provides
-     * primary synchronization. The base and top indices imprecisely
-     * guide where to extract from. We do not usually require strict
-     * orderings of array and index updates. Many index accesses use
-     * plain mode, with ordering constrained by surrounding context
-     * (usually with respect to element CASes or the two WorkQueue
-     * volatile fields source and phase). When not otherwise already
-     * constrained, reads of "base" by queue owners use acquire-mode,
-     * and some externally callable methods preface accesses with
-     * acquire fences.  Additionally, to ensure that index update
-     * writes are not coalesced or postponed in loops etc, "opaque"
-     * mode is used in a few cases where timely writes are not
-     * otherwise ensured. The "locked" versions of push- and pop-
-     * based methods for shared queues differ from owned versions
-     * because locking already forces some of the ordering.
+     * algorithms similar to the one used here.  Inserting and
+     * extracting tasks in array slots via volatile or atomic accesses
+     * or explicit fences provides primary synchronization.
+     *
+     * Operations on deque elements require reads and writes of both
+     * indices and slots. When possible, we allow these to occur in
+     * any order.  Because the base and top indices (along with other
+     * pool or array fields accessed in many methods) only imprecisely
+     * guide where to extract from, we let accesses other than the
+     * element getAndSet/CAS/setVolatile appear in any order, using
+     * plain mode. But we must still preface some methods (mainly
+     * those that may be accessed externally) with an acquireFence to
+     * avoid unbounded staleness. This is equivalent to acting as if
+     * callers use an acquiring read of the reference to the pool or
+     * queue when invoking the method, even when they do not. We use
+     * explicit acquiring reads (getSlot) rather than plain array
+     * access when acquire mode is required but not otherwise ensured
+     * by context. To reduce stalls by other stealers, we encourage
+     * timely writes to the base index by immediately following
+     * updates with a write of a volatile field that must be updated
+     * anyway, or an Opaque-mode write if there is no such
+     * opportunity.
      *
      * Because indices and slot contents cannot always be consistent,
-     * a check that base == top indicates (momentary) emptiness, but
-     * otherwise may err on the side of possibly making the queue
-     * appear nonempty when a push, pop, or poll have not fully
-     * committed, or making it appear empty when an update of top has
-     * not yet been visibly written.  (Method isEmpty() checks the
-     * case of a partially completed removal of the last element.)
-     * Because of this, the poll operation, considered individually,
-     * is not wait-free. One thief cannot successfully continue until
-     * another in-progress one (or, if previously empty, a push)
-     * visibly completes.  This can stall threads when required to
-     * consume from a given queue (see method poll()).  However, in
-     * the aggregate, we ensure at least probabilistic
-     * non-blockingness.  If an attempted steal fails, a scanning
-     * thief chooses a different random victim target to try next. So,
-     * in order for one thief to progress, it suffices for any
-     * in-progress poll or new push on any empty queue to complete.
+     * the emptiness check base == top is only quiescently accurate
+     * (and so used where this suffices). Otherwise, it may err on the
+     * side of possibly making the queue appear nonempty when a push,
+     * pop, or poll have not fully committed, or making it appear
+     * empty when an update of top or base has not yet been seen.
+     * Similarly, the check in push for the queue array being full may
+     * trigger when not completely full, causing a resize earlier than
+     * required.
+     *
+     * Mainly because of these potential inconsistencies among slots
+     * vs indices, the poll operation, considered individually, is not
+     * wait-free. One thief cannot successfully continue until another
+     * in-progress one (or, if previously empty, a push) visibly
+     * completes.  This can stall threads when required to consume
+     * from a given queue (which may spin).  However, in the
+     * aggregate, we ensure probabilistic non-blockingness at least
+     * until checking quiescence (which is intrinsically blocking):
+     * If an attempted steal fails, a scanning thief chooses a
+     * different victim target to try next. So, in order for one thief
+     * to progress, it suffices for any in-progress poll or new push
+     * on any empty queue to complete. The worst cases occur when many
+     * threads are looking for tasks being produced by a stalled
+     * producer.
      *
      * This approach also enables support of a user mode in which
      * local task processing is in FIFO, not LIFO order, simply by
      * using poll rather than pop.  This can be useful in
-     * message-passing frameworks in which tasks are never joined.
+     * message-passing frameworks in which tasks are never joined,
+     * although with increased contention among task producers and
+     * consumers.
      *
      * WorkQueues are also used in a similar way for tasks submitted
      * to the pool. We cannot mix these tasks in the same queues used
@@ -308,13 +328,12 @@ public class ForkJoinPool extends AbstractExecutorService {
      * choosing existing queues, and may be randomly repositioned upon
      * contention with other submitters.  In essence, submitters act
      * like workers except that they are restricted to executing local
-     * tasks that they submitted.  Insertion of tasks in shared mode
-     * requires a lock but we use only a simple spinlock (using field
-     * phase), because submitters encountering a busy queue move to a
-     * different position to use or create other queues -- they block
-     * only when creating and registering new queues. Because it is
-     * used only as a spinlock, unlocking requires only a "releasing"
-     * store (using setRelease) unless otherwise signalling.
+     * tasks that they submitted (or when known, subtasks thereof).
+     * Insertion of tasks in shared mode requires a lock. We use only
+     * a simple spinlock (using field "source"), because submitters
+     * encountering a busy queue move to a different position to use
+     * or create other queues. They block only when registering new
+     * queues.
      *
      * Management
      * ==========
@@ -322,16 +341,17 @@ public class ForkJoinPool extends AbstractExecutorService {
      * The main throughput advantages of work-stealing stem from
      * decentralized control -- workers mostly take tasks from
      * themselves or each other, at rates that can exceed a billion
-     * per second.  The pool itself creates, activates (enables
-     * scanning for and running tasks), deactivates, blocks, and
-     * terminates threads, all with minimal central information.
-     * There are only a few properties that we can globally track or
-     * maintain, so we pack them into a small number of variables,
-     * often maintaining atomicity without blocking or locking.
-     * Nearly all essentially atomic control state is held in a few
-     * volatile variables that are by far most often read (not
-     * written) as status and consistency checks. We pack as much
-     * information into them as we can.
+     * per second.  Most non-atomic control is performed by some form
+     * of scanning across or within queues.  The pool itself creates,
+     * activates (enables scanning for and running tasks),
+     * deactivates, blocks, and terminates threads, all with minimal
+     * central information.  There are only a few properties that we
+     * can globally track or maintain, so we pack them into a small
+     * number of variables, often maintaining atomicity without
+     * blocking or locking.  Nearly all essentially atomic control
+     * state is held in a few volatile variables that are by far most
+     * often read (not written) as status and consistency checks. We
+     * pack as much information into them as we can.
      *
      * Field "ctl" contains 64 bits holding information needed to
      * atomically decide to add, enqueue (on an event queue), and
@@ -343,30 +363,28 @@ public class ForkJoinPool extends AbstractExecutorService {
      *
      * Field "mode" holds configuration parameters as well as lifetime
      * status, atomically and monotonically setting SHUTDOWN, STOP,
-     * and finally TERMINATED bits.
-     *
-     * Field "workQueues" holds references to WorkQueues.  It is
-     * updated (only during worker creation and termination) under
-     * lock (using field workerNamePrefix as lock), but is otherwise
-     * concurrently readable, and accessed directly. We also ensure
-     * that uses of the array reference itself never become too stale
-     * in case of resizing, by arranging that (re-)reads are separated
-     * by at least one acquiring read access.  To simplify index-based
-     * operations, the array size is always a power of two, and all
-     * readers must tolerate null slots. Worker queues are at odd
-     * indices. Shared (submission) queues are at even indices, up to
-     * a maximum of 64 slots, to limit growth even if the array needs
-     * to expand to add more workers. Grouping them together in this
-     * way simplifies and speeds up task scanning.
+     * and finally TERMINATED bits. It is updated only via bitwise
+     * atomics (getAndBitwiseOr).
+     *
+     * Array "queues" holds references to WorkQueues.  It is updated
+     * (only during worker creation and termination) under the
+     * registrationLock, but is otherwise concurrently readable, and
+     * accessed directly (although always prefaced by acquireFences or
+     * other acquiring reads). To simplify index-based operations, the
+     * array size is always a power of two, and all readers must
+     * tolerate null slots.  Worker queues are at odd indices. Worker
+     * ids masked with SMASK match their index. Shared (submission)
+     * queues are at even indices. Grouping them together in this way
+     * simplifies and speeds up task scanning.
      *
      * All worker thread creation is on-demand, triggered by task
      * submissions, replacement of terminated workers, and/or
      * compensation for blocked workers. However, all other support
      * code is set up to work with other policies.  To ensure that we
-     * do not hold on to worker references that would prevent GC, all
-     * accesses to workQueues are via indices into the workQueues
-     * array (which is one source of some of the messy code
-     * constructions here). In essence, the workQueues array serves as
+     * do not hold on to worker or task references that would prevent
+     * GC, all accesses to workQueues are via indices into the
+     * queues array (which is one source of some of the messy code
+     * constructions here). In essence, the queues array serves as
      * a weak reference mechanism. Thus for example the stack top
      * subfield of ctl stores indices, not references.
      *
@@ -375,31 +393,26 @@ public class ForkJoinPool extends AbstractExecutorService {
      * none can be found immediately, and we cannot start/resume
      * workers unless there appear to be tasks available.  On the
      * other hand, we must quickly prod them into action when new
-     * tasks are submitted or generated. In many usages, ramp-up time
+     * tasks are submitted or generated. These latencies are mainly a
+     * function of JVM park/unpark (and underlying OS) performance,
+     * which can be slow and variable.  In many usages, ramp-up time
      * is the main limiting factor in overall performance, which is
      * compounded at program start-up by JIT compilation and
-     * allocation. So we streamline this as much as possible.
+     * allocation. On the other hand, throughput degrades when too
+     * many threads poll for too few tasks.
      *
-     * The "ctl" field atomically maintains total worker and
-     * "released" worker counts, plus the head of the available worker
-     * queue (actually stack, represented by the lower 32bit subfield
-     * of ctl).  Released workers are those known to be scanning for
+     * The "ctl" field atomically maintains total and "released"
+     * worker counts, plus the head of the available worker queue
+     * (actually stack, represented by the lower 32bit subfield of
+     * ctl).  Released workers are those known to be scanning for
      * and/or running tasks. Unreleased ("available") workers are
      * recorded in the ctl stack. These workers are made available for
-     * signalling by enqueuing in ctl (see method runWorker).  The
+     * signalling by enqueuing in ctl (see method awaitWork).  The
      * "queue" is a form of Treiber stack. This is ideal for
      * activating threads in most-recently used order, and improves
      * performance and locality, outweighing the disadvantages of
      * being prone to contention and inability to release a worker
-     * unless it is topmost on stack.  To avoid missed signal problems
-     * inherent in any wait/signal design, available workers rescan
-     * for (and if found run) tasks after enqueuing.  Normally their
-     * release status will be updated while doing so, but the released
-     * worker ctl count may underestimate the number of active
-     * threads. (However, it is still possible to determine quiescence
-     * via a validation traversal -- see isQuiescent).  After an
-     * unsuccessful rescan, available workers are blocked until
-     * signalled (see signalWork).  The top stack state holds the
+     * unless it is topmost on stack. The top stack state holds the
      * value of the "phase" field of the worker: its index and status,
      * plus a version counter that, in addition to the count subfields
      * (also serving as version stamps) provide protection against
@@ -407,109 +420,115 @@ public class ForkJoinPool extends AbstractExecutorService {
      *
      * Creating workers. To create a worker, we pre-increment counts
      * (serving as a reservation), and attempt to construct a
-     * ForkJoinWorkerThread via its factory. Upon construction, the
-     * new thread invokes registerWorker, where it constructs a
-     * WorkQueue and is assigned an index in the workQueues array
-     * (expanding the array if necessary). The thread is then started.
-     * Upon any exception across these steps, or null return from
-     * factory, deregisterWorker adjusts counts and records
-     * accordingly.  If a null return, the pool continues running with
-     * fewer than the target number workers. If exceptional, the
-     * exception is propagated, generally to some external caller.
-     * Worker index assignment avoids the bias in scanning that would
-     * occur if entries were sequentially packed starting at the front
-     * of the workQueues array. We treat the array as a simple
-     * power-of-two hash table, expanding as needed. The seedIndex
-     * increment ensures no collisions until a resize is needed or a
-     * worker is deregistered and replaced, and thereafter keeps
-     * probability of collision low. We cannot use
-     * ThreadLocalRandom.getProbe() for similar purposes here because
-     * the thread has not started yet, but do so for creating
-     * submission queues for existing external threads (see
-     * externalPush).
+     * ForkJoinWorkerThread via its factory. On starting, the new
+     * thread first invokes registerWorker, where it constructs a
+     * WorkQueue and is assigned an index in the queues array
+     * (expanding the array if necessary).  Upon any exception across
+     * these steps, or null return from factory, deregisterWorker
+     * adjusts counts and records accordingly.  If a null return, the
+     * pool continues running with fewer than the target number
+     * workers. If exceptional, the exception is propagated, generally
+     * to some external caller.
      *
      * WorkQueue field "phase" is used by both workers and the pool to
      * manage and track whether a worker is UNSIGNALLED (possibly
      * blocked waiting for a signal).  When a worker is enqueued its
-     * phase field is set. Note that phase field updates lag queue CAS
-     * releases so usage requires care -- seeing a negative phase does
-     * not guarantee that the worker is available. When queued, the
-     * lower 16 bits of scanState must hold its pool index. So we
-     * place the index there upon initialization and otherwise keep it
-     * there or restore it when necessary.
+     * phase field is set negative. Note that phase field updates lag
+     * queue CAS releases; seeing a negative phase does not guarantee
+     * that the worker is available. When queued, the lower 16 bits of
+     * its phase must hold its pool index. So we place the index there
+     * upon initialization and never modify these bits.
      *
      * The ctl field also serves as the basis for memory
      * synchronization surrounding activation. This uses a more
      * efficient version of a Dekker-like rule that task producers and
      * consumers sync with each other by both writing/CASing ctl (even
-     * if to its current value).  This would be extremely costly. So
-     * we relax it in several ways: (1) Producers only signal when
-     * their queue is possibly empty at some point during a push
-     * operation. (2) Other workers propagate this signal
-     * when they find tasks in a queue with size greater than one. (3)
-     * Workers only enqueue after scanning (see below) and not finding
-     * any tasks.  (4) Rather than CASing ctl to its current value in
-     * the common case where no action is required, we reduce write
-     * contention by equivalently prefacing signalWork when called by
-     * an external task producer using a memory access with
-     * full-volatile semantics or a "fullFence".
-     *
-     * Almost always, too many signals are issued, in part because a
-     * task producer cannot tell if some existing worker is in the
-     * midst of finishing one task (or already scanning) and ready to
-     * take another without being signalled. So the producer might
-     * instead activate a different worker that does not find any
-     * work, and then inactivates. This scarcely matters in
-     * steady-state computations involving all workers, but can create
-     * contention and bookkeeping bottlenecks during ramp-up,
+     * if to its current value).  However, rather than CASing ctl to
+     * its current value in the common case where no action is
+     * required, we reduce write contention by ensuring that
+     * signalWork invocations are prefaced with a full-volatile memory
+     * access (which is usually needed anyway).
+     *
+     * Signalling. Signals (in signalWork) cause new or reactivated
+     * workers to scan for tasks.  Method signalWork and its callers
+     * try to approximate the unattainable goal of having the right
+     * number of workers activated for the tasks at hand, but must err
+     * on the side of too many workers vs too few to avoid stalls.  If
+     * computations are purely tree structured, it suffices for every
+     * worker to activate another when it pushes a task into an empty
+     * queue, resulting in O(log(#threads)) steps to full activation.
+     * If instead, tasks come in serially from only a single producer,
+     * each worker taking its first (since the last quiescence) task
+     * from a queue should signal another if there are more tasks in
+     * that queue. This is equivalent to, but generally faster than,
+     * arranging the stealer take two tasks, re-pushing one on its own
+     * queue, and signalling (because its queue is empty), also
+     * resulting in logarithmic full activation time. Because we don't
+     * know about usage patterns (or most commonly, mixtures), we use
+     * both approaches.  We approximate the second rule by arranging
+     * that workers in scan() do not repeat signals when repeatedly
+     * taking tasks from any given queue, by remembering the previous
+     * one. There are narrow windows in which both rules may apply,
+     * leading to duplicate or unnecessary signals. Despite such
+     * limitations, these rules usually avoid slowdowns that otherwise
+     * occur when too many workers contend to take too few tasks, or
+     * when producers waste most of their time resignalling.  However,
+     * contention and overhead effects may still occur during ramp-up,
      * ramp-down, and small computations involving only a few workers.
      *
-     * Scanning. Method scan (from runWorker) performs top-level
-     * scanning for tasks. (Similar scans appear in helpQuiesce and
-     * pollScan.)  Each scan traverses and tries to poll from each
-     * queue starting at a random index. Scans are not performed in
-     * ideal random permutation order, to reduce cacheline
-     * contention. The pseudorandom generator need not have
-     * high-quality statistical properties in the long term, but just
-     * within computations; We use Marsaglia XorShifts (often via
-     * ThreadLocalRandom.nextSecondarySeed), which are cheap and
-     * suffice. Scanning also includes contention reduction: When
-     * scanning workers fail to extract an apparently existing task,
-     * they soon restart at a different pseudorandom index.  This form
-     * of backoff improves throughput when many threads are trying to
-     * take tasks from few queues, which can be common in some usages.
-     * Scans do not otherwise explicitly take into account core
-     * affinities, loads, cache localities, etc, However, they do
+     * Scanning. Method scan performs top-level scanning for (and
+     * execution of) tasks.  Scans by different workers and/or at
+     * different times are unlikely to poll queues in the same
+     * order. Each scan traverses and tries to poll from each queue in
+     * a pseudorandom permutation order by starting at a random index,
+     * and using a constant cyclically exhaustive stride; restarting
+     * upon contention.  (Non-top-level scans; for example in
+     * helpJoin, use simpler linear probes because they do not
+     * systematically contend with top-level scans.)  The pseudorandom
+     * generator need not have high-quality statistical properties in
+     * the long term. We use Marsaglia XorShifts, seeded with the Weyl
+     * sequence from ThreadLocalRandom probes, which are cheap and
+     * suffice. Scans do not otherwise explicitly take into account
+     * core affinities, loads, cache localities, etc, However, they do
      * exploit temporal locality (which usually approximates these) by
      * preferring to re-poll from the same queue after a successful
-     * poll before trying others (see method topLevelExec). However
-     * this preference is bounded (see TOP_BOUND_SHIFT) as a safeguard
-     * against infinitely unfair looping under unbounded user task
-     * recursion, and also to reduce long-term contention when many
-     * threads poll few queues holding many small tasks. The bound is
-     * high enough to avoid much impact on locality and scheduling
-     * overhead.
+     * poll before trying others (see method topLevelExec).  This
+     * reduces fairness, which is partially counteracted by using a
+     * one-shot form of poll (tryPoll) that may lose to other workers.
+     *
+     * Deactivation. Method scan returns a sentinel when no tasks are
+     * found, leading to deactivation (see awaitWork). The count
+     * fields in ctl allow accurate discovery of quiescent states
+     * (i.e., when all workers are idle) after deactivation. However,
+     * this may also race with new (external) submissions, so a
+     * recheck is also needed to determine quiescence. Upon apparently
+     * triggering quiescence, awaitWork re-scans and self-signals if
+     * it may have missed a signal. In other cases, a missed signal
+     * may transiently lower parallelism because deactivation does not
+     * necessarily mean that there is no more work, only that that
+     * there were no tasks not taken by other workers.  But more
+     * signals are generated (see above) to eventually reactivate if
+     * needed.
      *
      * Trimming workers. To release resources after periods of lack of
      * use, a worker starting to wait when the pool is quiescent will
-     * time out and terminate (see method runWorker) if the pool has
-     * remained quiescent for period given by field keepAlive.
+     * time out and terminate if the pool has remained quiescent for
+     * period given by field keepAlive.
      *
      * Shutdown and Termination. A call to shutdownNow invokes
-     * tryTerminate to atomically set a runState bit. The calling
-     * thread, as well as every other worker thereafter terminating,
-     * helps terminate others by cancelling their unprocessed tasks,
-     * and waking them up, doing so repeatedly until stable. Calls to
-     * non-abrupt shutdown() preface this by checking whether
-     * termination should commence by sweeping through queues (until
-     * stable) to ensure lack of in-flight submissions and workers
-     * about to process them before triggering the "STOP" phase of
+     * tryTerminate to atomically set a mode bit. The calling thread,
+     * as well as every other worker thereafter terminating, helps
+     * terminate others by cancelling their unprocessed tasks, and
+     * waking them up. Calls to non-abrupt shutdown() preface this by
+     * checking isQuiescent before triggering the "STOP" phase of
      * termination.
      *
      * Joining Tasks
      * =============
      *
-     * Any of several actions may be taken when one worker is waiting
+     * Normally, the first option when joining a task that is not done
+     * is to try to unfork it from local queue and run it.  Otherwise,
+     * any of several actions may be taken when one worker is waiting
      * to join a task stolen (or always held) by another.  Because we
      * are multiplexing many tasks on to a pool of workers, we can't
      * always just let them block (as in Thread.join).  We also cannot
@@ -520,40 +539,62 @@ public class ForkJoinPool extends AbstractExecutorService {
      * Instead we combine two tactics:
      *
      *   Helping: Arranging for the joiner to execute some task that it
-     *      would be running if the steal had not occurred.
+     *      could be running if the steal had not occurred.
      *
      *   Compensating: Unless there are already enough live threads,
      *      method tryCompensate() may create or re-activate a spare
      *      thread to compensate for blocked joiners until they unblock.
      *
-     * A third form (implemented in tryRemoveAndExec) amounts to
-     * helping a hypothetical compensator: If we can readily tell that
-     * a possible action of a compensator is to steal and execute the
+     * A third form (implemented via tryRemove) amounts to helping a
+     * hypothetical compensator: If we can readily tell that a
+     * possible action of a compensator is to steal and execute the
      * task being joined, the joining thread can do so directly,
-     * without the need for a compensation thread.
+     * without the need for a compensation thread; although with a
+     * (rare) possibility of reduced parallelism because of a
+     * transient gap in the queue array.
+     *
+     * Other intermediate forms available for specific task types (for
+     * example helpAsyncBlocker) often avoid or postpone the need for
+     * blocking or compensation.
      *
      * The ManagedBlocker extension API can't use helping so relies
      * only on compensation in method awaitBlocker.
      *
-     * The algorithm in awaitJoin entails a form of "linear helping".
-     * Each worker records (in field source) the id of the queue from
-     * which it last stole a task.  The scan in method awaitJoin uses
-     * these markers to try to find a worker to help (i.e., steal back
-     * a task from and execute it) that could hasten completion of the
-     * actively joined task.  Thus, the joiner executes a task that
-     * would be on its own local deque if the to-be-joined task had
-     * not been stolen. This is a conservative variant of the approach
-     * described in Wagner & Calder "Leapfrogging: a portable
+     * The algorithm in helpJoin entails a form of "linear helping".
+     * Each worker records (in field "source") the id of the queue
+     * from which it last stole a task.  The scan in method helpJoin
+     * uses these markers to try to find a worker to help (i.e., steal
+     * back a task from and execute it) that could hasten completion
+     * of the actively joined task.  Thus, the joiner executes a task
+     * that would be on its own local deque if the to-be-joined task
+     * had not been stolen. This is a conservative variant of the
+     * approach described in Wagner & Calder "Leapfrogging: a portable
      * technique for implementing efficient futures" SIGPLAN Notices,
      * 1993 (http://portal.acm.org/citation.cfm?id=155354). It differs
      * mainly in that we only record queue ids, not full dependency
-     * links.  This requires a linear scan of the workQueues array to
+     * links.  This requires a linear scan of the queues array to
      * locate stealers, but isolates cost to when it is needed, rather
-     * than adding to per-task overhead. Searches can fail to locate
-     * stealers GC stalls and the like delay recording sources.
-     * Further, even when accurately identified, stealers might not
-     * ever produce a task that the joiner can in turn help with. So,
-     * compensation is tried upon failure to find tasks to run.
+     * than adding to per-task overhead. Also, searches are limited to
+     * direct and at most two levels of indirect stealers, after which
+     * there are rapidly diminishing returns on increased overhead.
+     * Searches can fail to locate stealers when stalls delay
+     * recording sources.  Further, even when accurately identified,
+     * stealers might not ever produce a task that the joiner can in
+     * turn help with. So, compensation is tried upon failure to find
+     * tasks to run.
+     *
+     * Joining CountedCompleters (see helpComplete) differs from (and
+     * is generally more efficient than) other cases because task
+     * eligibility is determined by checking completion chains rather
+     * than tracking stealers.
+     *
+     * Joining under timeouts (ForkJoinTask timed get) uses a
+     * constrained mixture of helping and compensating in part because
+     * pools (actually, only the common pool) may not have any
+     * available threads: If the pool is saturated (all available
+     * workers are busy), the caller tries to remove and otherwise
+     * help; else it blocks under compensation so that it may time out
+     * independently of any tasks.
      *
      * Compensation does not by default aim to keep exactly the target
      * parallelism number of unblocked threads running at any given
@@ -578,8 +619,8 @@ public class ForkJoinPool extends AbstractExecutorService {
      * footprint to the setup of about a dozen fields.
      *
      * When external threads submit to the common pool, they can
-     * perform subtask processing (see externalHelpComplete and
-     * related methods) upon joins.  This caller-helps policy makes it
+     * perform subtask processing (see helpComplete and related
+     * methods) upon joins.  This caller-helps policy makes it
      * sensible to set common pool parallelism level to one (or more)
      * less than the total number of available cores, or even zero for
      * pure caller-runs.  We do not need to record whether external
@@ -595,39 +636,61 @@ public class ForkJoinPool extends AbstractExecutorService {
      * InnocuousForkJoinWorkerThread when there is a SecurityManager
      * present. These workers have no permissions set, do not belong
      * to any user-defined ThreadGroup, and erase all ThreadLocals
-     * after executing any top-level task (see
-     * WorkQueue.afterTopLevelExec).  The associated mechanics (mainly
-     * in ForkJoinWorkerThread) may be JVM-dependent and must access
-     * particular Thread class fields to achieve this effect.
+     * after executing any top-level task.  The associated mechanics
+     * may be JVM-dependent and must access particular Thread class
+     * fields to achieve this effect.
+     *
+     * Interrupt handling
+     * ==================
+     *
+     * The framework is designed to manage task cancellation
+     * (ForkJoinTask.cancel) independently from the interrupt status
+     * of threads running tasks. (See the public ForkJoinTask
+     * documentation for rationale.)  Interrupts are issued only in
+     * tryTerminate, when workers should be terminating and tasks
+     * should be cancelled anyway. Interrupts are cleared only when
+     * necessary to ensure that calls to LockSupport.park do not loop
+     * indefinitely (park returns immediately if the current thread is
+     * interrupted). If so, interruption is reinstated after blocking
+     * if status could be visible during the scope of any task.  For
+     * cases in which task bodies are specified or desired to
+     * interrupt upon cancellation, ForkJoinTask.cancel can be
+     * overridden to do so (as is done for invoke{Any,All}).
      *
      * Memory placement
      * ================
      *
      * Performance can be very sensitive to placement of instances of
      * ForkJoinPool and WorkQueues and their queue arrays. To reduce
-     * false-sharing impact, the @Contended annotation isolates
-     * adjacent WorkQueue instances, as well as the ForkJoinPool.ctl
-     * field. WorkQueue arrays are allocated (by their threads) with
-     * larger initial sizes than most ever need, mostly to reduce
-     * false sharing with current garbage collectors that use cardmark
-     * tables.
+     * false-sharing impact, the @Contended annotation isolates the
+     * ForkJoinPool.ctl field as well as the most heavily written
+     * WorkQueue fields. These mainly reduce cache traffic by scanners.
+     * WorkQueue arrays are presized large enough to avoid resizing
+     * (which transiently reduces throughput) in most tree-like
+     * computations, although not in some streaming usages. Initial
+     * sizes are not large enough to avoid secondary contention
+     * effects (especially for GC cardmarks) when queues are placed
+     * near each other in memory. This is common, but has different
+     * impact in different collectors and remains incompletely
+     * addressed.
      *
      * Style notes
      * ===========
      *
-     * Memory ordering relies mainly on VarHandles.  This can be
+     * Memory ordering relies mainly on atomic operations (CAS,
+     * getAndSet, getAndAdd) along with explicit fences.  This can be
      * awkward and ugly, but also reflects the need to control
      * outcomes across the unusual cases that arise in very racy code
      * with very few invariants. All fields are read into locals
-     * before use, and null-checked if they are references.  Array
-     * accesses using masked indices include checks (that are always
-     * true) that the array length is non-zero to avoid compilers
-     * inserting more expensive traps.  This is usually done in a
-     * "C"-like style of listing declarations at the heads of methods
-     * or blocks, and using inline assignments on first encounter.
-     * Nearly all explicit checks lead to bypass/return, not exception
-     * throws, because they may legitimately arise due to
-     * cancellation/revocation during shutdown.
+     * before use, and null-checked if they are references, even if
+     * they can never be null under current usages.  Array accesses
+     * using masked indices include checks (that are always true) that
+     * the array length is non-zero to avoid compilers inserting more
+     * expensive traps.  This is usually done in a "C"-like style of
+     * listing declarations at the heads of methods or blocks, and
+     * using inline assignments on first encounter.  Nearly all
+     * explicit checks lead to bypass/return, not exception throws,
+     * because they may legitimately arise during shutdown.
      *
      * There is a lot of representation-level coupling among classes
      * ForkJoinPool, ForkJoinWorkerThread, and ForkJoinTask.  The
@@ -652,6 +715,22 @@ public class ForkJoinPool extends AbstractExecutorService {
      * (6) Callbacks and other support for ForkJoinTask methods
      * (7) Exported methods
      * (8) Static block initializing statics in minimally dependent order
+     *
+     * Revision notes
+     * ==============
+     *
+     * The main sources of differences of January 2020 ForkJoin
+     * classes from previous version are:
+     *
+     * * ForkJoinTask now uses field "aux" to support blocking joins
+     *   and/or record exceptions, replacing reliance on builtin
+     *   monitors and side tables.
+     * * Scans probe slots (vs compare indices), along with related
+     *   changes that reduce performance differences across most
+     *   garbage collectors, and reduce contention.
+     * * Refactoring for better integration of special task types and
+     *   other capabilities that had been incrementally tacked on. Plus
+     *   many minor reworkings to improve consistency.
      */
 
     // Static utilities
@@ -666,6 +745,14 @@ private static void checkPermission() {
             security.checkPermission(modifyThreadPermission);
     }
 
+    static AccessControlContext contextWithPermissions(Permission ... perms) {
+        Permissions permissions = new Permissions();
+        for (Permission perm : perms)
+            permissions.add(perm);
+        return new AccessControlContext(
+            new ProtectionDomain[] { new ProtectionDomain(null, permissions) });
+    }
+
     // Nested classes
 
     /**
@@ -693,379 +780,389 @@ public static interface ForkJoinWorkerThreadFactory {
         public ForkJoinWorkerThread newThread(ForkJoinPool pool);
     }
 
-    static AccessControlContext contextWithPermissions(Permission ... perms) {
-        Permissions permissions = new Permissions();
-        for (Permission perm : perms)
-            permissions.add(perm);
-        return new AccessControlContext(
-            new ProtectionDomain[] { new ProtectionDomain(null, permissions) });
-    }
-
     /**
      * Default ForkJoinWorkerThreadFactory implementation; creates a
      * new ForkJoinWorkerThread using the system class loader as the
      * thread context class loader.
      */
-    private static final class DefaultForkJoinWorkerThreadFactory
+    static final class DefaultForkJoinWorkerThreadFactory
         implements ForkJoinWorkerThreadFactory {
+        // ACC for access to the factory
         private static final AccessControlContext ACC = contextWithPermissions(
             new RuntimePermission("getClassLoader"),
             new RuntimePermission("setContextClassLoader"));
-
         public final ForkJoinWorkerThread newThread(ForkJoinPool pool) {
             return AccessController.doPrivileged(
                 new PrivilegedAction<>() {
                     public ForkJoinWorkerThread run() {
-                        return new ForkJoinWorkerThread(
-                            pool, ClassLoader.getSystemClassLoader()); }},
+                        return new ForkJoinWorkerThread(null, pool, true, false);
+                    }},
                 ACC);
         }
     }
 
+    /**
+     * Factory for CommonPool unless overridden by System property.
+     * Creates InnocuousForkJoinWorkerThreads if a security manager is
+     * present at time of invocation.  Support requires that we break
+     * quite a lot of encapsulation (some via helper methods in
+     * ThreadLocalRandom) to access and set Thread fields.
+     */
+    static final class DefaultCommonPoolForkJoinWorkerThreadFactory
+        implements ForkJoinWorkerThreadFactory {
+        private static final AccessControlContext ACC = contextWithPermissions(
+            modifyThreadPermission,
+            new RuntimePermission("enableContextClassLoaderOverride"),
+            new RuntimePermission("modifyThreadGroup"),
+            new RuntimePermission("getClassLoader"),
+            new RuntimePermission("setContextClassLoader"));
+
+        public final ForkJoinWorkerThread newThread(ForkJoinPool pool) {
+            return AccessController.doPrivileged(
+                 new PrivilegedAction<>() {
+                     public ForkJoinWorkerThread run() {
+                         return System.getSecurityManager() == null ?
+                             new ForkJoinWorkerThread(null, pool, true, true):
+                             new ForkJoinWorkerThread.
+                             InnocuousForkJoinWorkerThread(pool); }},
+                 ACC);
+        }
+    }
+
     // Constants shared across ForkJoinPool and WorkQueue
 
     // Bounds
     static final int SWIDTH       = 16;            // width of short
     static final int SMASK        = 0xffff;        // short bits == max index
     static final int MAX_CAP      = 0x7fff;        // max #workers - 1
-    static final int SQMASK       = 0x007e;        // max 64 (even) slots
 
     // Masks and units for WorkQueue.phase and ctl sp subfield
     static final int UNSIGNALLED  = 1 << 31;       // must be negative
     static final int SS_SEQ       = 1 << 16;       // version count
-    static final int QLOCK        = 1;             // must be 1
 
-    // Mode bits and sentinels, some also used in WorkQueue id and.source fields
-    static final int OWNED        = 1;             // queue has owner thread
+    // Mode bits and sentinels, some also used in WorkQueue fields
     static final int FIFO         = 1 << 16;       // fifo queue or access mode
-    static final int SHUTDOWN     = 1 << 18;
-    static final int TERMINATED   = 1 << 19;
+    static final int SRC          = 1 << 17;       // set for valid queue ids
+    static final int INNOCUOUS    = 1 << 18;       // set for Innocuous workers
+    static final int QUIET        = 1 << 19;       // quiescing phase or source
+    static final int SHUTDOWN     = 1 << 24;
+    static final int TERMINATED   = 1 << 25;
     static final int STOP         = 1 << 31;       // must be negative
-    static final int QUIET        = 1 << 30;       // not scanning or working
-    static final int DORMANT      = QUIET | UNSIGNALLED;
-
-    /**
-     * Initial capacity of work-stealing queue array.
-     * Must be a power of two, at least 2.
-     */
-    static final int INITIAL_QUEUE_CAPACITY = 1 << 13;
+    static final int UNCOMPENSATE = 1 << 16;       // tryCompensate return
 
     /**
-     * Maximum capacity for queue arrays. Must be a power of two less
-     * than or equal to 1 << (31 - width of array entry) to ensure
-     * lack of wraparound of index calculations, but defined to a
-     * value a bit less than this to help users trap runaway programs
-     * before saturating systems.
+     * Initial capacity of work-stealing queue array.  Must be a power
+     * of two, at least 2. See above.
      */
-    static final int MAXIMUM_QUEUE_CAPACITY = 1 << 26; // 64M
-
-    /**
-     * The maximum number of top-level polls per worker before
-     * checking other queues, expressed as a bit shift.  See above for
-     * rationale.
-     */
-    static final int TOP_BOUND_SHIFT = 10;
+    static final int INITIAL_QUEUE_CAPACITY = 1 << 8;
 
     /**
      * Queues supporting work-stealing as well as external task
      * submission. See above for descriptions and algorithms.
      */
-    @jdk.internal.vm.annotation.Contended
     static final class WorkQueue {
-        volatile int source;       // source queue id, or sentinel
-        int id;                    // pool index, mode, tag
-        int base;                  // index of next slot for poll
-        int top;                   // index of next slot for push
-        volatile int phase;        // versioned, negative: queued, 1: locked
+        volatile int phase;        // versioned, negative if inactive
         int stackPred;             // pool stack (ctl) predecessor link
-        int nsteals;               // number of steals
+        int config;                // index, mode, ORed with SRC after init
+        int base;                  // index of next slot for poll
         ForkJoinTask<?>[] array;   // the queued tasks; power of 2 size
-        final ForkJoinPool pool;   // the containing pool (may be null)
         final ForkJoinWorkerThread owner; // owning thread or null if shared
 
-        WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner) {
-            this.pool = pool;
-            this.owner = owner;
-            // Place indices in the center of array (that is not yet allocated)
-            base = top = INITIAL_QUEUE_CAPACITY >>> 1;
+        // segregate fields frequently updated but not read by scans or steals
+        @jdk.internal.vm.annotation.Contended("w")
+        int top;                   // index of next slot for push
+        @jdk.internal.vm.annotation.Contended("w")
+        volatile int source;       // source queue id, lock, or sentinel
+        @jdk.internal.vm.annotation.Contended("w")
+        int nsteals;               // number of steals from other queues
+
+        // Support for atomic operations
+        private static final VarHandle QA; // for array slots
+        private static final VarHandle SOURCE;
+        private static final VarHandle BASE;
+        static final ForkJoinTask<?> getSlot(ForkJoinTask<?>[] a, int i) {
+            return (ForkJoinTask<?>)QA.getAcquire(a, i);
+        }
+        static final ForkJoinTask<?> getAndClearSlot(ForkJoinTask<?>[] a,
+                                                     int i) {
+            return (ForkJoinTask<?>)QA.getAndSet(a, i, null);
+        }
+        static final void setSlotVolatile(ForkJoinTask<?>[] a, int i,
+                                          ForkJoinTask<?> v) {
+            QA.setVolatile(a, i, v);
+        }
+        static final boolean casSlotToNull(ForkJoinTask<?>[] a, int i,
+                                          ForkJoinTask<?> c) {
+            return QA.weakCompareAndSet(a, i, c, null);
+        }
+        final boolean tryLock() {
+            return SOURCE.compareAndSet(this, 0, 1);
+        }
+        final void setBaseOpaque(int b) {
+            BASE.setOpaque(this, b);
         }
 
         /**
-         * Tries to lock shared queue by CASing phase field.
+         * Constructor used by ForkJoinWorkerThreads. Most fields
+         * are initialized upon thread start, in pool.registerWorker.
          */
-        final boolean tryLockPhase() {
-            return PHASE.compareAndSet(this, 0, 1);
+        WorkQueue(ForkJoinWorkerThread owner, boolean isInnocuous) {
+            this.config = (isInnocuous) ? INNOCUOUS : 0;
+            this.owner = owner;
         }
 
-        final void releasePhaseLock() {
-            PHASE.setRelease(this, 0);
+        /**
+         * Constructor used for external queues.
+         */
+        WorkQueue(int config) {
+            array = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
+            this.config = config;
+            owner = null;
+            phase = -1;
         }
 
         /**
          * Returns an exportable index (used by ForkJoinWorkerThread).
          */
         final int getPoolIndex() {
-            return (id & 0xffff) >>> 1; // ignore odd/even tag bit
+            return (config & 0xffff) >>> 1; // ignore odd/even tag bit
         }
 
         /**
          * Returns the approximate number of tasks in the queue.
          */
         final int queueSize() {
-            int n = (int)BASE.getAcquire(this) - top;
-            return (n >= 0) ? 0 : -n; // ignore transient negative
+            VarHandle.acquireFence(); // ensure fresh reads by external callers
+            int n = top - base;
+            return (n < 0) ? 0 : n;   // ignore transient negative
         }
 
         /**
-         * Provides a more accurate estimate of whether this queue has
-         * any tasks than does queueSize, by checking whether a
-         * near-empty queue has at least one unclaimed task.
+         * Provides a more conservative estimate of whether this queue
+         * has any tasks than does queueSize.
          */
         final boolean isEmpty() {
-            ForkJoinTask<?>[] a; int n, cap, b;
-            VarHandle.acquireFence(); // needed by external callers
-            return ((n = (b = base) - top) >= 0 || // possibly one task
-                    (n == -1 && ((a = array) == null ||
-                                 (cap = a.length) == 0 ||
-                                 a[(cap - 1) & b] == null)));
+            return !((source != 0 && owner == null) || top - base > 0);
         }
 
         /**
          * Pushes a task. Call only by owner in unshared queues.
          *
          * @param task the task. Caller must ensure non-null.
+         * @param pool (no-op if null)
          * @throws RejectedExecutionException if array cannot be resized
          */
-        final void push(ForkJoinTask<?> task) {
-            ForkJoinTask<?>[] a;
-            int s = top, d = s - base, cap, m;
-            ForkJoinPool p = pool;
-            if ((a = array) != null && (cap = a.length) > 0) {
-                QA.setRelease(a, (m = cap - 1) & s, task);
-                top = s + 1;
+        final void push(ForkJoinTask<?> task, ForkJoinPool pool) {
+            ForkJoinTask<?>[] a = array;
+            int s = top++, d = s - base, cap, m; // skip insert if disabled
+            if (a != null && pool != null && (cap = a.length) > 0) {
+                setSlotVolatile(a, (m = cap - 1) & s, task);
                 if (d == m)
-                    growArray(false);
-                else if (QA.getAcquire(a, m & (s - 1)) == null && p != null) {
-                    VarHandle.fullFence();  // was empty
-                    p.signalWork(null);
-                }
+                    growArray();
+                if (d == m || a[m & (s - 1)] == null)
+                    pool.signalWork(); // signal if was empty or resized
             }
         }
 
         /**
-         * Version of push for shared queues. Call only with phase lock held.
-         * @return true if should signal work
+         * Pushes task to a shared queue with lock already held, and unlocks.
+         *
+         * @return true if caller should signal work
          */
         final boolean lockedPush(ForkJoinTask<?> task) {
-            ForkJoinTask<?>[] a;
-            boolean signal = false;
-            int s = top, d = s - base, cap, m;
-            if ((a = array) != null && (cap = a.length) > 0) {
-                a[(m = (cap - 1)) & s] = task;
-                top = s + 1;
+            ForkJoinTask<?>[] a = array;
+            int s = top++, d = s - base, cap, m;
+            if (a != null && (cap = a.length) > 0) {
+                a[(m = cap - 1) & s] = task;
                 if (d == m)
-                    growArray(true);
-                else {
-                    phase = 0; // full volatile unlock
-                    if (((s - base) & ~1) == 0) // size 0 or 1
-                        signal = true;
-                }
+                    growArray();
+                source = 0; // unlock
+                if (d == m || a[m & (s - 1)] == null)
+                    return true;
             }
-            return signal;
+            return false;
         }
 
         /**
-         * Doubles the capacity of array. Call either by owner or with
-         * lock held -- it is OK for base, but not top, to move while
-         * resizings are in progress.
+         * Doubles the capacity of array. Called by owner or with lock
+         * held after pre-incrementing top, which is reverted on
+         * allocation failure.
          */
-        final void growArray(boolean locked) {
-            ForkJoinTask<?>[] newA = null;
-            try {
-                ForkJoinTask<?>[] oldA; int oldSize, newSize;
-                if ((oldA = array) != null && (oldSize = oldA.length) > 0 &&
-                    (newSize = oldSize << 1) <= MAXIMUM_QUEUE_CAPACITY &&
-                    newSize > 0) {
-                    try {
-                        newA = new ForkJoinTask<?>[newSize];
-                    } catch (OutOfMemoryError ex) {
-                    }
-                    if (newA != null) { // poll from old array, push to new
-                        int oldMask = oldSize - 1, newMask = newSize - 1;
-                        for (int s = top - 1, k = oldMask; k >= 0; --k) {
-                            ForkJoinTask<?> x = (ForkJoinTask<?>)
-                                QA.getAndSet(oldA, s & oldMask, null);
-                            if (x != null)
-                                newA[s-- & newMask] = x;
-                            else
-                                break;
-                        }
-                        array = newA;
-                        VarHandle.releaseFence();
-                    }
+        final void growArray() {
+            ForkJoinTask<?>[] oldArray = array, newArray;
+            int s = top - 1, oldCap, newCap;
+            if (oldArray != null && (oldCap = oldArray.length) > 0 &&
+                (newCap = oldCap << 1) > 0) { // skip if disabled
+                try {
+                    newArray = new ForkJoinTask<?>[newCap];
+                } catch (Throwable ex) {
+                    top = s;
+                    if (owner == null)
+                        source = 0; // unlock
+                    throw new RejectedExecutionException(
+                        "Queue capacity exceeded");
                 }
-            } finally {
-                if (locked)
-                    phase = 0;
-            }
-            if (newA == null)
-                throw new RejectedExecutionException("Queue capacity exceeded");
-        }
-
-        /**
-         * Takes next task, if one exists, in FIFO order.
-         */
-        final ForkJoinTask<?> poll() {
-            int b, k, cap; ForkJoinTask<?>[] a;
-            while ((a = array) != null && (cap = a.length) > 0 &&
-                   top - (b = base) > 0) {
-                ForkJoinTask<?> t = (ForkJoinTask<?>)
-                    QA.getAcquire(a, k = (cap - 1) & b);
-                if (base == b++) {
-                    if (t == null)
-                        Thread.yield(); // await index advance
-                    else if (QA.compareAndSet(a, k, t, null)) {
-                        BASE.setOpaque(this, b);
-                        return t;
-                    }
+                int newMask = newCap - 1, oldMask = oldCap - 1;
+                for (int k = oldCap; k > 0; --k, --s) {
+                    ForkJoinTask<?> x;        // poll old, push to new
+                    if ((x = getAndClearSlot(oldArray, s & oldMask)) == null)
+                        break;                // others already taken
+                    newArray[s & newMask] = x;
                 }
+                VarHandle.releaseFence();     // fill before publish
+                array = newArray;
             }
-            return null;
         }
 
+        // Variants of pop
+
         /**
-         * Takes next task, if one exists, in order specified by mode.
+         * Pops and returns task, or null if empty. Called only by owner.
          */
-        final ForkJoinTask<?> nextLocalTask() {
+        private ForkJoinTask<?> pop() {
             ForkJoinTask<?> t = null;
-            int md = id, b, s, d, cap; ForkJoinTask<?>[] a;
-            if ((a = array) != null && (cap = a.length) > 0 &&
-                (d = (s = top) - (b = base)) > 0) {
-                if ((md & FIFO) == 0 || d == 1) {
-                    if ((t = (ForkJoinTask<?>)
-                         QA.getAndSet(a, (cap - 1) & --s, null)) != null)
-                        TOP.setOpaque(this, s);
-                }
-                else if ((t = (ForkJoinTask<?>)
-                          QA.getAndSet(a, (cap - 1) & b++, null)) != null) {
-                    BASE.setOpaque(this, b);
-                }
-                else // on contention in FIFO mode, use regular poll
-                    t = poll();
-            }
+            int s = top, cap; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0 && base != s-- &&
+                (t = getAndClearSlot(a, (cap - 1) & s)) != null)
+                top = s;
             return t;
         }
 
         /**
-         * Returns next task, if one exists, in order specified by mode.
-         */
-        final ForkJoinTask<?> peek() {
-            int cap; ForkJoinTask<?>[] a;
-            return ((a = array) != null && (cap = a.length) > 0) ?
-                a[(cap - 1) & ((id & FIFO) != 0 ? base : top - 1)] : null;
-        }
-
-        /**
-         * Pops the given task only if it is at the current top.
+         * Pops the given task for owner only if it is at the current top.
          */
         final boolean tryUnpush(ForkJoinTask<?> task) {
-            boolean popped = false;
-            int s, cap; ForkJoinTask<?>[] a;
-            if ((a = array) != null && (cap = a.length) > 0 &&
-                (s = top) != base &&
-                (popped = QA.compareAndSet(a, (cap - 1) & --s, task, null)))
-                TOP.setOpaque(this, s);
-            return popped;
+            int s = top, cap; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0 && base != s-- &&
+                casSlotToNull(a, (cap - 1) & s, task)) {
+                top = s;
+                return true;
+            }
+            return false;
         }
 
         /**
-         * Shared version of tryUnpush.
+         * Locking version of tryUnpush.
          */
-        final boolean tryLockedUnpush(ForkJoinTask<?> task) {
-            boolean popped = false;
-            int s = top - 1, k, cap; ForkJoinTask<?>[] a;
+        final boolean externalTryUnpush(ForkJoinTask<?> task) {
+            boolean taken = false;
+            int s = top, cap, k; ForkJoinTask<?>[] a;
             if ((a = array) != null && (cap = a.length) > 0 &&
-                a[k = (cap - 1) & s] == task && tryLockPhase()) {
-                if (top == s + 1 && array == a &&
-                    (popped = QA.compareAndSet(a, k, task, null)))
-                    top = s;
-                releasePhaseLock();
+                a[k = (cap - 1) & (s - 1)] == task && tryLock()) {
+                if (top == s && array == a &&
+                    (taken = casSlotToNull(a, k, task)))
+                    top = s - 1;
+                source = 0; // release lock
             }
-            return popped;
+            return taken;
         }
 
         /**
-         * Removes and cancels all known tasks, ignoring any exceptions.
+         * Deep form of tryUnpush: Traverses from top and removes task if
+         * present, shifting others to fill gap.
          */
-        final void cancelAll() {
-            for (ForkJoinTask<?> t; (t = poll()) != null; )
-                ForkJoinTask.cancelIgnoringExceptions(t);
+        final boolean tryRemove(ForkJoinTask<?> task, boolean owned) {
+            boolean taken = false;
+            int p = top, cap; ForkJoinTask<?>[] a; ForkJoinTask<?> t;
+            if ((a = array) != null && task != null && (cap = a.length) > 0) {
+                int m = cap - 1, s = p - 1, d = p - base;
+                for (int i = s, k; d > 0; --i, --d) {
+                    if ((t = a[k = i & m]) == task) {
+                        if (owned || tryLock()) {
+                            if ((owned || (array == a && top == p)) &&
+                                (taken = casSlotToNull(a, k, t))) {
+                                for (int j = i; j != s; ) // shift down
+                                    a[j & m] = getAndClearSlot(a, ++j & m);
+                                top = s;
+                            }
+                            if (!owned)
+                                source = 0;
+                        }
+                        break;
+                    }
+                }
+            }
+            return taken;
         }
 
-        // Specialized execution methods
+        // variants of poll
 
         /**
-         * Runs the given (stolen) task if nonnull, as well as
-         * remaining local tasks and others available from the given
-         * queue, up to bound n (to avoid infinite unfairness).
+         * Tries once to poll next task in FIFO order, failing on
+         * inconsistency or contention.
          */
-        final void topLevelExec(ForkJoinTask<?> t, WorkQueue q, int n) {
-            int nstolen = 1;
-            for (int j = 0;;) {
-                if (t != null)
-                    t.doExec();
-                if (j++ <= n)
-                    t = nextLocalTask();
-                else {
-                    j = 0;
-                    t = null;
-                }
-                if (t == null) {
-                    if (q != null && (t = q.poll()) != null) {
-                        ++nstolen;
-                        j = 0;
-                    }
-                    else if (j != 0)
-                        break;
+        final ForkJoinTask<?> tryPoll() {
+            int cap, b, k; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0) {
+                ForkJoinTask<?> t = getSlot(a, k = (cap - 1) & (b = base));
+                if (base == b++ && t != null && casSlotToNull(a, k, t)) {
+                    setBaseOpaque(b);
+                    return t;
                 }
             }
-            ForkJoinWorkerThread thread = owner;
-            nsteals += nstolen;
-            source = 0;
-            if (thread != null)
-                thread.afterTopLevelExec();
+            return null;
         }
 
         /**
-         * If present, removes task from queue and executes it.
+         * Takes next task, if one exists, in order specified by mode.
          */
-        final void tryRemoveAndExec(ForkJoinTask<?> task) {
-            ForkJoinTask<?>[] a; int s, cap;
-            if ((a = array) != null && (cap = a.length) > 0 &&
-                (s = top) - base > 0) { // traverse from top
-                for (int m = cap - 1, ns = s - 1, i = ns; ; --i) {
-                    int index = i & m;
-                    ForkJoinTask<?> t = (ForkJoinTask<?>)QA.get(a, index);
-                    if (t == null)
+        final ForkJoinTask<?> nextLocalTask(int cfg) {
+            ForkJoinTask<?> t = null;
+            int s = top, cap; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0) {
+                for (int b, d;;) {
+                    if ((d = s - (b = base)) <= 0)
                         break;
-                    else if (t == task) {
-                        if (QA.compareAndSet(a, index, t, null)) {
-                            top = ns;   // safely shift down
-                            for (int j = i; j != ns; ++j) {
-                                ForkJoinTask<?> f;
-                                int pindex = (j + 1) & m;
-                                f = (ForkJoinTask<?>)QA.get(a, pindex);
-                                QA.setVolatile(a, pindex, null);
-                                int jindex = j & m;
-                                QA.setRelease(a, jindex, f);
-                            }
-                            VarHandle.releaseFence();
-                            t.doExec();
-                        }
+                    if (d == 1 || (cfg & FIFO) == 0) {
+                        if ((t = getAndClearSlot(a, --s & (cap - 1))) != null)
+                            top = s;
+                        break;
+                    }
+                    if ((t = getAndClearSlot(a, b++ & (cap - 1))) != null) {
+                        setBaseOpaque(b);
                         break;
                     }
                 }
             }
+            return t;
+        }
+
+        /**
+         * Takes next task, if one exists, using configured mode.
+         */
+        final ForkJoinTask<?> nextLocalTask() {
+            return nextLocalTask(config);
+        }
+
+        /**
+         * Returns next task, if one exists, in order specified by mode.
+         */
+        final ForkJoinTask<?> peek() {
+            VarHandle.acquireFence();
+            int cap; ForkJoinTask<?>[] a;
+            return ((a = array) != null && (cap = a.length) > 0) ?
+                a[(cap - 1) & ((config & FIFO) != 0 ? base : top - 1)] : null;
+        }
+
+        // specialized execution methods
+
+        /**
+         * Runs the given (stolen) task if nonnull, as well as
+         * remaining local tasks and/or others available from the
+         * given queue.
+         */
+        final void topLevelExec(ForkJoinTask<?> task, WorkQueue q) {
+            int cfg = config, nstolen = 1;
+            while (task != null) {
+                task.doExec();
+                if ((task = nextLocalTask(cfg)) == null &&
+                    q != null && (task = q.tryPoll()) != null)
+                    ++nstolen;
+            }
+            nsteals += nstolen;
+            source = 0;
+            if ((cfg & INNOCUOUS) != 0)
+                ThreadLocalRandom.eraseThreadLocals(Thread.currentThread());
         }
 
         /**
@@ -1073,84 +1170,85 @@ else if (t == task) {
          * until done, not found, or limit exceeded.
          *
          * @param task root of CountedCompleter computation
+         * @param owned true if owned by a ForkJoinWorkerThread
          * @param limit max runs, or zero for no limit
-         * @param shared true if must lock to extract task
          * @return task status on exit
          */
-        final int helpCC(CountedCompleter<?> task, int limit, boolean shared) {
-            int status = 0;
-            if (task != null && (status = task.status) >= 0) {
-                int s, k, cap; ForkJoinTask<?>[] a;
-                while ((a = array) != null && (cap = a.length) > 0 &&
-                       (s = top) - base > 0) {
-                    CountedCompleter<?> v = null;
-                    ForkJoinTask<?> o = a[k = (cap - 1) & (s - 1)];
-                    if (o instanceof CountedCompleter) {
-                        CountedCompleter<?> t = (CountedCompleter<?>)o;
-                        for (CountedCompleter<?> f = t;;) {
-                            if (f != task) {
-                                if ((f = f.completer) == null)
-                                    break;
-                            }
-                            else if (shared) {
-                                if (tryLockPhase()) {
-                                    if (top == s && array == a &&
-                                        QA.compareAndSet(a, k, t, null)) {
-                                        top = s - 1;
-                                        v = t;
-                                    }
-                                    releasePhaseLock();
-                                }
-                                break;
-                            }
-                            else {
-                                if (QA.compareAndSet(a, k, t, null)) {
-                                    top = s - 1;
-                                    v = t;
-                                }
-                                break;
-                            }
+        final int helpComplete(ForkJoinTask<?> task, boolean owned, int limit) {
+            int status = 0, cap, k, p, s; ForkJoinTask<?>[] a; ForkJoinTask<?> t;
+            while (task != null && (status = task.status) >= 0 &&
+                   (a = array) != null && (cap = a.length) > 0 &&
+                   (t = a[k = (cap - 1) & (s = (p = top) - 1)])
+                   instanceof CountedCompleter) {
+                CountedCompleter<?> f = (CountedCompleter<?>)t;
+                boolean taken = false;
+                for (;;) {     // exec if root task is a completer of t
+                    if (f == task) {
+                        if (owned) {
+                            if ((taken = casSlotToNull(a, k, t)))
+                                top = s;
                         }
+                        else if (tryLock()) {
+                            if (top == p && array == a &&
+                                (taken = casSlotToNull(a, k, t)))
+                                top = s;
+                            source = 0;
+                        }
+                        break;
                     }
-                    if (v != null)
-                        v.doExec();
-                    if ((status = task.status) < 0 || v == null ||
-                        (limit != 0 && --limit == 0))
+                    else if ((f = f.completer) == null)
                         break;
                 }
+                if (!taken)
+                    break;
+                t.doExec();
+                if (limit != 0 && --limit == 0)
+                    break;
             }
             return status;
         }
 
         /**
          * Tries to poll and run AsynchronousCompletionTasks until
-         * none found or blocker is released
+         * none found or blocker is released.
          *
          * @param blocker the blocker
          */
         final void helpAsyncBlocker(ManagedBlocker blocker) {
-            if (blocker != null) {
-                int b, k, cap; ForkJoinTask<?>[] a; ForkJoinTask<?> t;
-                while ((a = array) != null && (cap = a.length) > 0 &&
-                       top - (b = base) > 0) {
-                    t = (ForkJoinTask<?>)QA.getAcquire(a, k = (cap - 1) & b);
-                    if (blocker.isReleasable())
-                        break;
-                    else if (base == b++ && t != null) {
-                        if (!(t instanceof CompletableFuture.
-                              AsynchronousCompletionTask))
-                            break;
-                        else if (QA.compareAndSet(a, k, t, null)) {
-                            BASE.setOpaque(this, b);
-                            t.doExec();
-                        }
-                    }
+            int cap, b, d, k; ForkJoinTask<?>[] a; ForkJoinTask<?> t;
+            while (blocker != null && (d = top - (b = base)) > 0 &&
+                   (a = array) != null && (cap = a.length) > 0 &&
+                   (((t = getSlot(a, k = (cap - 1) & b)) == null && d > 1) ||
+                    t instanceof
+                    CompletableFuture.AsynchronousCompletionTask) &&
+                   !blocker.isReleasable()) {
+                if (t != null && base == b++ && casSlotToNull(a, k, t)) {
+                    setBaseOpaque(b);
+                    t.doExec();
                 }
             }
         }
 
+        // misc
+
+        /** AccessControlContext for innocuous workers, created on 1st use. */
+        private static AccessControlContext INNOCUOUS_ACC;
+
         /**
-         * Returns true if owned and not known to be blocked.
+         * Initializes (upon registration) InnocuousForkJoinWorkerThreads.
+         */
+        final void initializeInnocuousWorker() {
+            AccessControlContext acc; // racy construction OK
+            if ((acc = INNOCUOUS_ACC) == null)
+                INNOCUOUS_ACC = acc = new AccessControlContext(
+                    new ProtectionDomain[] { new ProtectionDomain(null, null) });
+            Thread t = Thread.currentThread();
+            ThreadLocalRandom.setInheritedAccessControlContext(t, acc);
+            ThreadLocalRandom.eraseThreadLocals(t);
+        }
+
+        /**
+         * Returns true if owned by a worker thread and not known to be blocked.
          */
         final boolean isApparentlyUnblocked() {
             Thread wt; Thread.State s;
@@ -1160,16 +1258,12 @@ final boolean isApparentlyUnblocked() {
                     s != Thread.State.TIMED_WAITING);
         }
 
-        // VarHandle mechanics.
-        static final VarHandle PHASE;
-        static final VarHandle BASE;
-        static final VarHandle TOP;
         static {
             try {
+                QA = MethodHandles.arrayElementVarHandle(ForkJoinTask[].class);
                 MethodHandles.Lookup l = MethodHandles.lookup();
-                PHASE = l.findVarHandle(WorkQueue.class, "phase", int.class);
+                SOURCE = l.findVarHandle(WorkQueue.class, "source", int.class);
                 BASE = l.findVarHandle(WorkQueue.class, "base", int.class);
-                TOP = l.findVarHandle(WorkQueue.class, "top", int.class);
             } catch (ReflectiveOperationException e) {
                 throw new ExceptionInInitializerError(e);
             }
@@ -1213,17 +1307,9 @@ final boolean isApparentlyUnblocked() {
     private static final int COMMON_MAX_SPARES;
 
     /**
-     * Sequence number for creating workerNamePrefix.
-     */
-    private static int poolNumberSequence;
-
-    /**
-     * Returns the next sequence number. We don't expect this to
-     * ever contend, so use simple builtin sync.
+     * Sequence number for creating worker names
      */
-    private static final synchronized int nextPoolId() {
-        return ++poolNumberSequence;
-    }
+    private static volatile int poolIds;
 
     // static configuration constants
 
@@ -1248,12 +1334,6 @@ private static final synchronized int nextPoolId() {
      */
     private static final int DEFAULT_COMMON_MAX_SPARES = 256;
 
-    /**
-     * Increment for seed generators. See class ThreadLocal for
-     * explanation.
-     */
-    private static final int SEED_INCREMENT = 0x9e3779b9;
-
     /*
      * Bits and masks for field ctl, packed with 4 16 bit subfields:
      * RC: Number of released (unqueued) workers minus target parallelism
@@ -1271,10 +1351,10 @@ private static final synchronized int nextPoolId() {
      * deal with possibly negative fields, we use casts in and out of
      * "short" and/or signed shifts to maintain signedness.
      *
-     * Because it occupies uppermost bits, we can add one release count
-     * using getAndAddLong of RC_UNIT, rather than CAS, when returning
-     * from a blocked join.  Other updates entail multiple subfields
-     * and masking, requiring CAS.
+     * Because it occupies uppermost bits, we can add one release
+     * count using getAndAdd of RC_UNIT, rather than CAS, when
+     * returning from a blocked join.  Other updates entail multiple
+     * subfields and masking, requiring CAS.
      *
      * The limits packed in field "bounds" are also offset by the
      * parallelism level to make them comparable to the ctl rc and tc
@@ -1298,13 +1378,16 @@ private static final synchronized int nextPoolId() {
 
     // Instance fields
 
-    volatile long stealCount;            // collects worker nsteals
     final long keepAlive;                // milliseconds before dropping if idle
-    int indexSeed;                       // next worker index
+    volatile long stealCount;            // collects worker nsteals
+    int scanRover;                       // advances across pollScan calls
+    volatile int threadIds;              // for worker thread names
     final int bounds;                    // min, max threads packed as shorts
     volatile int mode;                   // parallelism, runstate, queue mode
-    WorkQueue[] workQueues;              // main registry
-    final String workerNamePrefix;       // for worker thread string; sync lock
+    WorkQueue[] queues;                  // main registry
+    final ReentrantLock registrationLock;
+    Condition termination;               // lazily constructed
+    final String workerNamePrefix;       // null for common pool
     final ForkJoinWorkerThreadFactory factory;
     final UncaughtExceptionHandler ueh;  // per-worker UEH
     final Predicate<? super ForkJoinPool> saturate;
@@ -1312,6 +1395,30 @@ private static final synchronized int nextPoolId() {
     @jdk.internal.vm.annotation.Contended("fjpctl") // segregate
     volatile long ctl;                   // main pool control
 
+    // Support for atomic operations
+    private static final VarHandle CTL;
+    private static final VarHandle MODE;
+    private static final VarHandle THREADIDS;
+    private static final VarHandle POOLIDS;
+    private boolean compareAndSetCtl(long c, long v) {
+        return CTL.compareAndSet(this, c, v);
+    }
+    private long compareAndExchangeCtl(long c, long v) {
+        return (long)CTL.compareAndExchange(this, c, v);
+    }
+    private long getAndAddCtl(long v) {
+        return (long)CTL.getAndAdd(this, v);
+    }
+    private int getAndBitwiseOrMode(int v) {
+        return (int)MODE.getAndBitwiseOr(this, v);
+    }
+    private int getAndAddThreadIds(int x) {
+        return (int)THREADIDS.getAndAdd(this, x);
+    }
+    private static int getAndAddPoolIds(int x) {
+        return (int)POOLIDS.getAndAdd(x);
+    }
+
     // Creating, registering and deregistering workers
 
     /**
@@ -1338,83 +1445,63 @@ private boolean createWorker() {
     }
 
     /**
-     * Tries to add one worker, incrementing ctl counts before doing
-     * so, relying on createWorker to back out on failure.
-     *
-     * @param c incoming ctl value, with total count negative and no
-     * idle workers.  On CAS failure, c is refreshed and retried if
-     * this holds (otherwise, a new worker is not needed).
+     * Provides a name for ForkJoinWorkerThread constructor.
      */
-    private void tryAddWorker(long c) {
-        do {
-            long nc = ((RC_MASK & (c + RC_UNIT)) |
-                       (TC_MASK & (c + TC_UNIT)));
-            if (ctl == c && CTL.compareAndSet(this, c, nc)) {
-                createWorker();
-                break;
-            }
-        } while (((c = ctl) & ADD_WORKER) != 0L && (int)c == 0);
+    final String nextWorkerThreadName() {
+        String prefix = workerNamePrefix;
+        int tid = getAndAddThreadIds(1) + 1;
+        if (prefix == null) // commonPool has no prefix
+            prefix = "ForkJoinPool.commonPool-worker-";
+        return prefix.concat(Integer.toString(tid));
     }
 
     /**
-     * Callback from ForkJoinWorkerThread constructor to establish and
-     * record its WorkQueue.
+     * Finishes initializing and records owned queue.
      *
-     * @param wt the worker thread
-     * @return the worker's queue
+     * @param w caller's WorkQueue
      */
-    final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
-        UncaughtExceptionHandler handler;
-        wt.setDaemon(true);                             // configure thread
-        if ((handler = ueh) != null)
-            wt.setUncaughtExceptionHandler(handler);
-        int tid = 0;                                    // for thread name
-        int idbits = mode & FIFO;
-        String prefix = workerNamePrefix;
-        WorkQueue w = new WorkQueue(this, wt);
-        if (prefix != null) {
-            synchronized (prefix) {
-                WorkQueue[] ws = workQueues; int n;
-                int s = indexSeed += SEED_INCREMENT;
-                idbits |= (s & ~(SMASK | FIFO | DORMANT));
-                if (ws != null && (n = ws.length) > 1) {
-                    int m = n - 1;
-                    tid = m & ((s << 1) | 1);           // odd-numbered indices
-                    for (int probes = n >>> 1;;) {      // find empty slot
-                        WorkQueue q;
-                        if ((q = ws[tid]) == null || q.phase == QUIET)
-                            break;
-                        else if (--probes == 0) {
-                            tid = n | 1;                // resize below
-                            break;
-                        }
-                        else
-                            tid = (tid + 2) & m;
-                    }
-                    w.phase = w.id = tid | idbits;      // now publishable
-
-                    if (tid < n)
-                        ws[tid] = w;
+    final void registerWorker(WorkQueue w) {
+        ReentrantLock lock = registrationLock;
+        ThreadLocalRandom.localInit();
+        int seed = ThreadLocalRandom.getProbe();
+        if (w != null && lock != null) {
+            int modebits = (mode & FIFO) | w.config;
+            w.array = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
+            w.stackPred = seed;                         // stash for runWorker
+            if ((modebits & INNOCUOUS) != 0)
+                w.initializeInnocuousWorker();
+            int id = (seed << 1) | 1;                   // initial index guess
+            lock.lock();
+            try {
+                WorkQueue[] qs; int n;                  // find queue index
+                if ((qs = queues) != null && (n = qs.length) > 0) {
+                    int k = n, m = n - 1;
+                    for (; qs[id &= m] != null && k > 0; id -= 2, k -= 2);
+                    if (k == 0)
+                        id = n | 1;                     // resize below
+                    w.phase = w.config = id | modebits; // now publishable
+
+                    if (id < n)
+                        qs[id] = w;
                     else {                              // expand array
-                        int an = n << 1;
+                        int an = n << 1, am = an - 1;
                         WorkQueue[] as = new WorkQueue[an];
-                        as[tid] = w;
-                        int am = an - 1;
-                        for (int j = 0; j < n; ++j) {
-                            WorkQueue v;                // copy external queue
-                            if ((v = ws[j]) != null)    // position may change
-                                as[v.id & am & SQMASK] = v;
-                            if (++j >= n)
-                                break;
-                            as[j] = ws[j];              // copy worker
+                        as[id & am] = w;
+                        for (int j = 1; j < n; j += 2)
+                            as[j] = qs[j];
+                        for (int j = 0; j < n; j += 2) {
+                            WorkQueue q;
+                            if ((q = qs[j]) != null)    // shared queues may move
+                                as[q.config & am] = q;
                         }
-                        workQueues = as;
+                        VarHandle.releaseFence();       // fill before publish
+                        queues = as;
                     }
                 }
+            } finally {
+                lock.unlock();
             }
-            wt.setName(prefix.concat(Integer.toString(tid)));
         }
-        return w;
     }
 
     /**
@@ -1427,432 +1514,596 @@ else if (--probes == 0) {
      * @param ex the exception causing failure, or null if none
      */
     final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex) {
+        ReentrantLock lock = registrationLock;
         WorkQueue w = null;
-        int phase = 0;
-        if (wt != null && (w = wt.workQueue) != null) {
-            Object lock = workerNamePrefix;
-            int wid = w.id;
-            long ns = (long)w.nsteals & 0xffffffffL;
-            if (lock != null) {
-                synchronized (lock) {
-                    WorkQueue[] ws; int n, i;         // remove index from array
-                    if ((ws = workQueues) != null && (n = ws.length) > 0 &&
-                        ws[i = wid & (n - 1)] == w)
-                        ws[i] = null;
-                    stealCount += ns;
-                }
-            }
-            phase = w.phase;
-        }
-        if (phase != QUIET) {                         // else pre-adjusted
-            long c;                                   // decrement counts
-            do {} while (!CTL.weakCompareAndSet
-                         (this, c = ctl, ((RC_MASK & (c - RC_UNIT)) |
-                                          (TC_MASK & (c - TC_UNIT)) |
-                                          (SP_MASK & c))));
+        int cfg = 0;
+        if (wt != null && (w = wt.workQueue) != null && lock != null) {
+            WorkQueue[] qs; int n, i;
+            cfg = w.config;
+            long ns = w.nsteals & 0xffffffffL;
+            lock.lock();                             // remove index from array
+            if ((qs = queues) != null && (n = qs.length) > 0 &&
+                qs[i = cfg & (n - 1)] == w)
+                qs[i] = null;
+            stealCount += ns;                        // accumulate steals
+            lock.unlock();
+            long c = ctl;
+            if ((cfg & QUIET) == 0) // unless self-signalled, decrement counts
+                do {} while (c != (c = compareAndExchangeCtl(
+                                       c, ((RC_MASK & (c - RC_UNIT)) |
+                                           (TC_MASK & (c - TC_UNIT)) |
+                                           (SP_MASK & c)))));
+            else if ((int)c == 0)                    // was dropped on timeout
+                cfg = 0;                             // suppress signal if last
+            for (ForkJoinTask<?> t; (t = w.pop()) != null; )
+                ForkJoinTask.cancelIgnoringExceptions(t); // cancel tasks
         }
-        if (w != null)
-            w.cancelAll();                            // cancel remaining tasks
 
-        if (!tryTerminate(false, false) &&            // possibly replace worker
-            w != null && w.array != null)             // avoid repeated failures
-            signalWork(null);
-
-        if (ex == null)                               // help clean on way out
-            ForkJoinTask.helpExpungeStaleExceptions();
-        else                                          // rethrow
+        if (!tryTerminate(false, false) && w != null && (cfg & SRC) != 0)
+            signalWork();                            // possibly replace worker
+        if (ex != null)
             ForkJoinTask.rethrow(ex);
     }
 
-    /**
+    /*
      * Tries to create or release a worker if too few are running.
-     * @param q if non-null recheck if empty on CAS failure
      */
-    final void signalWork(WorkQueue q) {
-        for (;;) {
-            long c; int sp; WorkQueue[] ws; int i; WorkQueue v;
-            if ((c = ctl) >= 0L)                      // enough workers
-                break;
-            else if ((sp = (int)c) == 0) {            // no idle workers
-                if ((c & ADD_WORKER) != 0L)           // too few workers
-                    tryAddWorker(c);
-                break;
+    final void signalWork() {
+        for (long c = ctl; c < 0L;) {
+            int sp, i; WorkQueue[] qs; WorkQueue v;
+            if ((sp = (int)c & ~UNSIGNALLED) == 0) {  // no idle workers
+                if ((c & ADD_WORKER) == 0L)           // enough total workers
+                    break;
+                if (c == (c = compareAndExchangeCtl(
+                              c, ((RC_MASK & (c + RC_UNIT)) |
+                                  (TC_MASK & (c + TC_UNIT)))))) {
+                    createWorker();
+                    break;
+                }
             }
-            else if ((ws = workQueues) == null)
+            else if ((qs = queues) == null)
                 break;                                // unstarted/terminated
-            else if (ws.length <= (i = sp & SMASK))
+            else if (qs.length <= (i = sp & SMASK))
                 break;                                // terminated
-            else if ((v = ws[i]) == null)
+            else if ((v = qs[i]) == null)
                 break;                                // terminating
             else {
-                int np = sp & ~UNSIGNALLED;
-                int vp = v.phase;
                 long nc = (v.stackPred & SP_MASK) | (UC_MASK & (c + RC_UNIT));
                 Thread vt = v.owner;
-                if (sp == vp && CTL.compareAndSet(this, c, nc)) {
-                    v.phase = np;
-                    if (vt != null && v.source < 0)
-                        LockSupport.unpark(vt);
+                if (c == (c = compareAndExchangeCtl(c, nc))) {
+                    v.phase = sp;
+                    LockSupport.unpark(vt);           // release idle worker
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Top-level runloop for workers, called by ForkJoinWorkerThread.run.
+     * See above for explanation.
+     *
+     * @param w caller's WorkQueue (may be null on failed initialization)
+     */
+    final void runWorker(WorkQueue w) {
+        if (w != null) {                        // skip on failed init
+            w.config |= SRC;                    // mark as valid source
+            int r = w.stackPred, src = 0;       // use seed from registerWorker
+            do {
+                r ^= r << 13; r ^= r >>> 17; r ^= r << 5; // xorshift
+            } while ((src = scan(w, src, r)) >= 0 ||
+                     (src = awaitWork(w)) == 0);
+        }
+    }
+
+    /**
+     * Scans for and if found executes top-level tasks: Tries to poll
+     * each queue starting at a random index with random stride,
+     * returning source id or retry indicator if contended or
+     * inconsistent.
+     *
+     * @param w caller's WorkQueue
+     * @param prevSrc the previous queue stolen from in current phase, or 0
+     * @param r random seed
+     * @return id of queue if taken, negative if none found, prevSrc for retry
+     */
+    private int scan(WorkQueue w, int prevSrc, int r) {
+        WorkQueue[] qs = queues;
+        int n = (w == null || qs == null) ? 0 : qs.length;
+        for (int step = (r >>> 16) | 1, i = n; i > 0; --i, r += step) {
+            int j, cap, b; WorkQueue q; ForkJoinTask<?>[] a;
+            if ((q = qs[j = r & (n - 1)]) != null && // poll at qs[j].array[k]
+                (a = q.array) != null && (cap = a.length) > 0) {
+                int k = (cap - 1) & (b = q.base), nextBase = b + 1;
+                int nextIndex = (cap - 1) & nextBase, src = j | SRC;
+                ForkJoinTask<?> t = WorkQueue.getSlot(a, k);
+                if (q.base != b)                // inconsistent
+                    return prevSrc;
+                else if (t != null && WorkQueue.casSlotToNull(a, k, t)) {
+                    q.base = nextBase;
+                    ForkJoinTask<?> next = a[nextIndex];
+                    if ((w.source = src) != prevSrc && next != null)
+                        signalWork();           // propagate
+                    w.topLevelExec(t, q);
+                    return src;
+                }
+                else if (a[nextIndex] != null)  // revisit
+                    return prevSrc;
+            }
+        }
+        return (queues != qs) ? prevSrc: -1;    // possibly resized
+    }
+
+    /**
+     * Advances worker phase, pushes onto ctl stack, and awaits signal
+     * or reports termination.
+     *
+     * @return negative if terminated, else 0
+     */
+    private int awaitWork(WorkQueue w) {
+        if (w == null)
+            return -1;                       // already terminated
+        int phase = (w.phase + SS_SEQ) & ~UNSIGNALLED;
+        w.phase = phase | UNSIGNALLED;       // advance phase
+        long prevCtl = ctl, c;               // enqueue
+        do {
+            w.stackPred = (int)prevCtl;
+            c = ((prevCtl - RC_UNIT) & UC_MASK) | (phase & SP_MASK);
+        } while (prevCtl != (prevCtl = compareAndExchangeCtl(prevCtl, c)));
+
+        Thread.interrupted();                // clear status
+        LockSupport.setCurrentBlocker(this); // prepare to block (exit also OK)
+        long deadline = 0L;                  // nonzero if possibly quiescent
+        int ac = (int)(c >> RC_SHIFT), md;
+        if ((md = mode) < 0)                 // pool is terminating
+            return -1;
+        else if ((md & SMASK) + ac <= 0) {
+            boolean checkTermination = (md & SHUTDOWN) != 0;
+            if ((deadline = System.currentTimeMillis() + keepAlive) == 0L)
+                deadline = 1L;               // avoid zero
+            WorkQueue[] qs = queues;         // check for racing submission
+            int n = (qs == null) ? 0 : qs.length;
+            for (int i = 0; i < n; i += 2) {
+                WorkQueue q; ForkJoinTask<?>[] a; int cap, b;
+                if (ctl != c) {              // already signalled
+                    checkTermination = false;
                     break;
                 }
-                else if (q != null && q.isEmpty())     // no need to retry
+                else if ((q = qs[i]) != null &&
+                         (a = q.array) != null && (cap = a.length) > 0 &&
+                         ((b = q.base) != q.top || a[(cap - 1) & b] != null ||
+                          q.source != 0)) {
+                    if (compareAndSetCtl(c, prevCtl))
+                        w.phase = phase;     // self-signal
+                    checkTermination = false;
                     break;
+                }
+            }
+            if (checkTermination && tryTerminate(false, false))
+                return -1;                   // trigger quiescent termination
+        }
+
+        for (boolean alt = false;;) {        // await activation or termination
+            if (w.phase >= 0)
+                break;
+            else if (mode < 0)
+                return -1;
+            else if ((c = ctl) == prevCtl)
+                Thread.onSpinWait();         // signal in progress
+            else if (!(alt = !alt))          // check between park calls
+                Thread.interrupted();
+            else if (deadline == 0L)
+                LockSupport.park();
+            else if (deadline - System.currentTimeMillis() > TIMEOUT_SLOP)
+                LockSupport.parkUntil(deadline);
+            else if (((int)c & SMASK) == (w.config & SMASK) &&
+                     compareAndSetCtl(c, ((UC_MASK & (c - TC_UNIT)) |
+                                          (prevCtl & SP_MASK)))) {
+                w.config |= QUIET;           // sentinel for deregisterWorker
+                return -1;                   // drop on timeout
+            }
+            else if ((deadline += keepAlive) == 0L)
+                deadline = 1L;               // not at head; restart timer
+        }
+        return 0;
+    }
+
+    // Utilities used by ForkJoinTask
+
+    /**
+     * Returns true if all workers are busy, possibly creating one if allowed
+     */
+    final boolean isSaturated() {
+        int maxTotal = bounds >>> SWIDTH;
+        for (long c;;) {
+            if (((int)(c = ctl) & ~UNSIGNALLED) != 0)
+                return false;
+            if ((short)(c >>> TC_SHIFT) >= maxTotal)
+                return true;
+            long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK);
+            if (compareAndSetCtl(c, nc))
+                return !createWorker();
+        }
+    }
+
+    /**
+     * Returns true if can start terminating if enabled, or already terminated
+     */
+    final boolean canStop() {
+        outer: for (long oldSum = 0L;;) { // repeat until stable
+            int md; WorkQueue[] qs;  long c;
+            if ((qs = queues) == null || ((md = mode) & STOP) != 0)
+                return true;
+            if ((md & SMASK) + (int)((c = ctl) >> RC_SHIFT) > 0)
+                break;
+            long checkSum = c;
+            for (int i = 1; i < qs.length; i += 2) { // scan submitters
+                WorkQueue q; ForkJoinTask<?>[] a; int s = 0, cap;
+                if ((q = qs[i]) != null && (a = q.array) != null &&
+                    (cap = a.length) > 0 &&
+                    ((s = q.top) != q.base || a[(cap - 1) & s] != null ||
+                     q.source != 0))
+                    break outer;
+                checkSum += (((long)i) << 32) ^ s;
             }
+            if (oldSum == (oldSum = checkSum) && queues == qs)
+                return true;
         }
+        return (mode & STOP) != 0; // recheck mode on false return
     }
 
     /**
      * Tries to decrement counts (sometimes implicitly) and possibly
-     * arrange for a compensating worker in preparation for blocking:
-     * If not all core workers yet exist, creates one, else if any are
-     * unreleased (possibly including caller) releases one, else if
-     * fewer than the minimum allowed number of workers running,
-     * checks to see that they are all active, and if so creates an
-     * extra worker unless over maximum limit and policy is to
-     * saturate.  Most of these steps can fail due to interference, in
-     * which case 0 is returned so caller will retry. A negative
-     * return value indicates that the caller doesn't need to
-     * re-adjust counts when later unblocked.
-     *
-     * @return 1: block then adjust, -1: block without adjust, 0 : retry
-     */
-    private int tryCompensate(WorkQueue w) {
-        int t, n, sp;
-        long c = ctl;
-        WorkQueue[] ws = workQueues;
-        if ((t = (short)(c >>> TC_SHIFT)) >= 0) {
-            if (ws == null || (n = ws.length) <= 0 || w == null)
-                return 0;                        // disabled
-            else if ((sp = (int)c) != 0) {       // replace or release
-                WorkQueue v = ws[sp & (n - 1)];
-                int wp = w.phase;
-                long uc = UC_MASK & ((wp < 0) ? c + RC_UNIT : c);
-                int np = sp & ~UNSIGNALLED;
-                if (v != null) {
-                    int vp = v.phase;
+     * arrange for a compensating worker in preparation for
+     * blocking. May fail due to interference, in which case -1 is
+     * returned so caller may retry. A zero return value indicates
+     * that the caller doesn't need to re-adjust counts when later
+     * unblocked.
+     *
+     * @param c incoming ctl value
+     * @return UNCOMPENSATE: block then adjust, 0: block, -1 : retry
+     */
+    private int tryCompensate(long c) {
+        Predicate<? super ForkJoinPool> sat;
+        int b = bounds; // counts are signed; centered at parallelism level == 0
+        int minActive = (short)(b & SMASK),
+            maxTotal  = b >>> SWIDTH,
+            active    = (int)(c >> RC_SHIFT),
+            total     = (short)(c >>> TC_SHIFT),
+            sp        = (int)c & ~UNSIGNALLED;
+        if (total >= 0) {
+            if (sp != 0) {                        // activate idle worker
+                WorkQueue[] qs; int n; WorkQueue v;
+                if ((qs = queues) != null && (n = qs.length) > 0 &&
+                    (v = qs[sp & (n - 1)]) != null) {
                     Thread vt = v.owner;
-                    long nc = ((long)v.stackPred & SP_MASK) | uc;
-                    if (vp == sp && CTL.compareAndSet(this, c, nc)) {
-                        v.phase = np;
-                        if (vt != null && v.source < 0)
-                            LockSupport.unpark(vt);
-                        return (wp < 0) ? -1 : 1;
+                    long nc = ((long)v.stackPred & SP_MASK) | (UC_MASK & c);
+                    if (compareAndSetCtl(c, nc)) {
+                        v.phase = sp;
+                        LockSupport.unpark(vt);
+                        return UNCOMPENSATE;
                     }
                 }
-                return 0;
+                return -1;                        // retry
             }
-            else if ((int)(c >> RC_SHIFT) -      // reduce parallelism
-                     (short)(bounds & SMASK) > 0) {
+            else if (active > minActive) {        // reduce parallelism
                 long nc = ((RC_MASK & (c - RC_UNIT)) | (~RC_MASK & c));
-                return CTL.compareAndSet(this, c, nc) ? 1 : 0;
-            }
-            else {                               // validate
-                int md = mode, pc = md & SMASK, tc = pc + t, bc = 0;
-                boolean unstable = false;
-                for (int i = 1; i < n; i += 2) {
-                    WorkQueue q; Thread wt; Thread.State ts;
-                    if ((q = ws[i]) != null) {
-                        if (q.source == 0) {
-                            unstable = true;
-                            break;
-                        }
-                        else {
-                            --tc;
-                            if ((wt = q.owner) != null &&
-                                ((ts = wt.getState()) == Thread.State.BLOCKED ||
-                                 ts == Thread.State.WAITING))
-                                ++bc;            // worker is blocking
-                        }
-                    }
-                }
-                if (unstable || tc != 0 || ctl != c)
-                    return 0;                    // inconsistent
-                else if (t + pc >= MAX_CAP || t >= (bounds >>> SWIDTH)) {
-                    Predicate<? super ForkJoinPool> sat;
-                    if ((sat = saturate) != null && sat.test(this))
-                        return -1;
-                    else if (bc < pc) {          // lagging
-                        Thread.yield();          // for retry spins
-                        return 0;
-                    }
-                    else
-                        throw new RejectedExecutionException(
-                            "Thread limit exceeded replacing blocked worker");
-                }
+                return compareAndSetCtl(c, nc) ? UNCOMPENSATE : -1;
             }
         }
+        if (total < maxTotal) {                   // expand pool
+            long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK);
+            return (!compareAndSetCtl(c, nc) ? -1 :
+                    !createWorker() ? 0 : UNCOMPENSATE);
+        }
+        else if (!compareAndSetCtl(c, c))         // validate
+            return -1;
+        else if ((sat = saturate) != null && sat.test(this))
+            return 0;
+        else
+            throw new RejectedExecutionException(
+                "Thread limit exceeded replacing blocked worker");
+    }
 
-        long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK); // expand pool
-        return CTL.compareAndSet(this, c, nc) && createWorker() ? 1 : 0;
+    /**
+     * Readjusts RC count; called from ForkJoinTask after blocking.
+     */
+    final void uncompensate() {
+        getAndAddCtl(RC_UNIT);
     }
 
     /**
-     * Top-level runloop for workers, called by ForkJoinWorkerThread.run.
-     * See above for explanation.
+     * Helps if possible until the given task is done.  Scans other
+     * queues for a task produced by one of w's stealers; returning
+     * compensated blocking sentinel if none are found.
+     *
+     * @param task the task
+     * @param w caller's WorkQueue
+     * @return task status on exit, or UNCOMPENSATE for compensated blocking
      */
-    final void runWorker(WorkQueue w) {
-        int r = (w.id ^ ThreadLocalRandom.nextSecondarySeed()) | FIFO; // rng
-        w.array = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY]; // initialize
-        for (;;) {
-            int phase;
-            if (scan(w, r)) {                     // scan until apparently empty
-                r ^= r << 13; r ^= r >>> 17; r ^= r << 5; // move (xorshift)
-            }
-            else if ((phase = w.phase) >= 0) {    // enqueue, then rescan
-                long np = (w.phase = (phase + SS_SEQ) | UNSIGNALLED) & SP_MASK;
-                long c, nc;
-                do {
-                    w.stackPred = (int)(c = ctl);
-                    nc = ((c - RC_UNIT) & UC_MASK) | np;
-                } while (!CTL.weakCompareAndSet(this, c, nc));
-            }
-            else {                                // already queued
-                int pred = w.stackPred;
-                Thread.interrupted();             // clear before park
-                w.source = DORMANT;               // enable signal
-                long c = ctl;
-                int md = mode, rc = (md & SMASK) + (int)(c >> RC_SHIFT);
-                if (md < 0)                       // terminating
+    final int helpJoin(ForkJoinTask<?> task, WorkQueue w) {
+        int s = 0;
+        if (task != null && w != null) {
+            int wsrc = w.source, wid = w.config & SMASK, r = wid + 2;
+            boolean scan = true;
+            long c = 0L;                          // track ctl stability
+            outer: for (;;) {
+                if ((s = task.status) < 0)
                     break;
-                else if (rc <= 0 && (md & SHUTDOWN) != 0 &&
-                         tryTerminate(false, false))
-                    break;                        // quiescent shutdown
-                else if (w.phase < 0) {
-                    if (rc <= 0 && pred != 0 && phase == (int)c) {
-                        long nc = (UC_MASK & (c - TC_UNIT)) | (SP_MASK & pred);
-                        long d = keepAlive + System.currentTimeMillis();
-                        LockSupport.parkUntil(this, d);
-                        if (ctl == c &&           // drop on timeout if all idle
-                            d - System.currentTimeMillis() <= TIMEOUT_SLOP &&
-                            CTL.compareAndSet(this, c, nc)) {
-                            w.phase = QUIET;
-                            break;
+                else if (scan = !scan) {          // previous scan was empty
+                    if (mode < 0)
+                        ForkJoinTask.cancelIgnoringExceptions(task);
+                    else if (c == (c = ctl) && (s = tryCompensate(c)) >= 0)
+                        break;                    // block
+                }
+                else {                            // scan for subtasks
+                    WorkQueue[] qs = queues;
+                    int n = (qs == null) ? 0 : qs.length, m = n - 1;
+                    for (int i = n; i > 0; i -= 2, r += 2) {
+                        int j; WorkQueue q, x, y; ForkJoinTask<?>[] a;
+                        if ((q = qs[j = r & m]) != null) {
+                            int sq = q.source & SMASK, cap, b;
+                            if ((a = q.array) != null && (cap = a.length) > 0) {
+                                int k = (cap - 1) & (b = q.base);
+                                int nextBase = b + 1, src = j | SRC, sx;
+                                ForkJoinTask<?> t = WorkQueue.getSlot(a, k);
+                                boolean eligible = sq == wid ||
+                                    ((x = qs[sq & m]) != null &&   // indirect
+                                     ((sx = (x.source & SMASK)) == wid ||
+                                      ((y = qs[sx & m]) != null && // 2-indirect
+                                       (y.source & SMASK) == wid)));
+                                if ((s = task.status) < 0)
+                                    break outer;
+                                else if ((q.source & SMASK) != sq ||
+                                         q.base != b)
+                                    scan = true;          // inconsistent
+                                else if (t == null)
+                                    scan |= (a[nextBase & (cap - 1)] != null ||
+                                             q.top != b); // lagging
+                                else if (eligible) {
+                                    if (WorkQueue.casSlotToNull(a, k, t)) {
+                                        q.base = nextBase;
+                                        w.source = src;
+                                        t.doExec();
+                                        w.source = wsrc;
+                                    }
+                                    scan = true;
+                                    break;
+                                }
+                            }
                         }
                     }
-                    else {
-                        LockSupport.park(this);
-                        if (w.phase < 0)          // one spurious wakeup check
-                            LockSupport.park(this);
-                    }
                 }
-                w.source = 0;                     // disable signal
             }
         }
+        return s;
     }
 
     /**
-     * Scans for and if found executes one or more top-level tasks from a queue.
+     * Extra helpJoin steps for CountedCompleters.  Scans for and runs
+     * subtasks of the given root task, returning if none are found.
      *
-     * @return true if found an apparently non-empty queue, and
-     * possibly ran task(s).
+     * @param task root of CountedCompleter computation
+     * @param w caller's WorkQueue
+     * @param owned true if owned by a ForkJoinWorkerThread
+     * @return task status on exit
      */
-    private boolean scan(WorkQueue w, int r) {
-        WorkQueue[] ws; int n;
-        if ((ws = workQueues) != null && (n = ws.length) > 0 && w != null) {
-            for (int m = n - 1, j = r & m;;) {
-                WorkQueue q; int b;
-                if ((q = ws[j]) != null && q.top != (b = q.base)) {
-                    int qid = q.id;
-                    ForkJoinTask<?>[] a; int cap, k; ForkJoinTask<?> t;
-                    if ((a = q.array) != null && (cap = a.length) > 0) {
-                        t = (ForkJoinTask<?>)QA.getAcquire(a, k = (cap - 1) & b);
-                        if (q.base == b++ && t != null &&
-                            QA.compareAndSet(a, k, t, null)) {
-                            q.base = b;
-                            w.source = qid;
-                            if (a[(cap - 1) & b] != null)
-                                signalWork(q);    // help signal if more tasks
-                            w.topLevelExec(t, q,  // random fairness bound
-                                           (r | (1 << TOP_BOUND_SHIFT)) & SMASK);
+    final int helpComplete(ForkJoinTask<?> task, WorkQueue w, boolean owned) {
+        int s = 0;
+        if (task != null && w != null) {
+            int r = w.config;
+            boolean scan = true, locals = true;
+            long c = 0L;
+            outer: for (;;) {
+                if (locals) {                     // try locals before scanning
+                    if ((s = w.helpComplete(task, owned, 0)) < 0)
+                        break;
+                    locals = false;
+                }
+                else if ((s = task.status) < 0)
+                    break;
+                else if (scan = !scan) {
+                    if (c == (c = ctl))
+                        break;
+                }
+                else {                            // scan for subtasks
+                    WorkQueue[] qs = queues;
+                    int n = (qs == null) ? 0 : qs.length;
+                    for (int i = n; i > 0; --i, ++r) {
+                        int j, cap, b; WorkQueue q; ForkJoinTask<?>[] a;
+                        boolean eligible = false;
+                        if ((q = qs[j = r & (n - 1)]) != null &&
+                            (a = q.array) != null && (cap = a.length) > 0) {
+                            int k = (cap - 1) & (b = q.base), nextBase = b + 1;
+                            ForkJoinTask<?> t = WorkQueue.getSlot(a, k);
+                            if (t instanceof CountedCompleter) {
+                                CountedCompleter<?> f = (CountedCompleter<?>)t;
+                                do {} while (!(eligible = (f == task)) &&
+                                             (f = f.completer) != null);
+                            }
+                            if ((s = task.status) < 0)
+                                break outer;
+                            else if (q.base != b)
+                                scan = true;       // inconsistent
+                            else if (t == null)
+                                scan |= (a[nextBase & (cap - 1)] != null ||
+                                         q.top != b);
+                            else if (eligible) {
+                                if (WorkQueue.casSlotToNull(a, k, t)) {
+                                    q.setBaseOpaque(nextBase);
+                                    t.doExec();
+                                    locals = true;
+                                }
+                                scan = true;
+                                break;
+                            }
                         }
                     }
-                    return true;
                 }
-                else if (--n > 0)
-                    j = (j + 1) & m;
-                else
-                    break;
             }
         }
-        return false;
+        return s;
     }
 
     /**
-     * Helps and/or blocks until the given task is done or timeout.
-     * First tries locally helping, then scans other queues for a task
-     * produced by one of w's stealers; compensating and blocking if
-     * none are found (rescanning if tryCompensate fails).
+     * Scans for and returns a polled task, if available.  Used only
+     * for untracked polls. Begins scan at an index (scanRover)
+     * advanced on each call, to avoid systematic unfairness.
      *
-     * @param w caller
-     * @param task the task
-     * @param deadline for timed waits, if nonzero
-     * @return task status on exit
+     * @param submissionsOnly if true, only scan submission queues
      */
-    final int awaitJoin(WorkQueue w, ForkJoinTask<?> task, long deadline) {
-        int s = 0;
-        int seed = ThreadLocalRandom.nextSecondarySeed();
-        if (w != null && task != null &&
-            (!(task instanceof CountedCompleter) ||
-             (s = w.helpCC((CountedCompleter<?>)task, 0, false)) >= 0)) {
-            w.tryRemoveAndExec(task);
-            int src = w.source, id = w.id;
-            int r = (seed >>> 16) | 1, step = (seed & ~1) | 2;
-            s = task.status;
-            while (s >= 0) {
-                WorkQueue[] ws;
-                int n = (ws = workQueues) == null ? 0 : ws.length, m = n - 1;
-                while (n > 0) {
-                    WorkQueue q; int b;
-                    if ((q = ws[r & m]) != null && q.source == id &&
-                        q.top != (b = q.base)) {
-                        ForkJoinTask<?>[] a; int cap, k;
-                        int qid = q.id;
-                        if ((a = q.array) != null && (cap = a.length) > 0) {
-                            ForkJoinTask<?> t = (ForkJoinTask<?>)
-                                QA.getAcquire(a, k = (cap - 1) & b);
-                            if (q.source == id && q.base == b++ &&
-                                t != null && QA.compareAndSet(a, k, t, null)) {
-                                q.base = b;
-                                w.source = qid;
-                                t.doExec();
-                                w.source = src;
-                            }
-                        }
-                        break;
-                    }
+    private ForkJoinTask<?> pollScan(boolean submissionsOnly) {
+        VarHandle.acquireFence();
+        int r = scanRover += 0x61c88647; // Weyl increment; raciness OK
+        if (submissionsOnly)             // even indices only
+            r &= ~1;
+        int step = (submissionsOnly) ? 2 : 1;
+        WorkQueue[] qs; int n;
+        while ((qs = queues) != null && (n = qs.length) > 0) {
+            boolean scan = false;
+            for (int i = 0; i < n; i += step) {
+                int j, cap, b; WorkQueue q; ForkJoinTask<?>[] a;
+                if ((q = qs[j = (n - 1) & (r + i)]) != null &&
+                    (a = q.array) != null && (cap = a.length) > 0) {
+                    int k = (cap - 1) & (b = q.base), nextBase = b + 1;
+                    ForkJoinTask<?> t = WorkQueue.getSlot(a, k);
+                    if (q.base != b)
+                        scan = true;
+                    else if (t == null)
+                        scan |= (q.top != b || a[nextBase & (cap - 1)] != null);
+                    else if (!WorkQueue.casSlotToNull(a, k, t))
+                        scan = true;
                     else {
-                        r += step;
-                        --n;
-                    }
-                }
-                if ((s = task.status) < 0)
-                    break;
-                else if (n == 0) { // empty scan
-                    long ms, ns; int block;
-                    if (deadline == 0L)
-                        ms = 0L;                       // untimed
-                    else if ((ns = deadline - System.nanoTime()) <= 0L)
-                        break;                         // timeout
-                    else if ((ms = TimeUnit.NANOSECONDS.toMillis(ns)) <= 0L)
-                        ms = 1L;                       // avoid 0 for timed wait
-                    if ((block = tryCompensate(w)) != 0) {
-                        task.internalWait(ms);
-                        CTL.getAndAdd(this, (block > 0) ? RC_UNIT : 0L);
+                        q.setBaseOpaque(nextBase);
+                        return t;
                     }
-                    s = task.status;
                 }
             }
+            if (!scan && queues == qs)
+                break;
         }
-        return s;
+        return null;
     }
 
     /**
      * Runs tasks until {@code isQuiescent()}. Rather than blocking
      * when tasks cannot be found, rescans until all others cannot
      * find tasks either.
-     */
-    final void helpQuiescePool(WorkQueue w) {
-        int prevSrc = w.source;
-        int seed = ThreadLocalRandom.nextSecondarySeed();
-        int r = seed >>> 16, step = r | 1;
-        for (int source = prevSrc, released = -1;;) { // -1 until known
-            ForkJoinTask<?> localTask; WorkQueue[] ws;
-            while ((localTask = w.nextLocalTask()) != null)
-                localTask.doExec();
-            if (w.phase >= 0 && released == -1)
-                released = 1;
-            boolean quiet = true, empty = true;
-            int n = (ws = workQueues) == null ? 0 : ws.length;
-            for (int m = n - 1; n > 0; r += step, --n) {
-                WorkQueue q; int b;
-                if ((q = ws[r & m]) != null) {
-                    int qs = q.source;
-                    if (q.top != (b = q.base)) {
-                        quiet = empty = false;
-                        ForkJoinTask<?>[] a; int cap, k;
-                        int qid = q.id;
-                        if ((a = q.array) != null && (cap = a.length) > 0) {
-                            if (released == 0) {    // increment
-                                released = 1;
-                                CTL.getAndAdd(this, RC_UNIT);
-                            }
-                            ForkJoinTask<?> t = (ForkJoinTask<?>)
-                                QA.getAcquire(a, k = (cap - 1) & b);
-                            if (q.base == b++ && t != null &&
-                                QA.compareAndSet(a, k, t, null)) {
-                                q.base = b;
-                                w.source = qid;
-                                t.doExec();
-                                w.source = source = prevSrc;
-                            }
+     *
+     * @param nanos max wait time (Long.MAX_VALUE if effectively untimed)
+     * @param interruptible true if return on interrupt
+     * @return positive if quiescent, negative if interrupted, else 0
+     */
+    final int helpQuiescePool(WorkQueue w, long nanos, boolean interruptible) {
+        if (w == null)
+            return 0;
+        long startTime = System.nanoTime(), parkTime = 0L;
+        int prevSrc = w.source, wsrc = prevSrc, cfg = w.config, r = cfg + 1;
+        for (boolean active = true, locals = true;;) {
+            boolean busy = false, scan = false;
+            if (locals) {  // run local tasks before (re)polling
+                locals = false;
+                for (ForkJoinTask<?> u; (u = w.nextLocalTask(cfg)) != null;)
+                    u.doExec();
+            }
+            WorkQueue[] qs = queues;
+            int n = (qs == null) ? 0 : qs.length;
+            for (int i = n; i > 0; --i, ++r) {
+                int j, b, cap; WorkQueue q; ForkJoinTask<?>[] a;
+                if ((q = qs[j = (n - 1) & r]) != null && q != w &&
+                    (a = q.array) != null && (cap = a.length) > 0) {
+                    int k = (cap - 1) & (b = q.base);
+                    int nextBase = b + 1, src = j | SRC;
+                    ForkJoinTask<?> t = WorkQueue.getSlot(a, k);
+                    if (q.base != b)
+                        busy = scan = true;
+                    else if (t != null) {
+                        busy = scan = true;
+                        if (!active) {    // increment before taking
+                            active = true;
+                            getAndAddCtl(RC_UNIT);
+                        }
+                        if (WorkQueue.casSlotToNull(a, k, t)) {
+                            q.base = nextBase;
+                            w.source = src;
+                            t.doExec();
+                            w.source = wsrc = prevSrc;
+                            locals = true;
                         }
                         break;
                     }
-                    else if ((qs & QUIET) == 0)
-                        quiet = false;
+                    else if (!busy) {
+                        if (q.top != b || a[nextBase & (cap - 1)] != null)
+                            busy = scan = true;
+                        else if (q.source != QUIET && q.phase >= 0)
+                            busy = true;
+                    }
                 }
             }
-            if (quiet) {
-                if (released == 0)
-                    CTL.getAndAdd(this, RC_UNIT);
-                w.source = prevSrc;
-                break;
-            }
-            else if (empty) {
-                if (source != QUIET)
-                    w.source = source = QUIET;
-                if (released == 1) {                 // decrement
-                    released = 0;
-                    CTL.getAndAdd(this, RC_MASK & -RC_UNIT);
+            VarHandle.acquireFence();
+            if (!scan && queues == qs) {
+                boolean interrupted;
+                if (!busy) {
+                    w.source = prevSrc;
+                    if (!active)
+                        getAndAddCtl(RC_UNIT);
+                    return 1;
+                }
+                if (wsrc != QUIET)
+                    w.source = wsrc = QUIET;
+                if (active) {                 // decrement
+                    active = false;
+                    parkTime = 0L;
+                    getAndAddCtl(RC_MASK & -RC_UNIT);
+                }
+                else if (parkTime == 0L) {
+                    parkTime = 1L << 10; // initially about 1 usec
+                    Thread.yield();
+                }
+                else if ((interrupted = interruptible && Thread.interrupted()) ||
+                         System.nanoTime() - startTime > nanos) {
+                    getAndAddCtl(RC_UNIT);
+                    return interrupted ? -1 : 0;
+                }
+                else {
+                    LockSupport.parkNanos(this, parkTime);
+                    if (parkTime < nanos >>> 8 && parkTime < 1L << 20)
+                        parkTime <<= 1;  // max sleep approx 1 sec or 1% nanos
                 }
             }
         }
     }
 
     /**
-     * Scans for and returns a polled task, if available.
-     * Used only for untracked polls.
+     * Helps quiesce from external caller until done, interrupted, or timeout
      *
-     * @param submissionsOnly if true, only scan submission queues
+     * @param nanos max wait time (Long.MAX_VALUE if effectively untimed)
+     * @param interruptible true if return on interrupt
+     * @return positive if quiescent, negative if interrupted, else 0
      */
-    private ForkJoinTask<?> pollScan(boolean submissionsOnly) {
-        WorkQueue[] ws; int n;
-        rescan: while ((mode & STOP) == 0 && (ws = workQueues) != null &&
-                      (n = ws.length) > 0) {
-            int m = n - 1;
-            int r = ThreadLocalRandom.nextSecondarySeed();
-            int h = r >>> 16;
-            int origin, step;
-            if (submissionsOnly) {
-                origin = (r & ~1) & m;         // even indices and steps
-                step = (h & ~1) | 2;
+    final int externalHelpQuiescePool(long nanos, boolean interruptible) {
+        for (long startTime = System.nanoTime(), parkTime = 0L;;) {
+            ForkJoinTask<?> t;
+            if ((t = pollScan(false)) != null) {
+                t.doExec();
+                parkTime = 0L;
             }
-            else {
-                origin = r & m;
-                step = h | 1;
+            else if (canStop())
+                return 1;
+            else if (parkTime == 0L) {
+                parkTime = 1L << 10;
+                Thread.yield();
             }
-            boolean nonempty = false;
-            for (int i = origin, oldSum = 0, checkSum = 0;;) {
-                WorkQueue q;
-                if ((q = ws[i]) != null) {
-                    int b; ForkJoinTask<?> t;
-                    if (q.top - (b = q.base) > 0) {
-                        nonempty = true;
-                        if ((t = q.poll()) != null)
-                            return t;
-                    }
-                    else
-                        checkSum += b + q.id;
-                }
-                if ((i = (i + step) & m) == origin) {
-                    if (!nonempty && oldSum == (oldSum = checkSum))
-                        break rescan;
-                    checkSum = 0;
-                    nonempty = false;
-                }
+            else if ((System.nanoTime() - startTime) > nanos)
+                return 0;
+            else if (interruptible && Thread.interrupted())
+                return -1;
+            else {
+                LockSupport.parkNanos(this, parkTime);
+                if (parkTime < nanos >>> 8 && parkTime < 1L << 20)
+                    parkTime <<= 1;
             }
         }
-        return null;
     }
 
     /**
@@ -1862,7 +2113,7 @@ private ForkJoinTask<?> pollScan(boolean submissionsOnly) {
      */
     final ForkJoinTask<?> nextTaskFor(WorkQueue w) {
         ForkJoinTask<?> t;
-        if (w == null || (t = w.nextLocalTask()) == null)
+        if (w == null || (t = w.nextLocalTask(w.config)) == null)
             t = pollScan(false);
         return t;
     }
@@ -1870,115 +2121,94 @@ final ForkJoinTask<?> nextTaskFor(WorkQueue w) {
     // External operations
 
     /**
-     * Adds the given task to a submission queue at submitter's
-     * current queue, creating one if null or contended.
-     *
-     * @param task the task. Caller must ensure non-null.
+     * Finds and locks a WorkQueue for an external submitter, or
+     * returns null if shutdown or terminating.
      */
-    final void externalPush(ForkJoinTask<?> task) {
-        int r;                                // initialize caller's probe
+    final WorkQueue submissionQueue() {
+        int r;
         if ((r = ThreadLocalRandom.getProbe()) == 0) {
-            ThreadLocalRandom.localInit();
+            ThreadLocalRandom.localInit();           // initialize caller's probe
             r = ThreadLocalRandom.getProbe();
         }
-        for (;;) {
-            WorkQueue q;
-            int md = mode, n;
-            WorkQueue[] ws = workQueues;
-            if ((md & SHUTDOWN) != 0 || ws == null || (n = ws.length) <= 0)
-                throw new RejectedExecutionException();
-            else if ((q = ws[(n - 1) & r & SQMASK]) == null) { // add queue
-                int qid = (r | QUIET) & ~(FIFO | OWNED);
-                Object lock = workerNamePrefix;
-                ForkJoinTask<?>[] qa =
-                    new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
-                q = new WorkQueue(this, null);
-                q.array = qa;
-                q.id = qid;
-                q.source = QUIET;
-                if (lock != null) {     // unless disabled, lock pool to install
-                    synchronized (lock) {
-                        WorkQueue[] vs; int i, vn;
-                        if ((vs = workQueues) != null && (vn = vs.length) > 0 &&
-                            vs[i = qid & (vn - 1) & SQMASK] == null)
-                            vs[i] = q;  // else another thread already installed
-                    }
+        for (int id = r << 1;;) {                    // even indices only
+            int md = mode, n, i; WorkQueue q; ReentrantLock lock;
+            WorkQueue[] qs = queues;
+            if ((md & SHUTDOWN) != 0 || qs == null || (n = qs.length) <= 0)
+                return null;
+            else if ((q = qs[i = (n - 1) & id]) == null) {
+                if ((lock = registrationLock) != null) {
+                    WorkQueue w = new WorkQueue(id | SRC);
+                    lock.lock();                    // install under lock
+                    if (qs[i] == null)
+                        qs[i] = w;                  // else lost race; discard
+                    lock.unlock();
                 }
             }
-            else if (!q.tryLockPhase()) // move if busy
-                r = ThreadLocalRandom.advanceProbe(r);
-            else {
-                if (q.lockedPush(task))
-                    signalWork(null);
-                return;
-            }
+            else if (!q.tryLock())                  // move and restart
+                id = (r = ThreadLocalRandom.advanceProbe(r)) << 1;
+            else
+                return q;
         }
     }
 
+    /**
+     * Adds the given task to an external submission queue, or throws
+     * exception if shutdown or terminating.
+     *
+     * @param task the task. Caller must ensure non-null.
+     */
+    final void externalPush(ForkJoinTask<?> task) {
+        WorkQueue q;
+        if ((q = submissionQueue()) == null)
+            throw new RejectedExecutionException(); // shutdown or disabled
+        else if (q.lockedPush(task))
+            signalWork();
+    }
+
     /**
      * Pushes a possibly-external submission.
      */
     private <T> ForkJoinTask<T> externalSubmit(ForkJoinTask<T> task) {
-        Thread t; ForkJoinWorkerThread w; WorkQueue q;
+        Thread t; ForkJoinWorkerThread wt; WorkQueue q;
         if (task == null)
             throw new NullPointerException();
         if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) &&
-            (w = (ForkJoinWorkerThread)t).pool == this &&
-            (q = w.workQueue) != null)
-            q.push(task);
+            (q = (wt = (ForkJoinWorkerThread)t).workQueue) != null &&
+            wt.pool == this)
+            q.push(task, this);
         else
             externalPush(task);
         return task;
     }
 
     /**
-     * Returns common pool queue for an external thread.
+     * Returns common pool queue for an external thread that has
+     * possibly ever submitted a common pool task (nonzero probe), or
+     * null if none.
      */
-    static WorkQueue commonSubmitterQueue() {
-        ForkJoinPool p = common;
-        int r = ThreadLocalRandom.getProbe();
-        WorkQueue[] ws; int n;
-        return (p != null && (ws = p.workQueues) != null &&
-                (n = ws.length) > 0) ?
-            ws[(n - 1) & r & SQMASK] : null;
+    static WorkQueue commonQueue() {
+        ForkJoinPool p; WorkQueue[] qs;
+        int r = ThreadLocalRandom.getProbe(), n;
+        return ((p = common) != null && (qs = p.queues) != null &&
+                (n = qs.length) > 0 && r != 0) ?
+            qs[(n - 1) & (r << 1)] : null;
     }
 
     /**
-     * Performs tryUnpush for an external submitter.
-     */
-    final boolean tryExternalUnpush(ForkJoinTask<?> task) {
-        int r = ThreadLocalRandom.getProbe();
-        WorkQueue[] ws; WorkQueue w; int n;
-        return ((ws = workQueues) != null &&
-                (n = ws.length) > 0 &&
-                (w = ws[(n - 1) & r & SQMASK]) != null &&
-                w.tryLockedUnpush(task));
-    }
-
-    /**
-     * Performs helpComplete for an external submitter.
-     */
-    final int externalHelpComplete(CountedCompleter<?> task, int maxTasks) {
-        int r = ThreadLocalRandom.getProbe();
-        WorkQueue[] ws; WorkQueue w; int n;
-        return ((ws = workQueues) != null && (n = ws.length) > 0 &&
-                (w = ws[(n - 1) & r & SQMASK]) != null) ?
-            w.helpCC(task, maxTasks, true) : 0;
-    }
-
-    /**
-     * Tries to steal and run tasks within the target's computation.
-     * The maxTasks argument supports external usages; internal calls
-     * use zero, allowing unbounded steps (external calls trap
-     * non-positive values).
-     *
-     * @param w caller
-     * @param maxTasks if non-zero, the maximum number of other tasks to run
-     * @return task status on exit
+     * If the given executor is a ForkJoinPool, poll and execute
+     * AsynchronousCompletionTasks from worker's queue until none are
+     * available or blocker is released.
      */
-    final int helpComplete(WorkQueue w, CountedCompleter<?> task,
-                           int maxTasks) {
-        return (w == null) ? 0 : w.helpCC(task, maxTasks, false);
+    static void helpAsyncBlocker(Executor e, ManagedBlocker blocker) {
+        WorkQueue w = null; Thread t; ForkJoinWorkerThread wt;
+        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
+            if ((wt = (ForkJoinWorkerThread)t).pool == e)
+                w = wt.workQueue;
+        }
+        else if (e == common)
+            w = commonQueue();
+        if (w != null)
+            w.helpAsyncBlocker(blocker);
     }
 
     /**
@@ -2051,83 +2281,41 @@ static int getSurplusQueuedTaskCount() {
      * @return true if terminating or terminated
      */
     private boolean tryTerminate(boolean now, boolean enable) {
-        int md; // 3 phases: try to set SHUTDOWN, then STOP, then TERMINATED
-
-        while (((md = mode) & SHUTDOWN) == 0) {
-            if (!enable || this == common)        // cannot shutdown
+        int md; // try to set SHUTDOWN, then STOP, then help terminate
+        if (((md = mode) & SHUTDOWN) == 0) {
+            if (!enable)
                 return false;
-            else
-                MODE.compareAndSet(this, md, md | SHUTDOWN);
-        }
-
-        while (((md = mode) & STOP) == 0) {       // try to initiate termination
-            if (!now) {                           // check if quiescent & empty
-                for (long oldSum = 0L;;) {        // repeat until stable
-                    boolean running = false;
-                    long checkSum = ctl;
-                    WorkQueue[] ws = workQueues;
-                    if ((md & SMASK) + (int)(checkSum >> RC_SHIFT) > 0)
-                        running = true;
-                    else if (ws != null) {
-                        WorkQueue w;
-                        for (int i = 0; i < ws.length; ++i) {
-                            if ((w = ws[i]) != null) {
-                                int s = w.source, p = w.phase;
-                                int d = w.id, b = w.base;
-                                if (b != w.top ||
-                                    ((d & 1) == 1 && (s >= 0 || p >= 0))) {
-                                    running = true;
-                                    break;     // working, scanning, or have work
-                                }
-                                checkSum += (((long)s << 48) + ((long)p << 32) +
-                                             ((long)b << 16) + (long)d);
-                            }
-                        }
-                    }
-                    if (((md = mode) & STOP) != 0)
-                        break;                 // already triggered
-                    else if (running)
-                        return false;
-                    else if (workQueues == ws && oldSum == (oldSum = checkSum))
-                        break;
-                }
-            }
-            if ((md & STOP) == 0)
-                MODE.compareAndSet(this, md, md | STOP);
-        }
-
-        while (((md = mode) & TERMINATED) == 0) { // help terminate others
-            for (long oldSum = 0L;;) {            // repeat until stable
-                WorkQueue[] ws; WorkQueue w;
-                long checkSum = ctl;
-                if ((ws = workQueues) != null) {
-                    for (int i = 0; i < ws.length; ++i) {
-                        if ((w = ws[i]) != null) {
-                            ForkJoinWorkerThread wt = w.owner;
-                            w.cancelAll();        // clear queues
-                            if (wt != null) {
-                                try {             // unblock join or park
-                                    wt.interrupt();
-                                } catch (Throwable ignore) {
-                                }
-                            }
-                            checkSum += ((long)w.phase << 32) + w.base;
+            md = getAndBitwiseOrMode(SHUTDOWN);
+        }
+        if ((md & STOP) == 0) {
+            if (!now && !canStop())
+                return false;
+            md = getAndBitwiseOrMode(STOP);
+        }
+        for (int k = 0; k < 2; ++k) { // twice in case of lagging qs updates
+            for (ForkJoinTask<?> t; (t = pollScan(false)) != null; )
+                ForkJoinTask.cancelIgnoringExceptions(t); // help cancel
+            WorkQueue[] qs; int n; WorkQueue q; Thread thread;
+            if ((qs = queues) != null && (n = qs.length) > 0) {
+                for (int j = 1; j < n; j += 2) { // unblock other workers
+                    if ((q = qs[j]) != null && (thread = q.owner) != null &&
+                        !thread.isInterrupted()) {
+                        try {
+                            thread.interrupt();
+                        } catch (Throwable ignore) {
                         }
                     }
                 }
-                if (((md = mode) & TERMINATED) != 0 ||
-                    (workQueues == ws && oldSum == (oldSum = checkSum)))
-                    break;
             }
-            if ((md & TERMINATED) != 0)
-                break;
-            else if ((md & SMASK) + (short)(ctl >>> TC_SHIFT) > 0)
-                break;
-            else if (MODE.compareAndSet(this, md, md | TERMINATED)) {
-                synchronized (this) {
-                    notifyAll();                  // for awaitTermination
-                }
-                break;
+            ReentrantLock lock; Condition cond; // signal when no workers
+            if (((md = mode) & TERMINATED) == 0 &&
+                (md & SMASK) + (short)(ctl >>> TC_SHIFT) <= 0 &&
+                (getAndBitwiseOrMode(TERMINATED) & TERMINATED) == 0 &&
+                (lock = registrationLock) != null) {
+                lock.lock();
+                if ((cond = termination) != null)
+                    cond.signalAll();
+                lock.unlock();
             }
         }
         return true;
@@ -2298,37 +2486,31 @@ public ForkJoinPool(int parallelism,
                         Predicate<? super ForkJoinPool> saturate,
                         long keepAliveTime,
                         TimeUnit unit) {
-        // check, encode, pack parameters
-        if (parallelism <= 0 || parallelism > MAX_CAP ||
-            maximumPoolSize < parallelism || keepAliveTime <= 0L)
+        checkPermission();
+        int p = parallelism;
+        if (p <= 0 || p > MAX_CAP || p > maximumPoolSize || keepAliveTime <= 0L)
             throw new IllegalArgumentException();
-        if (factory == null)
+        if (factory == null || unit == null)
             throw new NullPointerException();
-        long ms = Math.max(unit.toMillis(keepAliveTime), TIMEOUT_SLOP);
-
-        int corep = Math.min(Math.max(corePoolSize, parallelism), MAX_CAP);
-        long c = ((((long)(-corep)       << TC_SHIFT) & TC_MASK) |
-                  (((long)(-parallelism) << RC_SHIFT) & RC_MASK));
-        int m = parallelism | (asyncMode ? FIFO : 0);
-        int maxSpares = Math.min(maximumPoolSize, MAX_CAP) - parallelism;
-        int minAvail = Math.min(Math.max(minimumRunnable, 0), MAX_CAP);
-        int b = ((minAvail - parallelism) & SMASK) | (maxSpares << SWIDTH);
-        int n = (parallelism > 1) ? parallelism - 1 : 1; // at least 2 slots
-        n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
-        n = (n + 1) << 1; // power of two, including space for submission queues
-
-        this.workerNamePrefix = "ForkJoinPool-" + nextPoolId() + "-worker-";
-        this.workQueues = new WorkQueue[n];
         this.factory = factory;
         this.ueh = handler;
         this.saturate = saturate;
-        this.keepAlive = ms;
-        this.bounds = b;
-        this.mode = m;
-        this.ctl = c;
-        checkPermission();
+        this.keepAlive = Math.max(unit.toMillis(keepAliveTime), TIMEOUT_SLOP);
+        int size = 1 << (33 - Integer.numberOfLeadingZeros(p - 1));
+        int corep = Math.min(Math.max(corePoolSize, p), MAX_CAP);
+        int maxSpares = Math.min(maximumPoolSize, MAX_CAP) - p;
+        int minAvail = Math.min(Math.max(minimumRunnable, 0), MAX_CAP);
+        this.bounds = ((minAvail - p) & SMASK) | (maxSpares << SWIDTH);
+        this.mode = p | (asyncMode ? FIFO : 0);
+        this.ctl = ((((long)(-corep) << TC_SHIFT) & TC_MASK) |
+                    (((long)(-p)     << RC_SHIFT) & RC_MASK));
+        this.registrationLock = new ReentrantLock();
+        this.queues = new WorkQueue[size];
+        String pid = Integer.toString(getAndAddPoolIds(1) + 1);
+        this.workerNamePrefix = "ForkJoinPool-" + pid + "-worker-";
     }
 
+    // helper method for commonPool constructor
     private static Object newInstanceFromSystemProperty(String property)
         throws ReflectiveOperationException {
         String className = System.getProperty(property);
@@ -2343,49 +2525,33 @@ private static Object newInstanceFromSystemProperty(String property)
      * overridden by system properties
      */
     private ForkJoinPool(byte forCommonPoolOnly) {
-        int parallelism = -1;
+        int parallelism = Runtime.getRuntime().availableProcessors() - 1;
         ForkJoinWorkerThreadFactory fac = null;
         UncaughtExceptionHandler handler = null;
         try {  // ignore exceptions in accessing/parsing properties
-            String pp = System.getProperty
-                ("java.util.concurrent.ForkJoinPool.common.parallelism");
-            if (pp != null)
-                parallelism = Integer.parseInt(pp);
             fac = (ForkJoinWorkerThreadFactory) newInstanceFromSystemProperty(
                 "java.util.concurrent.ForkJoinPool.common.threadFactory");
             handler = (UncaughtExceptionHandler) newInstanceFromSystemProperty(
                 "java.util.concurrent.ForkJoinPool.common.exceptionHandler");
+            String pp = System.getProperty
+                ("java.util.concurrent.ForkJoinPool.common.parallelism");
+            if (pp != null)
+                parallelism = Integer.parseInt(pp);
         } catch (Exception ignore) {
         }
-
-        if (fac == null) {
-            if (System.getSecurityManager() == null)
-                fac = defaultForkJoinWorkerThreadFactory;
-            else // use security-managed default
-                fac = new InnocuousForkJoinWorkerThreadFactory();
-        }
-        if (parallelism < 0 && // default 1 less than #cores
-            (parallelism = Runtime.getRuntime().availableProcessors() - 1) <= 0)
-            parallelism = 1;
-        if (parallelism > MAX_CAP)
-            parallelism = MAX_CAP;
-
-        long c = ((((long)(-parallelism) << TC_SHIFT) & TC_MASK) |
-                  (((long)(-parallelism) << RC_SHIFT) & RC_MASK));
-        int b = ((1 - parallelism) & SMASK) | (COMMON_MAX_SPARES << SWIDTH);
-        int n = (parallelism > 1) ? parallelism - 1 : 1;
-        n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
-        n = (n + 1) << 1;
-
-        this.workerNamePrefix = "ForkJoinPool.commonPool-worker-";
-        this.workQueues = new WorkQueue[n];
-        this.factory = fac;
+        int p = this.mode = Math.min(Math.max(parallelism, 0), MAX_CAP);
+        int size = 1 << (33 - Integer.numberOfLeadingZeros(p > 0 ? p - 1 : 1));
+        this.factory = (fac != null) ? fac :
+            new DefaultCommonPoolForkJoinWorkerThreadFactory();
         this.ueh = handler;
-        this.saturate = null;
         this.keepAlive = DEFAULT_KEEPALIVE;
-        this.bounds = b;
-        this.mode = parallelism;
-        this.ctl = c;
+        this.saturate = null;
+        this.workerNamePrefix = null;
+        this.bounds = ((1 - p) & SMASK) | (COMMON_MAX_SPARES << SWIDTH);
+        this.ctl = ((((long)(-p) << TC_SHIFT) & TC_MASK) |
+                    (((long)(-p) << RC_SHIFT) & RC_MASK));
+        this.queues = new WorkQueue[size];
+        this.registrationLock = new ReentrantLock();
     }
 
     /**
@@ -2426,8 +2592,6 @@ public static ForkJoinPool commonPool() {
      *         scheduled for execution
      */
     public <T> T invoke(ForkJoinTask<T> task) {
-        if (task == null)
-            throw new NullPointerException();
         externalSubmit(task);
         return task.join();
     }
@@ -2451,15 +2615,12 @@ public void execute(ForkJoinTask<?> task) {
      * @throws RejectedExecutionException if the task cannot be
      *         scheduled for execution
      */
+    @Override
+    @SuppressWarnings("unchecked")
     public void execute(Runnable task) {
-        if (task == null)
-            throw new NullPointerException();
-        ForkJoinTask<?> job;
-        if (task instanceof ForkJoinTask<?>) // avoid re-wrap
-            job = (ForkJoinTask<?>) task;
-        else
-            job = new ForkJoinTask.RunnableExecuteAction(task);
-        externalSubmit(job);
+        externalSubmit((task instanceof ForkJoinTask<?>)
+                       ? (ForkJoinTask<Void>) task // avoid re-wrap
+                       : new ForkJoinTask.RunnableExecuteAction(task));
     }
 
     /**
@@ -2481,6 +2642,7 @@ public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
      * @throws RejectedExecutionException if the task cannot be
      *         scheduled for execution
      */
+    @Override
     public <T> ForkJoinTask<T> submit(Callable<T> task) {
         return externalSubmit(new ForkJoinTask.AdaptedCallable<T>(task));
     }
@@ -2490,6 +2652,7 @@ public <T> ForkJoinTask<T> submit(Callable<T> task) {
      * @throws RejectedExecutionException if the task cannot be
      *         scheduled for execution
      */
+    @Override
     public <T> ForkJoinTask<T> submit(Runnable task, T result) {
         return externalSubmit(new ForkJoinTask.AdaptedRunnable<T>(task, result));
     }
@@ -2499,10 +2662,9 @@ public <T> ForkJoinTask<T> submit(Runnable task, T result) {
      * @throws RejectedExecutionException if the task cannot be
      *         scheduled for execution
      */
+    @Override
     @SuppressWarnings("unchecked")
     public ForkJoinTask<?> submit(Runnable task) {
-        if (task == null)
-            throw new NullPointerException();
         return externalSubmit((task instanceof ForkJoinTask<?>)
             ? (ForkJoinTask<Void>) task // avoid re-wrap
             : new ForkJoinTask.AdaptedRunnableAction(task));
@@ -2512,28 +2674,183 @@ public ForkJoinTask<?> submit(Runnable task) {
      * @throws NullPointerException       {@inheritDoc}
      * @throws RejectedExecutionException {@inheritDoc}
      */
+    @Override
     public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) {
-        // In previous versions of this class, this method constructed
-        // a task to run ForkJoinTask.invokeAll, but now external
-        // invocation of multiple tasks is at least as efficient.
         ArrayList<Future<T>> futures = new ArrayList<>(tasks.size());
-
         try {
             for (Callable<T> t : tasks) {
-                ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t);
+                ForkJoinTask<T> f =
+                    new ForkJoinTask.AdaptedInterruptibleCallable<T>(t);
                 futures.add(f);
                 externalSubmit(f);
             }
-            for (int i = 0, size = futures.size(); i < size; i++)
+            for (int i = futures.size() - 1; i >= 0; --i)
                 ((ForkJoinTask<?>)futures.get(i)).quietlyJoin();
             return futures;
         } catch (Throwable t) {
-            for (int i = 0, size = futures.size(); i < size; i++)
-                futures.get(i).cancel(false);
+            for (Future<T> e : futures)
+                ForkJoinTask.cancelIgnoringExceptions(e);
+            throw t;
+        }
+    }
+
+    @Override
+    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks,
+                                         long timeout, TimeUnit unit)
+        throws InterruptedException {
+        long nanos = unit.toNanos(timeout);
+        ArrayList<Future<T>> futures = new ArrayList<>(tasks.size());
+        try {
+            for (Callable<T> t : tasks) {
+                ForkJoinTask<T> f =
+                    new ForkJoinTask.AdaptedInterruptibleCallable<T>(t);
+                futures.add(f);
+                externalSubmit(f);
+            }
+            long startTime = System.nanoTime(), ns = nanos;
+            boolean timedOut = (ns < 0L);
+            for (int i = futures.size() - 1; i >= 0; --i) {
+                Future<T> f = futures.get(i);
+                if (!f.isDone()) {
+                    if (timedOut)
+                        ForkJoinTask.cancelIgnoringExceptions(f);
+                    else {
+                        try {
+                            f.get(ns, TimeUnit.NANOSECONDS);
+                        } catch (CancellationException | TimeoutException |
+                                 ExecutionException ok) {
+                        }
+                        if ((ns = nanos - (System.nanoTime() - startTime)) < 0L)
+                            timedOut = true;
+                    }
+                }
+            }
+            return futures;
+        } catch (Throwable t) {
+            for (Future<T> e : futures)
+                ForkJoinTask.cancelIgnoringExceptions(e);
             throw t;
         }
     }
 
+    // Task to hold results from InvokeAnyTasks
+    static final class InvokeAnyRoot<E> extends ForkJoinTask<E> {
+        private static final long serialVersionUID = 2838392045355241008L;
+        @SuppressWarnings("serial") // Conditionally serializable
+        volatile E result;
+        final AtomicInteger count;  // in case all throw
+        final ForkJoinPool pool;    // to check shutdown while collecting
+        InvokeAnyRoot(int n, ForkJoinPool p) {
+            pool = p;
+            count = new AtomicInteger(n);
+        }
+        final void tryComplete(Callable<E> c) { // called by InvokeAnyTasks
+            Throwable ex = null;
+            boolean failed = (c == null || isCancelled() ||
+                              (pool != null && pool.mode < 0));
+            if (!failed && !isDone()) {
+                try {
+                    complete(c.call());
+                } catch (Throwable tx) {
+                    ex = tx;
+                    failed = true;
+                }
+            }
+            if ((pool != null && pool.mode < 0) ||
+                (failed && count.getAndDecrement() <= 1))
+                trySetThrown(ex != null ? ex : new CancellationException());
+        }
+        public final boolean exec()         { return false; } // never forked
+        public final E getRawResult()       { return result; }
+        public final void setRawResult(E v) { result = v; }
+    }
+
+    // Variant of AdaptedInterruptibleCallable with results in InvokeAnyRoot
+    static final class InvokeAnyTask<E> extends ForkJoinTask<E> {
+        private static final long serialVersionUID = 2838392045355241008L;
+        final InvokeAnyRoot<E> root;
+        @SuppressWarnings("serial") // Conditionally serializable
+        final Callable<E> callable;
+        transient volatile Thread runner;
+        InvokeAnyTask(InvokeAnyRoot<E> root, Callable<E> callable) {
+            this.root = root;
+            this.callable = callable;
+        }
+        public final boolean exec() {
+            Thread.interrupted();
+            runner = Thread.currentThread();
+            root.tryComplete(callable);
+            runner = null;
+            Thread.interrupted();
+            return true;
+        }
+        public final boolean cancel(boolean mayInterruptIfRunning) {
+            Thread t;
+            boolean stat = super.cancel(false);
+            if (mayInterruptIfRunning && (t = runner) != null) {
+                try {
+                    t.interrupt();
+                } catch (Throwable ignore) {
+                }
+            }
+            return stat;
+        }
+        public final void setRawResult(E v) {} // unused
+        public final E getRawResult()       { return null; }
+    }
+
+    @Override
+    public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+        throws InterruptedException, ExecutionException {
+        int n = tasks.size();
+        if (n <= 0)
+            throw new IllegalArgumentException();
+        InvokeAnyRoot<T> root = new InvokeAnyRoot<T>(n, this);
+        ArrayList<InvokeAnyTask<T>> fs = new ArrayList<>(n);
+        try {
+            for (Callable<T> c : tasks) {
+                if (c == null)
+                    throw new NullPointerException();
+                InvokeAnyTask<T> f = new InvokeAnyTask<T>(root, c);
+                fs.add(f);
+                externalSubmit(f);
+                if (root.isDone())
+                    break;
+            }
+            return root.get();
+        } finally {
+            for (InvokeAnyTask<T> f : fs)
+                ForkJoinTask.cancelIgnoringExceptions(f);
+        }
+    }
+
+    @Override
+    public <T> T invokeAny(Collection<? extends Callable<T>> tasks,
+                           long timeout, TimeUnit unit)
+        throws InterruptedException, ExecutionException, TimeoutException {
+        long nanos = unit.toNanos(timeout);
+        int n = tasks.size();
+        if (n <= 0)
+            throw new IllegalArgumentException();
+        InvokeAnyRoot<T> root = new InvokeAnyRoot<T>(n, this);
+        ArrayList<InvokeAnyTask<T>> fs = new ArrayList<>(n);
+        try {
+            for (Callable<T> c : tasks) {
+                if (c == null)
+                    throw new NullPointerException();
+                InvokeAnyTask<T> f = new InvokeAnyTask<T>(root, c);
+                fs.add(f);
+                externalSubmit(f);
+                if (root.isDone())
+                    break;
+            }
+            return root.get(nanos, TimeUnit.NANOSECONDS);
+        } finally {
+            for (InvokeAnyTask<T> f : fs)
+                ForkJoinTask.cancelIgnoringExceptions(f);
+        }
+    }
+
     /**
      * Returns the factory used for constructing new workers.
      *
@@ -2604,12 +2921,12 @@ public boolean getAsyncMode() {
      * @return the number of worker threads
      */
     public int getRunningThreadCount() {
-        WorkQueue[] ws; WorkQueue w;
         VarHandle.acquireFence();
+        WorkQueue[] qs; WorkQueue q;
         int rc = 0;
-        if ((ws = workQueues) != null) {
-            for (int i = 1; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null && w.isApparentlyUnblocked())
+        if ((qs = queues) != null) {
+            for (int i = 1; i < qs.length; i += 2) {
+                if ((q = qs[i]) != null && q.isApparentlyUnblocked())
                     ++rc;
             }
         }
@@ -2640,30 +2957,7 @@ public int getActiveThreadCount() {
      * @return {@code true} if all threads are currently idle
      */
     public boolean isQuiescent() {
-        for (;;) {
-            long c = ctl;
-            int md = mode, pc = md & SMASK;
-            int tc = pc + (short)(c >>> TC_SHIFT);
-            int rc = pc + (int)(c >> RC_SHIFT);
-            if ((md & (STOP | TERMINATED)) != 0)
-                return true;
-            else if (rc > 0)
-                return false;
-            else {
-                WorkQueue[] ws; WorkQueue v;
-                if ((ws = workQueues) != null) {
-                    for (int i = 1; i < ws.length; i += 2) {
-                        if ((v = ws[i]) != null) {
-                            if (v.source > 0)
-                                return false;
-                            --tc;
-                        }
-                    }
-                }
-                if (tc == 0 && ctl == c)
-                    return true;
-            }
-        }
+        return canStop();
     }
 
     /**
@@ -2679,11 +2973,11 @@ else if (rc > 0)
      */
     public long getStealCount() {
         long count = stealCount;
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 1; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null)
-                    count += (long)w.nsteals & 0xffffffffL;
+        WorkQueue[] qs; WorkQueue q;
+        if ((qs = queues) != null) {
+            for (int i = 1; i < qs.length; i += 2) {
+                if ((q = qs[i]) != null)
+                    count += (long)q.nsteals & 0xffffffffL;
             }
         }
         return count;
@@ -2700,13 +2994,13 @@ public long getStealCount() {
      * @return the number of queued tasks
      */
     public long getQueuedTaskCount() {
-        WorkQueue[] ws; WorkQueue w;
         VarHandle.acquireFence();
+        WorkQueue[] qs; WorkQueue q;
         int count = 0;
-        if ((ws = workQueues) != null) {
-            for (int i = 1; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null)
-                    count += w.queueSize();
+        if ((qs = queues) != null) {
+            for (int i = 1; i < qs.length; i += 2) {
+                if ((q = qs[i]) != null)
+                    count += q.queueSize();
             }
         }
         return count;
@@ -2720,13 +3014,13 @@ public long getQueuedTaskCount() {
      * @return the number of queued submissions
      */
     public int getQueuedSubmissionCount() {
-        WorkQueue[] ws; WorkQueue w;
         VarHandle.acquireFence();
+        WorkQueue[] qs; WorkQueue q;
         int count = 0;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null)
-                    count += w.queueSize();
+        if ((qs = queues) != null) {
+            for (int i = 0; i < qs.length; i += 2) {
+                if ((q = qs[i]) != null)
+                    count += q.queueSize();
             }
         }
         return count;
@@ -2739,11 +3033,11 @@ public int getQueuedSubmissionCount() {
      * @return {@code true} if there are any queued submissions
      */
     public boolean hasQueuedSubmissions() {
-        WorkQueue[] ws; WorkQueue w;
         VarHandle.acquireFence();
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null && !w.isEmpty())
+        WorkQueue[] qs; WorkQueue q;
+        if ((qs = queues) != null) {
+            for (int i = 0; i < qs.length; i += 2) {
+                if ((q = qs[i]) != null && !q.isEmpty())
                     return true;
             }
         }
@@ -2779,18 +3073,10 @@ protected ForkJoinTask<?> pollSubmission() {
      * @return the number of elements transferred
      */
     protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
-        WorkQueue[] ws; WorkQueue w; ForkJoinTask<?> t;
-        VarHandle.acquireFence();
         int count = 0;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; ++i) {
-                if ((w = ws[i]) != null) {
-                    while ((t = w.poll()) != null) {
-                        c.add(t);
-                        ++count;
-                    }
-                }
-            }
+        for (ForkJoinTask<?> t; (t = pollScan(false)) != null; ) {
+            c.add(t);
+            ++count;
         }
         return count;
     }
@@ -2803,22 +3089,22 @@ protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
      * @return a string identifying this pool, as well as its state
      */
     public String toString() {
-        // Use a single pass through workQueues to collect counts
+        // Use a single pass through queues to collect counts
         int md = mode; // read volatile fields first
         long c = ctl;
         long st = stealCount;
-        long qt = 0L, qs = 0L; int rc = 0;
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; ++i) {
-                if ((w = ws[i]) != null) {
-                    int size = w.queueSize();
+        long qt = 0L, ss = 0L; int rc = 0;
+        WorkQueue[] qs; WorkQueue q;
+        if ((qs = queues) != null) {
+            for (int i = 0; i < qs.length; ++i) {
+                if ((q = qs[i]) != null) {
+                    int size = q.queueSize();
                     if ((i & 1) == 0)
-                        qs += size;
+                        ss += size;
                     else {
                         qt += size;
-                        st += (long)w.nsteals & 0xffffffffL;
-                        if (w.isApparentlyUnblocked())
+                        st += (long)q.nsteals & 0xffffffffL;
+                        if (q.isApparentlyUnblocked())
                             ++rc;
                     }
                 }
@@ -2842,7 +3128,7 @@ public String toString() {
             ", running = " + rc +
             ", steals = " + st +
             ", tasks = " + qt +
-            ", submissions = " + qs +
+            ", submissions = " + ss +
             "]";
     }
 
@@ -2862,7 +3148,8 @@ public String toString() {
      */
     public void shutdown() {
         checkPermission();
-        tryTerminate(false, true);
+        if (this != common)
+            tryTerminate(false, true);
     }
 
     /**
@@ -2885,7 +3172,8 @@ public void shutdown() {
      */
     public List<Runnable> shutdownNow() {
         checkPermission();
-        tryTerminate(true, true);
+        if (this != common)
+            tryTerminate(true, true);
         return Collections.emptyList();
     }
 
@@ -2912,8 +3200,7 @@ public boolean isTerminated() {
      * @return {@code true} if terminating but not yet terminated
      */
     public boolean isTerminating() {
-        int md = mode;
-        return (md & STOP) != 0 && (md & TERMINATED) == 0;
+        return (mode & (STOP | TERMINATED)) == STOP;
     }
 
     /**
@@ -2941,29 +3228,32 @@ public boolean isShutdown() {
      */
     public boolean awaitTermination(long timeout, TimeUnit unit)
         throws InterruptedException {
-        if (Thread.interrupted())
-            throw new InterruptedException();
+        ReentrantLock lock; Condition cond;
+        long nanos = unit.toNanos(timeout);
+        boolean terminated = false;
         if (this == common) {
-            awaitQuiescence(timeout, unit);
-            return false;
+            Thread t; ForkJoinWorkerThread wt; int q;
+            if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread &&
+                (wt = (ForkJoinWorkerThread)t).pool == this)
+                q = helpQuiescePool(wt.workQueue, nanos, true);
+            else
+                q = externalHelpQuiescePool(nanos, true);
+            if (q < 0)
+                throw new InterruptedException();
         }
-        long nanos = unit.toNanos(timeout);
-        if (isTerminated())
-            return true;
-        if (nanos <= 0L)
-            return false;
-        long deadline = System.nanoTime() + nanos;
-        synchronized (this) {
-            for (;;) {
-                if (isTerminated())
-                    return true;
-                if (nanos <= 0L)
-                    return false;
-                long millis = TimeUnit.NANOSECONDS.toMillis(nanos);
-                wait(millis > 0L ? millis : 1L);
-                nanos = deadline - System.nanoTime();
+        else if (!(terminated = ((mode & TERMINATED) != 0)) &&
+                 (lock = registrationLock) != null) {
+            lock.lock();
+            try {
+                if ((cond = termination) == null)
+                    termination = cond = lock.newCondition();
+                while (!(terminated = ((mode & TERMINATED) != 0)) && nanos > 0L)
+                    nanos = cond.awaitNanos(nanos);
+            } finally {
+                lock.unlock();
             }
         }
+        return terminated;
     }
 
     /**
@@ -2978,35 +3268,14 @@ public boolean awaitTermination(long timeout, TimeUnit unit)
      * timeout elapsed.
      */
     public boolean awaitQuiescence(long timeout, TimeUnit unit) {
+        Thread t; ForkJoinWorkerThread wt; int q;
         long nanos = unit.toNanos(timeout);
-        ForkJoinWorkerThread wt;
-        Thread thread = Thread.currentThread();
-        if ((thread instanceof ForkJoinWorkerThread) &&
-            (wt = (ForkJoinWorkerThread)thread).pool == this) {
-            helpQuiescePool(wt.workQueue);
-            return true;
-        }
-        else {
-            for (long startTime = System.nanoTime();;) {
-                ForkJoinTask<?> t;
-                if ((t = pollScan(false)) != null)
-                    t.doExec();
-                else if (isQuiescent())
-                    return true;
-                else if ((System.nanoTime() - startTime) > nanos)
-                    return false;
-                else
-                    Thread.yield(); // cannot block
-            }
-        }
-    }
-
-    /**
-     * Waits and/or attempts to assist performing tasks indefinitely
-     * until the {@link #commonPool()} {@link #isQuiescent}.
-     */
-    static void quiesceCommonPool() {
-        common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread &&
+            (wt = (ForkJoinWorkerThread)t).pool == this)
+            q = helpQuiescePool(wt.workQueue, nanos, false);
+        else
+            q = externalHelpQuiescePool(nanos, false);
+        return (q > 0);
     }
 
     /**
@@ -3018,14 +3287,16 @@ static void quiesceCommonPool() {
      * not necessary. Method {@link #block} blocks the current thread
      * if necessary (perhaps internally invoking {@code isReleasable}
      * before actually blocking). These actions are performed by any
-     * thread invoking {@link ForkJoinPool#managedBlock(ManagedBlocker)}.
-     * The unusual methods in this API accommodate synchronizers that
-     * may, but don't usually, block for long periods. Similarly, they
-     * allow more efficient internal handling of cases in which
-     * additional workers may be, but usually are not, needed to
-     * ensure sufficient parallelism.  Toward this end,
-     * implementations of method {@code isReleasable} must be amenable
-     * to repeated invocation.
+     * thread invoking {@link
+     * ForkJoinPool#managedBlock(ManagedBlocker)}.  The unusual
+     * methods in this API accommodate synchronizers that may, but
+     * don't usually, block for long periods. Similarly, they allow
+     * more efficient internal handling of cases in which additional
+     * workers may be, but usually are not, needed to ensure
+     * sufficient parallelism.  Toward this end, implementations of
+     * method {@code isReleasable} must be amenable to repeated
+     * invocation. Neither method is invoked after a prior invocation
+     * of {@code isReleasable} or {@code block} returns {@code true}.
      *
      * <p>For example, here is a ManagedBlocker based on a
      * ReentrantLock:
@@ -3110,80 +3381,65 @@ public static interface ManagedBlocker {
      * @throws InterruptedException if {@code blocker.block()} did so
      */
     public static void managedBlock(ManagedBlocker blocker)
+        throws InterruptedException {
+        Thread t; ForkJoinPool p;
+        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread &&
+            (p = ((ForkJoinWorkerThread)t).pool) != null)
+            p.compensatedBlock(blocker);
+        else
+            unmanagedBlock(blocker);
+    }
+
+    /** ManagedBlock for ForkJoinWorkerThreads */
+    private void compensatedBlock(ManagedBlocker blocker)
         throws InterruptedException {
         if (blocker == null) throw new NullPointerException();
-        ForkJoinPool p;
-        ForkJoinWorkerThread wt;
-        WorkQueue w;
-        Thread t = Thread.currentThread();
-        if ((t instanceof ForkJoinWorkerThread) &&
-            (p = (wt = (ForkJoinWorkerThread)t).pool) != null &&
-            (w = wt.workQueue) != null) {
-            int block;
-            while (!blocker.isReleasable()) {
-                if ((block = p.tryCompensate(w)) != 0) {
-                    try {
-                        do {} while (!blocker.isReleasable() &&
-                                     !blocker.block());
-                    } finally {
-                        CTL.getAndAdd(p, (block > 0) ? RC_UNIT : 0L);
-                    }
-                    break;
+        for (;;) {
+            int comp; boolean done;
+            long c = ctl;
+            if (blocker.isReleasable())
+                break;
+            if ((comp = tryCompensate(c)) >= 0) {
+                long post = (comp == 0) ? 0L : RC_UNIT;
+                try {
+                    done = blocker.block();
+                } finally {
+                    getAndAddCtl(post);
                 }
+                if (done)
+                    break;
             }
         }
-        else {
-            do {} while (!blocker.isReleasable() &&
-                         !blocker.block());
-        }
     }
 
-    /**
-     * If the given executor is a ForkJoinPool, poll and execute
-     * AsynchronousCompletionTasks from worker's queue until none are
-     * available or blocker is released.
-     */
-    static void helpAsyncBlocker(Executor e, ManagedBlocker blocker) {
-        if (e instanceof ForkJoinPool) {
-            WorkQueue w; ForkJoinWorkerThread wt; WorkQueue[] ws; int r, n;
-            ForkJoinPool p = (ForkJoinPool)e;
-            Thread thread = Thread.currentThread();
-            if (thread instanceof ForkJoinWorkerThread &&
-                (wt = (ForkJoinWorkerThread)thread).pool == p)
-                w = wt.workQueue;
-            else if ((r = ThreadLocalRandom.getProbe()) != 0 &&
-                     (ws = p.workQueues) != null && (n = ws.length) > 0)
-                w = ws[(n - 1) & r & SQMASK];
-            else
-                w = null;
-            if (w != null)
-                w.helpAsyncBlocker(blocker);
-        }
+    /** ManagedBlock for external threads */
+    private static void unmanagedBlock(ManagedBlocker blocker)
+        throws InterruptedException {
+        if (blocker == null) throw new NullPointerException();
+        do {} while (!blocker.isReleasable() && !blocker.block());
     }
 
-    // AbstractExecutorService overrides.  These rely on undocumented
-    // fact that ForkJoinTask.adapt returns ForkJoinTasks that also
-    // implement RunnableFuture.
+    // AbstractExecutorService.newTaskFor overrides rely on
+    // undocumented fact that ForkJoinTask.adapt returns ForkJoinTasks
+    // that also implement RunnableFuture.
 
+    @Override
     protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
         return new ForkJoinTask.AdaptedRunnable<T>(runnable, value);
     }
 
+    @Override
     protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
         return new ForkJoinTask.AdaptedCallable<T>(callable);
     }
 
-    // VarHandle mechanics
-    private static final VarHandle CTL;
-    private static final VarHandle MODE;
-    static final VarHandle QA;
-
     static {
         try {
             MethodHandles.Lookup l = MethodHandles.lookup();
             CTL = l.findVarHandle(ForkJoinPool.class, "ctl", long.class);
             MODE = l.findVarHandle(ForkJoinPool.class, "mode", int.class);
-            QA = MethodHandles.arrayElementVarHandle(ForkJoinTask[].class);
+            THREADIDS = l.findVarHandle(ForkJoinPool.class, "threadIds", int.class);
+            POOLIDS = l.findStaticVarHandle(ForkJoinPool.class, "poolIds", int.class);
         } catch (ReflectiveOperationException e) {
             throw new ExceptionInInitializerError(e);
         }
@@ -3204,38 +3460,10 @@ protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
         defaultForkJoinWorkerThreadFactory =
             new DefaultForkJoinWorkerThreadFactory();
         modifyThreadPermission = new RuntimePermission("modifyThread");
-
         common = AccessController.doPrivileged(new PrivilegedAction<>() {
             public ForkJoinPool run() {
                 return new ForkJoinPool((byte)0); }});
 
         COMMON_PARALLELISM = Math.max(common.mode & SMASK, 1);
     }
-
-    /**
-     * Factory for innocuous worker threads.
-     */
-    private static final class InnocuousForkJoinWorkerThreadFactory
-        implements ForkJoinWorkerThreadFactory {
-
-        /**
-         * An ACC to restrict permissions for the factory itself.
-         * The constructed workers have no permissions set.
-         */
-        private static final AccessControlContext ACC = contextWithPermissions(
-            modifyThreadPermission,
-            new RuntimePermission("enableContextClassLoaderOverride"),
-            new RuntimePermission("modifyThreadGroup"),
-            new RuntimePermission("getClassLoader"),
-            new RuntimePermission("setContextClassLoader"));
-
-        public final ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-            return AccessController.doPrivileged(
-                new PrivilegedAction<>() {
-                    public ForkJoinWorkerThread run() {
-                        return new ForkJoinWorkerThread.
-                            InnocuousForkJoinWorkerThread(pool); }},
-                ACC);
-        }
-    }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
index 9f63f5328bb8b..4ad034b7b9e6b 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
@@ -38,13 +38,11 @@
 import java.io.Serializable;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.util.Collection;
 import java.util.List;
 import java.util.RandomAccess;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.LockSupport;
 
 /**
  * Abstract base class for tasks that run within a {@link ForkJoinPool}.
@@ -217,348 +215,313 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * (3) user-level methods that additionally report results.
      * This is sometimes hard to see because this file orders exported
      * methods in a way that flows well in javadocs.
-     */
-
-    /**
-     * The status field holds run control status bits packed into a
-     * single int to ensure atomicity.  Status is initially zero, and
-     * takes on nonnegative values until completed, upon which it
-     * holds (sign bit) DONE, possibly with ABNORMAL (cancelled or
-     * exceptional) and THROWN (in which case an exception has been
-     * stored). Tasks with dependent blocked waiting joiners have the
-     * SIGNAL bit set.  Completion of a task with SIGNAL set awakens
-     * any waiters via notifyAll. (Waiters also help signal others
-     * upon completion.)
      *
-     * These control bits occupy only (some of) the upper half (16
-     * bits) of status field. The lower bits are used for user-defined
-     * tags.
+     * Revision notes: The use of "Aux" field replaces previous
+     * reliance on a table to hold exceptions and synchronized blocks
+     * and monitors to wait for completion.
      */
-    volatile int status; // accessed directly by pool and workers
-
-    private static final int DONE     = 1 << 31; // must be negative
-    private static final int ABNORMAL = 1 << 18; // set atomically with DONE
-    private static final int THROWN   = 1 << 17; // set atomically with ABNORMAL
-    private static final int SIGNAL   = 1 << 16; // true if joiner waiting
-    private static final int SMASK    = 0xffff;  // short bits for tags
 
     /**
-     * Constructor for subclasses to call.
+     * Nodes for threads waiting for completion, or holding a thrown
+     * exception (never both). Waiting threads prepend nodes
+     * Treiber-stack-style.  Signallers detach and unpark
+     * waiters. Cancelled waiters try to unsplice.
      */
-    public ForkJoinTask() {}
-
-    static boolean isExceptionalStatus(int s) {  // needed by subclasses
-        return (s & THROWN) != 0;
+    static final class Aux {
+        final Thread thread;
+        final Throwable ex;  // null if a waiter
+        Aux next;            // accessed only via memory-acquire chains
+        Aux(Thread thread, Throwable ex) {
+            this.thread = thread;
+            this.ex = ex;
+        }
+        final boolean casNext(Aux c, Aux v) { // used only in cancellation
+            return NEXT.compareAndSet(this, c, v);
+        }
+        private static final VarHandle NEXT;
+        static {
+            try {
+                NEXT = MethodHandles.lookup()
+                    .findVarHandle(Aux.class, "next", Aux.class);
+            } catch (ReflectiveOperationException e) {
+                throw new ExceptionInInitializerError(e);
+            }
+        }
     }
 
-    /**
-     * Sets DONE status and wakes up threads waiting to join this task.
-     *
-     * @return status on exit
-     */
-    private int setDone() {
-        int s;
-        if (((s = (int)STATUS.getAndBitwiseOr(this, DONE)) & SIGNAL) != 0)
-            synchronized (this) { notifyAll(); }
-        return s | DONE;
+    /*
+     * The status field holds bits packed into a single int to ensure
+     * atomicity.  Status is initially zero, and takes on nonnegative
+     * values until completed, upon which it holds (sign bit) DONE,
+     * possibly with ABNORMAL (cancelled or exceptional) and THROWN
+     * (in which case an exception has been stored). A value of
+     * ABNORMAL without DONE signifies an interrupted wait.  These
+     * control bits occupy only (some of) the upper half (16 bits) of
+     * status field. The lower bits are used for user-defined tags.
+     */
+    private static final int DONE         = 1 << 31; // must be negative
+    private static final int ABNORMAL     = 1 << 16;
+    private static final int THROWN       = 1 << 17;
+    private static final int SMASK        = 0xffff;  // short bits for tags
+    private static final int UNCOMPENSATE = 1 << 16; // helpJoin return sentinel
+
+    // Fields
+    volatile int status;                // accessed directly by pool and workers
+    private transient volatile Aux aux; // either waiters or thrown Exception
+
+    // Support for atomic operations
+    private static final VarHandle STATUS;
+    private static final VarHandle AUX;
+    private int getAndBitwiseOrStatus(int v) {
+        return (int)STATUS.getAndBitwiseOr(this, v);
     }
-
-    /**
-     * Marks cancelled or exceptional completion unless already done.
-     *
-     * @param completion must be DONE | ABNORMAL, ORed with THROWN if exceptional
-     * @return status on exit
-     */
-    private int abnormalCompletion(int completion) {
-        for (int s, ns;;) {
-            if ((s = status) < 0)
-                return s;
-            else if (STATUS.weakCompareAndSet(this, s, ns = s | completion)) {
-                if ((s & SIGNAL) != 0)
-                    synchronized (this) { notifyAll(); }
-                return ns;
-            }
-        }
+    private boolean casStatus(int c, int v) {
+        return STATUS.weakCompareAndSet(this, c, v);
+    }
+    private boolean casAux(Aux c, Aux v) {
+        return AUX.compareAndSet(this, c, v);
     }
 
-    /**
-     * Primary execution method for stolen tasks. Unless done, calls
-     * exec and records status if completed, but doesn't wait for
-     * completion otherwise.
-     *
-     * @return status on exit from this method
-     */
-    final int doExec() {
-        int s; boolean completed;
-        if ((s = status) >= 0) {
-            try {
-                completed = exec();
-            } catch (Throwable rex) {
-                completed = false;
-                s = setExceptionalCompletion(rex);
+    /** Removes and unparks waiters */
+    private void signalWaiters() {
+        for (Aux a; (a = aux) != null && a.ex == null; ) {
+            if (casAux(a, null)) {             // detach entire list
+                for (Thread t; a != null; a = a.next) {
+                    if ((t = a.thread) != Thread.currentThread() && t != null)
+                        LockSupport.unpark(t); // don't self-signal
+                }
+                break;
             }
-            if (completed)
-                s = setDone();
         }
-        return s;
     }
 
     /**
-     * If not done, sets SIGNAL status and performs Object.wait(timeout).
-     * This task may or may not be done on exit. Ignores interrupts.
+     * Possibly blocks until task is done or interrupted or timed out.
      *
-     * @param timeout using Object.wait conventions.
+     * @param interruptible true if wait can be cancelled by interrupt
+     * @param deadline if non-zero use timed waits and possibly timeout
+     * @param pool if nonnull pool to uncompensate after unblocking
+     * @return status on exit, or ABNORMAL if interrupted while waiting
      */
-    final void internalWait(long timeout) {
-        if ((int)STATUS.getAndBitwiseOr(this, SIGNAL) >= 0) {
-            synchronized (this) {
-                if (status >= 0)
-                    try { wait(timeout); } catch (InterruptedException ie) { }
+    private int awaitDone(boolean interruptible, long deadline,
+                          ForkJoinPool pool) {
+        int s;
+        boolean interrupted = false, queued = false, parked = false;
+        Aux node = null;
+        while ((s = status) >= 0) {
+            Aux a; long ns;
+            if (parked && Thread.interrupted()) {
+                if (interruptible) {
+                    s = ABNORMAL;
+                    break;
+                }
+                interrupted = true;
+            }
+            else if (queued) {
+                if (deadline != 0L) {
+                    if ((ns = deadline - System.nanoTime()) <= 0L)
+                        break;
+                    LockSupport.parkNanos(ns);
+                }
                 else
-                    notifyAll();
+                    LockSupport.park();
+                parked = true;
+            }
+            else if (node != null) {
+                if ((a = aux) != null && a.ex != null)
+                    Thread.onSpinWait();     // exception in progress
+                else if (queued = casAux(node.next = a, node))
+                    LockSupport.setCurrentBlocker(this);
+            }
+            else {
+                try {
+                    node = new Aux(Thread.currentThread(), null);
+                } catch (Throwable ex) {     // try to cancel if cannot create
+                    casStatus(s, s | (DONE | ABNORMAL));
+                }
             }
         }
-    }
-
-    /**
-     * Blocks a non-worker-thread until completion.
-     * @return status upon completion
-     */
-    private int externalAwaitDone() {
-        int s = tryExternalHelp();
-        if (s >= 0 && (s = (int)STATUS.getAndBitwiseOr(this, SIGNAL)) >= 0) {
-            boolean interrupted = false;
-            synchronized (this) {
-                for (;;) {
-                    if ((s = status) >= 0) {
-                        try {
-                            wait(0L);
-                        } catch (InterruptedException ie) {
-                            interrupted = true;
+        if (pool != null)
+            pool.uncompensate();
+
+        if (queued) {
+            LockSupport.setCurrentBlocker(null);
+            if (s >= 0) { // cancellation similar to AbstractQueuedSynchronizer
+                outer: for (Aux a; (a = aux) != null && a.ex == null; ) {
+                    for (Aux trail = null;;) {
+                        Aux next = a.next;
+                        if (a == node) {
+                            if (trail != null)
+                                trail.casNext(trail, next);
+                            else if (casAux(a, next))
+                                break outer; // cannot be re-encountered
+                            break;           // restart
+                        } else {
+                            trail = a;
+                            if ((a = next) == null)
+                                break outer;
                         }
                     }
-                    else {
-                        notifyAll();
-                        break;
-                    }
                 }
             }
-            if (interrupted)
-                Thread.currentThread().interrupt();
+            else {
+                signalWaiters();             // help clean or signal
+                if (interrupted)
+                    Thread.currentThread().interrupt();
+            }
         }
         return s;
     }
 
     /**
-     * Blocks a non-worker-thread until completion or interruption.
+     * Sets DONE status and wakes up threads waiting to join this task.
+     * @return status on exit
      */
-    private int externalInterruptibleAwaitDone() throws InterruptedException {
-        int s = tryExternalHelp();
-        if (s >= 0 && (s = (int)STATUS.getAndBitwiseOr(this, SIGNAL)) >= 0) {
-            synchronized (this) {
-                for (;;) {
-                    if ((s = status) >= 0)
-                        wait(0L);
-                    else {
-                        notifyAll();
-                        break;
-                    }
-                }
-            }
-        }
-        else if (Thread.interrupted())
-            throw new InterruptedException();
+    private int setDone() {
+        int s = getAndBitwiseOrStatus(DONE) | DONE;
+        signalWaiters();
         return s;
     }
 
     /**
-     * Tries to help with tasks allowed for external callers.
-     *
-     * @return current status
+     * Sets ABNORMAL DONE status unless already done, and wakes up threads
+     * waiting to join this task.
+     * @return status on exit
      */
-    private int tryExternalHelp() {
+    private int trySetCancelled() {
         int s;
-        return ((s = status) < 0 ? s:
-                (this instanceof CountedCompleter) ?
-                ForkJoinPool.common.externalHelpComplete(
-                    (CountedCompleter<?>)this, 0) :
-                ForkJoinPool.common.tryExternalUnpush(this) ?
-                doExec() : 0);
+        do {} while ((s = status) >= 0 && !casStatus(s, s |= (DONE | ABNORMAL)));
+        signalWaiters();
+        return s;
     }
 
     /**
-     * Implementation for join, get, quietlyJoin. Directly handles
-     * only cases of already-completed, external wait, and
-     * unfork+exec.  Others are relayed to ForkJoinPool.awaitJoin.
+     * Records exception and sets ABNORMAL THROWN DONE status unless
+     * already done, and wakes up threads waiting to join this task.
+     * If losing a race with setDone or trySetCancelled, the exception
+     * may be recorded but not reported.
      *
-     * @return status upon completion
+     * @return status on exit
      */
-    private int doJoin() {
-        int s; Thread t; ForkJoinWorkerThread wt; ForkJoinPool.WorkQueue w;
-        return (s = status) < 0 ? s :
-            ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
-            (w = (wt = (ForkJoinWorkerThread)t).workQueue).
-            tryUnpush(this) && (s = doExec()) < 0 ? s :
-            wt.pool.awaitJoin(w, this, 0L) :
-            externalAwaitDone();
+    final int trySetThrown(Throwable ex) {
+        Aux h = new Aux(Thread.currentThread(), ex), p = null;
+        boolean installed = false;
+        int s;
+        while ((s = status) >= 0) {
+            Aux a;
+            if (!installed && ((a = aux) == null || a.ex == null) &&
+                (installed = casAux(a, h)))
+                p = a; // list of waiters replaced by h
+            if (installed && casStatus(s, s |= (DONE | ABNORMAL | THROWN)))
+                break;
+        }
+        for (; p != null; p = p.next)
+            LockSupport.unpark(p.thread);
+        return s;
     }
 
     /**
-     * Implementation for invoke, quietlyInvoke.
+     * Records exception unless already done. Overridable in subclasses.
      *
-     * @return status upon completion
+     * @return status on exit
      */
-    private int doInvoke() {
-        int s; Thread t; ForkJoinWorkerThread wt;
-        return (s = doExec()) < 0 ? s :
-            ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
-            (wt = (ForkJoinWorkerThread)t).pool.
-            awaitJoin(wt.workQueue, this, 0L) :
-            externalAwaitDone();
+    int trySetException(Throwable ex) {
+        return trySetThrown(ex);
     }
 
-    // Exception table support
-
     /**
-     * Hash table of exceptions thrown by tasks, to enable reporting
-     * by callers. Because exceptions are rare, we don't directly keep
-     * them with task objects, but instead use a weak ref table.  Note
-     * that cancellation exceptions don't appear in the table, but are
-     * instead recorded as status values.
-     *
-     * The exception table has a fixed capacity.
+     * Constructor for subclasses to call.
      */
-    private static final ExceptionNode[] exceptionTable
-        = new ExceptionNode[32];
-
-    /** Lock protecting access to exceptionTable. */
-    private static final ReentrantLock exceptionTableLock
-        = new ReentrantLock();
-
-    /** Reference queue of stale exceptionally completed tasks. */
-    private static final ReferenceQueue<ForkJoinTask<?>> exceptionTableRefQueue
-        = new ReferenceQueue<>();
+    public ForkJoinTask() {}
 
-    /**
-     * Key-value nodes for exception table.  The chained hash table
-     * uses identity comparisons, full locking, and weak references
-     * for keys. The table has a fixed capacity because it only
-     * maintains task exceptions long enough for joiners to access
-     * them, so should never become very large for sustained
-     * periods. However, since we do not know when the last joiner
-     * completes, we must use weak references and expunge them. We do
-     * so on each operation (hence full locking). Also, some thread in
-     * any ForkJoinPool will call helpExpungeStaleExceptions when its
-     * pool becomes isQuiescent.
-     */
-    static final class ExceptionNode extends WeakReference<ForkJoinTask<?>> {
-        final Throwable ex;
-        ExceptionNode next;
-        final long thrower;  // use id not ref to avoid weak cycles
-        final int hashCode;  // store task hashCode before weak ref disappears
-        ExceptionNode(ForkJoinTask<?> task, Throwable ex, ExceptionNode next,
-                      ReferenceQueue<ForkJoinTask<?>> exceptionTableRefQueue) {
-            super(task, exceptionTableRefQueue);
-            this.ex = ex;
-            this.next = next;
-            this.thrower = Thread.currentThread().getId();
-            this.hashCode = System.identityHashCode(task);
-        }
+    static boolean isExceptionalStatus(int s) {  // needed by subclasses
+        return (s & THROWN) != 0;
     }
 
     /**
-     * Records exception and sets status.
+     * Unless done, calls exec and records status if completed, but
+     * doesn't wait for completion otherwise.
      *
-     * @return status on exit
+     * @return status on exit from this method
      */
-    final int recordExceptionalCompletion(Throwable ex) {
-        int s;
+    final int doExec() {
+        int s; boolean completed;
         if ((s = status) >= 0) {
-            int h = System.identityHashCode(this);
-            final ReentrantLock lock = exceptionTableLock;
-            lock.lock();
             try {
-                expungeStaleExceptions();
-                ExceptionNode[] t = exceptionTable;
-                int i = h & (t.length - 1);
-                for (ExceptionNode e = t[i]; ; e = e.next) {
-                    if (e == null) {
-                        t[i] = new ExceptionNode(this, ex, t[i],
-                                                 exceptionTableRefQueue);
-                        break;
-                    }
-                    if (e.get() == this) // already present
-                        break;
-                }
-            } finally {
-                lock.unlock();
+                completed = exec();
+            } catch (Throwable rex) {
+                s = trySetException(rex);
+                completed = false;
             }
-            s = abnormalCompletion(DONE | ABNORMAL | THROWN);
+            if (completed)
+                s = setDone();
         }
         return s;
     }
 
     /**
-     * Records exception and possibly propagates.
+     * Helps and/or waits for completion from join, get, or invoke;
+     * called from either internal or external threads.
      *
-     * @return status on exit
-     */
-    private int setExceptionalCompletion(Throwable ex) {
-        int s = recordExceptionalCompletion(ex);
-        if ((s & THROWN) != 0)
-            internalPropagateException(ex);
-        return s;
-    }
-
-    /**
-     * Hook for exception propagation support for tasks with completers.
-     */
-    void internalPropagateException(Throwable ex) {
-    }
-
-    /**
-     * Cancels, ignoring any exceptions thrown by cancel. Used during
-     * worker and pool shutdown. Cancel is spec'ed not to throw any
-     * exceptions, but if it does anyway, we have no recourse during
-     * shutdown, so guard against this case.
-     */
-    static final void cancelIgnoringExceptions(ForkJoinTask<?> t) {
-        if (t != null && t.status >= 0) {
-            try {
-                t.cancel(false);
-            } catch (Throwable ignore) {
+     * @param ran true if task known to have been exec'd
+     * @param interruptible true if park interruptibly when external
+     * @param timed true if use timed wait
+     * @param nanos if timed, timeout value
+     * @return ABNORMAL if interrupted, else status on exit
+     */
+    private int awaitJoin(boolean ran, boolean interruptible, boolean timed,
+                          long nanos) {
+        boolean internal; ForkJoinPool p; ForkJoinPool.WorkQueue q; int s;
+        Thread t; ForkJoinWorkerThread wt;
+        if (internal = ((t = Thread.currentThread())
+                        instanceof ForkJoinWorkerThread)) {
+            p = (wt = (ForkJoinWorkerThread)t).pool;
+            q = wt.workQueue;
+        }
+        else {
+            p = ForkJoinPool.common;
+            q = ForkJoinPool.commonQueue();
+            if (interruptible && Thread.interrupted())
+                return ABNORMAL;
+        }
+        if ((s = status) < 0)
+            return s;
+        long deadline = 0L;
+        if (timed) {
+            if (nanos <= 0L)
+                return 0;
+            else if ((deadline = nanos + System.nanoTime()) == 0L)
+                deadline = 1L;
+        }
+        ForkJoinPool uncompensate = null;
+        if (q != null && p != null) {            // try helping
+            if ((!timed || p.isSaturated()) &&
+                ((this instanceof CountedCompleter) ?
+                 (s = p.helpComplete(this, q, internal)) < 0 :
+                 (q.tryRemove(this, internal) && (s = doExec()) < 0)))
+                return s;
+            if (internal) {
+                if ((s = p.helpJoin(this, q)) < 0)
+                    return s;
+                if (s == UNCOMPENSATE)
+                    uncompensate = p;
+                interruptible = false;
             }
         }
+        return awaitDone(interruptible, deadline, uncompensate);
     }
 
     /**
-     * Removes exception node and clears status.
+     * Cancels, ignoring any exceptions thrown by cancel.  Cancel is
+     * spec'ed not to throw any exceptions, but if it does anyway, we
+     * have no recourse, so guard against this case.
      */
-    private void clearExceptionalCompletion() {
-        int h = System.identityHashCode(this);
-        final ReentrantLock lock = exceptionTableLock;
-        lock.lock();
-        try {
-            ExceptionNode[] t = exceptionTable;
-            int i = h & (t.length - 1);
-            ExceptionNode e = t[i];
-            ExceptionNode pred = null;
-            while (e != null) {
-                ExceptionNode next = e.next;
-                if (e.get() == this) {
-                    if (pred == null)
-                        t[i] = next;
-                    else
-                        pred.next = next;
-                    break;
-                }
-                pred = e;
-                e = next;
+    static final void cancelIgnoringExceptions(Future<?> t) {
+        if (t != null) {
+            try {
+                t.cancel(true);
+            } catch (Throwable ignore) {
             }
-            expungeStaleExceptions();
-            status = 0;
-        } finally {
-            lock.unlock();
         }
     }
 
@@ -577,37 +540,27 @@ private void clearExceptionalCompletion() {
      * @return the exception, or null if none
      */
     private Throwable getThrowableException() {
-        int h = System.identityHashCode(this);
-        ExceptionNode e;
-        final ReentrantLock lock = exceptionTableLock;
-        lock.lock();
-        try {
-            expungeStaleExceptions();
-            ExceptionNode[] t = exceptionTable;
-            e = t[h & (t.length - 1)];
-            while (e != null && e.get() != this)
-                e = e.next;
-        } finally {
-            lock.unlock();
-        }
-        Throwable ex;
-        if (e == null || (ex = e.ex) == null)
-            return null;
-        if (e.thrower != Thread.currentThread().getId()) {
+        Throwable ex; Aux a;
+        if ((a = aux) == null)
+            ex = null;
+        else if ((ex = a.ex) != null && a.thread != Thread.currentThread()) {
             try {
-                Constructor<?> noArgCtor = null;
-                // public ctors only
+                Constructor<?> noArgCtor = null, oneArgCtor = null;
                 for (Constructor<?> c : ex.getClass().getConstructors()) {
                     Class<?>[] ps = c.getParameterTypes();
                     if (ps.length == 0)
                         noArgCtor = c;
-                    else if (ps.length == 1 && ps[0] == Throwable.class)
-                        return (Throwable)c.newInstance(ex);
+                    else if (ps.length == 1 && ps[0] == Throwable.class) {
+                        oneArgCtor = c;
+                        break;
+                    }
                 }
-                if (noArgCtor != null) {
-                    Throwable wx = (Throwable)noArgCtor.newInstance();
-                    wx.initCause(ex);
-                    return wx;
+                if (oneArgCtor != null)
+                    ex = (Throwable)oneArgCtor.newInstance(ex);
+                else if (noArgCtor != null) {
+                    Throwable rx = (Throwable)noArgCtor.newInstance();
+                    rx.initCause(ex);
+                    ex = rx;
                 }
             } catch (Exception ignore) {
             }
@@ -616,48 +569,43 @@ else if (ps.length == 1 && ps[0] == Throwable.class)
     }
 
     /**
-     * Polls stale refs and removes them. Call only while holding lock.
+     * Returns exception associated with the given status, or null if none.
      */
-    private static void expungeStaleExceptions() {
-        for (Object x; (x = exceptionTableRefQueue.poll()) != null;) {
-            if (x instanceof ExceptionNode) {
-                ExceptionNode[] t = exceptionTable;
-                int i = ((ExceptionNode)x).hashCode & (t.length - 1);
-                ExceptionNode e = t[i];
-                ExceptionNode pred = null;
-                while (e != null) {
-                    ExceptionNode next = e.next;
-                    if (e == x) {
-                        if (pred == null)
-                            t[i] = next;
-                        else
-                            pred.next = next;
-                        break;
-                    }
-                    pred = e;
-                    e = next;
-                }
-            }
-        }
+    private Throwable getException(int s) {
+        Throwable ex = null;
+        if ((s & ABNORMAL) != 0 &&
+            ((s & THROWN) == 0 || (ex = getThrowableException()) == null))
+            ex = new CancellationException();
+        return ex;
     }
 
     /**
-     * If lock is available, polls stale refs and removes them.
-     * Called from ForkJoinPool when pools become quiescent.
+     * Throws exception associated with the given status, or
+     * CancellationException if none recorded.
      */
-    static final void helpExpungeStaleExceptions() {
-        final ReentrantLock lock = exceptionTableLock;
-        if (lock.tryLock()) {
-            try {
-                expungeStaleExceptions();
-            } finally {
-                lock.unlock();
-            }
-        }
+    private void reportException(int s) {
+        ForkJoinTask.<RuntimeException>uncheckedThrow(
+            (s & THROWN) != 0 ? getThrowableException() : null);
+    }
+
+    /**
+     * Throws exception for (timed or untimed) get, wrapping if
+     * necessary in an ExecutionException.
+     */
+    private void reportExecutionException(int s) {
+        Throwable ex = null;
+        if (s == ABNORMAL)
+            ex = new InterruptedException();
+        else if (s >= 0)
+            ex = new TimeoutException();
+        else if ((s & THROWN) != 0 && (ex = getThrowableException()) != null)
+            ex = new ExecutionException(ex);
+        ForkJoinTask.<RuntimeException>uncheckedThrow(ex);
     }
 
     /**
-     * A version of "sneaky throw" to relay exceptions.
+     * A version of "sneaky throw" to relay exceptions in other
+     * contexts.
      */
     static void rethrow(Throwable ex) {
         ForkJoinTask.<RuntimeException>uncheckedThrow(ex);
@@ -666,22 +614,14 @@ static void rethrow(Throwable ex) {
     /**
      * The sneaky part of sneaky throw, relying on generics
      * limitations to evade compiler complaints about rethrowing
-     * unchecked exceptions.
+     * unchecked exceptions. If argument null, throws
+     * CancellationException.
      */
     @SuppressWarnings("unchecked") static <T extends Throwable>
     void uncheckedThrow(Throwable t) throws T {
-        if (t != null)
-            throw (T)t; // rely on vacuous cast
-        else
-            throw new Error("Unknown Exception");
-    }
-
-    /**
-     * Throws exception, if any, associated with the given status.
-     */
-    private void reportException(int s) {
-        rethrow((s & THROWN) != 0 ? getThrowableException() :
-                new CancellationException());
+        if (t == null)
+            t = new CancellationException();
+        throw (T)t; // rely on vacuous cast
     }
 
     // public methods
@@ -702,9 +642,9 @@ private void reportException(int s) {
      * @return {@code this}, to simplify usage
      */
     public final ForkJoinTask<V> fork() {
-        Thread t;
+        Thread t; ForkJoinWorkerThread w;
         if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
-            ((ForkJoinWorkerThread)t).workQueue.push(this);
+            (w = (ForkJoinWorkerThread)t).workQueue.push(this, w.pool);
         else
             ForkJoinPool.common.externalPush(this);
         return this;
@@ -723,7 +663,9 @@ public final ForkJoinTask<V> fork() {
      */
     public final V join() {
         int s;
-        if (((s = doJoin()) & ABNORMAL) != 0)
+        if ((s = status) >= 0)
+            s = awaitJoin(false, false, false, 0L);
+        if ((s & ABNORMAL) != 0)
             reportException(s);
         return getRawResult();
     }
@@ -738,7 +680,9 @@ public final V join() {
      */
     public final V invoke() {
         int s;
-        if (((s = doInvoke()) & ABNORMAL) != 0)
+        if ((s = doExec()) >= 0)
+            s = awaitJoin(true, false, false, 0L);
+        if ((s & ABNORMAL) != 0)
             reportException(s);
         return getRawResult();
     }
@@ -762,10 +706,16 @@ public final V invoke() {
      */
     public static void invokeAll(ForkJoinTask<?> t1, ForkJoinTask<?> t2) {
         int s1, s2;
+        if (t1 == null || t2 == null)
+            throw new NullPointerException();
         t2.fork();
-        if (((s1 = t1.doInvoke()) & ABNORMAL) != 0)
+        if ((s1 = t1.doExec()) >= 0)
+            s1 = t1.awaitJoin(true, false, false, 0L);
+        if ((s1 & ABNORMAL) != 0) {
+            cancelIgnoringExceptions(t2);
             t1.reportException(s1);
-        if (((s2 = t2.doJoin()) & ABNORMAL) != 0)
+        }
+        else if (((s2 = t2.awaitJoin(false, false, false, 0L)) & ABNORMAL) != 0)
             t2.reportException(s2);
     }
 
@@ -788,27 +738,38 @@ public static void invokeAll(ForkJoinTask<?>... tasks) {
         Throwable ex = null;
         int last = tasks.length - 1;
         for (int i = last; i >= 0; --i) {
-            ForkJoinTask<?> t = tasks[i];
-            if (t == null) {
-                if (ex == null)
-                    ex = new NullPointerException();
+            ForkJoinTask<?> t;
+            if ((t = tasks[i]) == null) {
+                ex = new NullPointerException();
+                break;
+            }
+            if (i == 0) {
+                int s;
+                if ((s = t.doExec()) >= 0)
+                    s = t.awaitJoin(true, false, false, 0L);
+                if ((s & ABNORMAL) != 0)
+                    ex = t.getException(s);
+                break;
             }
-            else if (i != 0)
-                t.fork();
-            else if ((t.doInvoke() & ABNORMAL) != 0 && ex == null)
-                ex = t.getException();
+            t.fork();
         }
-        for (int i = 1; i <= last; ++i) {
-            ForkJoinTask<?> t = tasks[i];
-            if (t != null) {
-                if (ex != null)
-                    t.cancel(false);
-                else if ((t.doJoin() & ABNORMAL) != 0)
-                    ex = t.getException();
+        if (ex == null) {
+            for (int i = 1; i <= last; ++i) {
+                ForkJoinTask<?> t;
+                if ((t = tasks[i]) != null) {
+                    int s;
+                    if ((s = t.status) >= 0)
+                        s = t.awaitJoin(false, false, false, 0L);
+                    if ((s & ABNORMAL) != 0 && (ex = t.getException(s)) != null)
+                        break;
+                }
             }
         }
-        if (ex != null)
+        if (ex != null) {
+            for (int i = 1; i <= last; ++i)
+                cancelIgnoringExceptions(tasks[i]);
             rethrow(ex);
+        }
     }
 
     /**
@@ -838,29 +799,40 @@ public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T>
         List<? extends ForkJoinTask<?>> ts =
             (List<? extends ForkJoinTask<?>>) tasks;
         Throwable ex = null;
-        int last = ts.size() - 1;
+        int last = ts.size() - 1;  // nearly same as array version
         for (int i = last; i >= 0; --i) {
-            ForkJoinTask<?> t = ts.get(i);
-            if (t == null) {
-                if (ex == null)
-                    ex = new NullPointerException();
+            ForkJoinTask<?> t;
+            if ((t = ts.get(i)) == null) {
+                ex = new NullPointerException();
+                break;
+            }
+            if (i == 0) {
+                int s;
+                if ((s = t.doExec()) >= 0)
+                    s = t.awaitJoin(true, false, false, 0L);
+                if ((s & ABNORMAL) != 0)
+                    ex = t.getException(s);
+                break;
             }
-            else if (i != 0)
-                t.fork();
-            else if ((t.doInvoke() & ABNORMAL) != 0 && ex == null)
-                ex = t.getException();
+            t.fork();
         }
-        for (int i = 1; i <= last; ++i) {
-            ForkJoinTask<?> t = ts.get(i);
-            if (t != null) {
-                if (ex != null)
-                    t.cancel(false);
-                else if ((t.doJoin() & ABNORMAL) != 0)
-                    ex = t.getException();
+        if (ex == null) {
+            for (int i = 1; i <= last; ++i) {
+                ForkJoinTask<?> t;
+                if ((t = ts.get(i)) != null) {
+                    int s;
+                    if ((s = t.status) >= 0)
+                        s = t.awaitJoin(false, false, false, 0L);
+                    if ((s & ABNORMAL) != 0 && (ex = t.getException(s)) != null)
+                        break;
+                }
             }
         }
-        if (ex != null)
+        if (ex != null) {
+            for (int i = 1; i <= last; ++i)
+                cancelIgnoringExceptions(ts.get(i));
             rethrow(ex);
+        }
         return tasks;
     }
 
@@ -892,8 +864,7 @@ else if ((t.doJoin() & ABNORMAL) != 0)
      * @return {@code true} if this task is now cancelled
      */
     public boolean cancel(boolean mayInterruptIfRunning) {
-        int s = abnormalCompletion(DONE | ABNORMAL);
-        return (s & (ABNORMAL | THROWN)) == ABNORMAL;
+        return (trySetCancelled() & (ABNORMAL | THROWN)) == ABNORMAL;
     }
 
     public final boolean isDone() {
@@ -932,10 +903,7 @@ public final boolean isCompletedNormally() {
      * @return the exception, or {@code null} if none
      */
     public final Throwable getException() {
-        int s = status;
-        return ((s & ABNORMAL) == 0 ? null :
-                (s & THROWN)   == 0 ? new CancellationException() :
-                getThrowableException());
+        return getException(status);
     }
 
     /**
@@ -953,9 +921,9 @@ public final Throwable getException() {
      * thrown will be a {@code RuntimeException} with cause {@code ex}.
      */
     public void completeExceptionally(Throwable ex) {
-        setExceptionalCompletion((ex instanceof RuntimeException) ||
-                                 (ex instanceof Error) ? ex :
-                                 new RuntimeException(ex));
+        trySetException((ex instanceof RuntimeException) ||
+                        (ex instanceof Error) ? ex :
+                        new RuntimeException(ex));
     }
 
     /**
@@ -975,7 +943,7 @@ public void complete(V value) {
         try {
             setRawResult(value);
         } catch (Throwable rex) {
-            setExceptionalCompletion(rex);
+            trySetException(rex);
             return;
         }
         setDone();
@@ -1005,14 +973,10 @@ public final void quietlyComplete() {
      * member of a ForkJoinPool and was interrupted while waiting
      */
     public final V get() throws InterruptedException, ExecutionException {
-        int s = (Thread.currentThread() instanceof ForkJoinWorkerThread) ?
-            doJoin() : externalInterruptibleAwaitDone();
-        if ((s & THROWN) != 0)
-            throw new ExecutionException(getThrowableException());
-        else if ((s & ABNORMAL) != 0)
-            throw new CancellationException();
-        else
-            return getRawResult();
+        int s;
+        if (((s = awaitJoin(false, true, false, 0L)) & ABNORMAL) != 0)
+            reportExecutionException(s);
+        return getRawResult();
     }
 
     /**
@@ -1032,45 +996,10 @@ else if ((s & ABNORMAL) != 0)
     public final V get(long timeout, TimeUnit unit)
         throws InterruptedException, ExecutionException, TimeoutException {
         int s;
-        long nanos = unit.toNanos(timeout);
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        if ((s = status) >= 0 && nanos > 0L) {
-            long d = System.nanoTime() + nanos;
-            long deadline = (d == 0L) ? 1L : d; // avoid 0
-            Thread t = Thread.currentThread();
-            if (t instanceof ForkJoinWorkerThread) {
-                ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
-                s = wt.pool.awaitJoin(wt.workQueue, this, deadline);
-            }
-            else if ((s = ((this instanceof CountedCompleter) ?
-                           ForkJoinPool.common.externalHelpComplete(
-                               (CountedCompleter<?>)this, 0) :
-                           ForkJoinPool.common.tryExternalUnpush(this) ?
-                           doExec() : 0)) >= 0) {
-                long ns, ms; // measure in nanosecs, but wait in millisecs
-                while ((s = status) >= 0 &&
-                       (ns = deadline - System.nanoTime()) > 0L) {
-                    if ((ms = TimeUnit.NANOSECONDS.toMillis(ns)) > 0L &&
-                        (s = (int)STATUS.getAndBitwiseOr(this, SIGNAL)) >= 0) {
-                        synchronized (this) {
-                            if (status >= 0)
-                                wait(ms); // OK to throw InterruptedException
-                            else
-                                notifyAll();
-                        }
-                    }
-                }
-            }
-        }
-        if (s >= 0)
-            throw new TimeoutException();
-        else if ((s & THROWN) != 0)
-            throw new ExecutionException(getThrowableException());
-        else if ((s & ABNORMAL) != 0)
-            throw new CancellationException();
-        else
-            return getRawResult();
+        if ((s = awaitJoin(false, true, true, unit.toNanos(timeout))) >= 0 ||
+            (s & ABNORMAL) != 0)
+            reportExecutionException(s);
+        return getRawResult();
     }
 
     /**
@@ -1080,7 +1009,8 @@ else if ((s & ABNORMAL) != 0)
      * known to have aborted.
      */
     public final void quietlyJoin() {
-        doJoin();
+        if (status >= 0)
+            awaitJoin(false, false, false, 0L);
     }
 
     /**
@@ -1089,7 +1019,8 @@ public final void quietlyJoin() {
      * exception.
      */
     public final void quietlyInvoke() {
-        doInvoke();
+        if (doExec() >= 0)
+            awaitJoin(true, false, false, 0L);
     }
 
     /**
@@ -1100,13 +1031,12 @@ public final void quietlyInvoke() {
      * all are processed.
      */
     public static void helpQuiesce() {
-        Thread t;
-        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
-            ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
-            wt.pool.helpQuiescePool(wt.workQueue);
-        }
+        Thread t; ForkJoinWorkerThread w; ForkJoinPool p;
+        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread &&
+            (p = (w = (ForkJoinWorkerThread)t).pool) != null)
+            p.helpQuiescePool(w.workQueue, Long.MAX_VALUE, false);
         else
-            ForkJoinPool.quiesceCommonPool();
+            ForkJoinPool.common.externalHelpQuiescePool(Long.MAX_VALUE, false);
     }
 
     /**
@@ -1126,10 +1056,8 @@ public static void helpQuiesce() {
      * setRawResult(null)}.
      */
     public void reinitialize() {
-        if ((status & THROWN) != 0)
-            clearExceptionalCompletion();
-        else
-            status = 0;
+        aux = null;
+        status = 0;
     }
 
     /**
@@ -1142,9 +1070,9 @@ public void reinitialize() {
      * @return the pool, or {@code null} if none
      */
     public static ForkJoinPool getPool() {
-        Thread t = Thread.currentThread();
-        return (t instanceof ForkJoinWorkerThread) ?
-            ((ForkJoinWorkerThread) t).pool : null;
+        Thread t;
+        return (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
+                ((ForkJoinWorkerThread) t).pool : null);
     }
 
     /**
@@ -1170,10 +1098,12 @@ public static boolean inForkJoinPool() {
      * @return {@code true} if unforked
      */
     public boolean tryUnfork() {
-        Thread t;
-        return (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
-                ((ForkJoinWorkerThread)t).workQueue.tryUnpush(this) :
-                ForkJoinPool.common.tryExternalUnpush(this));
+        Thread t; ForkJoinPool.WorkQueue q;
+        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
+            ? (q = ((ForkJoinWorkerThread)t).workQueue) != null
+               && q.tryUnpush(this)
+            : (q = ForkJoinPool.commonQueue()) != null
+               && q.externalTryUnpush(this);
     }
 
     /**
@@ -1189,7 +1119,7 @@ public static int getQueuedTaskCount() {
         if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
             q = ((ForkJoinWorkerThread)t).workQueue;
         else
-            q = ForkJoinPool.commonSubmitterQueue();
+            q = ForkJoinPool.commonQueue();
         return (q == null) ? 0 : q.queueSize();
     }
 
@@ -1264,7 +1194,7 @@ protected static ForkJoinTask<?> peekNextLocalTask() {
         if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
             q = ((ForkJoinWorkerThread)t).workQueue;
         else
-            q = ForkJoinPool.commonSubmitterQueue();
+            q = ForkJoinPool.commonQueue();
         return (q == null) ? null : q.peek();
     }
 
@@ -1279,9 +1209,8 @@ protected static ForkJoinTask<?> peekNextLocalTask() {
      */
     protected static ForkJoinTask<?> pollNextLocalTask() {
         Thread t;
-        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
-            ((ForkJoinWorkerThread)t).workQueue.nextLocalTask() :
-            null;
+        return (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
+                ((ForkJoinWorkerThread)t).workQueue.nextLocalTask() : null);
     }
 
     /**
@@ -1298,10 +1227,10 @@ protected static ForkJoinTask<?> pollNextLocalTask() {
      * @return a task, or {@code null} if none are available
      */
     protected static ForkJoinTask<?> pollTask() {
-        Thread t; ForkJoinWorkerThread wt;
-        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
-            (wt = (ForkJoinWorkerThread)t).pool.nextTaskFor(wt.workQueue) :
-            null;
+        Thread t; ForkJoinWorkerThread w;
+        return (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
+                (w = (ForkJoinWorkerThread)t).pool.nextTaskFor(w.workQueue) :
+                null);
     }
 
     /**
@@ -1317,8 +1246,8 @@ protected static ForkJoinTask<?> pollTask() {
      */
     protected static ForkJoinTask<?> pollSubmission() {
         Thread t;
-        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
-            ((ForkJoinWorkerThread)t).pool.pollSubmission() : null;
+        return (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
+                ((ForkJoinWorkerThread)t).pool.pollSubmission() : null);
     }
 
     // tag operations
@@ -1342,8 +1271,7 @@ public final short getForkJoinTaskTag() {
      */
     public final short setForkJoinTaskTag(short newValue) {
         for (int s;;) {
-            if (STATUS.weakCompareAndSet(this, s = status,
-                                         (s & ~SMASK) | (newValue & SMASK)))
+            if (casStatus(s = status, (s & ~SMASK) | (newValue & SMASK)))
                 return (short)s;
         }
     }
@@ -1366,8 +1294,7 @@ public final boolean compareAndSetForkJoinTaskTag(short expect, short update) {
         for (int s;;) {
             if ((short)(s = status) != expect)
                 return false;
-            if (STATUS.weakCompareAndSet(this, s,
-                                         (s & ~SMASK) | (update & SMASK)))
+            if (casStatus(s, (s & ~SMASK) | (update & SMASK)))
                 return true;
         }
     }
@@ -1432,8 +1359,17 @@ static final class RunnableExecuteAction extends ForkJoinTask<Void> {
         public final Void getRawResult() { return null; }
         public final void setRawResult(Void v) { }
         public final boolean exec() { runnable.run(); return true; }
-        void internalPropagateException(Throwable ex) {
-            rethrow(ex); // rethrow outside exec() catches.
+        int trySetException(Throwable ex) { // if a handler, invoke it
+            int s; Thread t; java.lang.Thread.UncaughtExceptionHandler h;
+            if (isExceptionalStatus(s = trySetThrown(ex)) &&
+                (h = ((t = Thread.currentThread()).
+                      getUncaughtExceptionHandler())) != null) {
+                try {
+                    h.uncaughtException(t, ex);
+                } catch (Throwable ignore) {
+                }
+            }
+            return s;
         }
         private static final long serialVersionUID = 5232453952276885070L;
     }
@@ -1470,6 +1406,53 @@ public String toString() {
         private static final long serialVersionUID = 2838392045355241008L;
     }
 
+    static final class AdaptedInterruptibleCallable<T> extends ForkJoinTask<T>
+        implements RunnableFuture<T> {
+        @SuppressWarnings("serial") // Conditionally serializable
+        final Callable<? extends T> callable;
+        @SuppressWarnings("serial") // Conditionally serializable
+        transient volatile Thread runner;
+        T result;
+        AdaptedInterruptibleCallable(Callable<? extends T> callable) {
+            if (callable == null) throw new NullPointerException();
+            this.callable = callable;
+        }
+        public final T getRawResult() { return result; }
+        public final void setRawResult(T v) { result = v; }
+        public final boolean exec() {
+            Thread.interrupted();
+            runner = Thread.currentThread();
+            try {
+                if (!isDone()) // recheck
+                    result = callable.call();
+                return true;
+            } catch (RuntimeException rex) {
+                throw rex;
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            } finally {
+                runner = null;
+                Thread.interrupted();
+            }
+        }
+        public final void run() { invoke(); }
+        public final boolean cancel(boolean mayInterruptIfRunning) {
+            Thread t;
+            boolean stat = super.cancel(false);
+            if (mayInterruptIfRunning && (t = runner) != null) {
+                try {
+                    t.interrupt();
+                } catch (Throwable ignore) {
+                }
+            }
+            return stat;
+        }
+        public String toString() {
+            return super.toString() + "[Wrapped task = " + callable + "]";
+        }
+        private static final long serialVersionUID = 2838392045355241008L;
+    }
+
     /**
      * Returns a new {@code ForkJoinTask} that performs the {@code run}
      * method of the given {@code Runnable} as its action, and returns
@@ -1510,6 +1493,26 @@ public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {
         return new AdaptedCallable<T>(callable);
     }
 
+    /**
+     * Returns a new {@code ForkJoinTask} that performs the {@code call}
+     * method of the given {@code Callable} as its action, and returns
+     * its result upon {@link #join}, translating any checked exceptions
+     * encountered into {@code RuntimeException}.  Additionally,
+     * invocations of {@code cancel} with {@code mayInterruptIfRunning
+     * true} will attempt to interrupt the thread performing the task.
+     *
+     * @param callable the callable action
+     * @param <T> the type of the callable's result
+     * @return the task
+     *
+     * @since 17
+     */
+    // adaptInterruptible deferred to its own independent change
+    // https://bugs.openjdk.java.net/browse/JDK-8246587
+    /* TODO: public */ private static <T> ForkJoinTask<T> adaptInterruptible(Callable<? extends T> callable) {
+        return new AdaptedInterruptibleCallable<T>(callable);
+    }
+
     // Serialization support
 
     private static final long serialVersionUID = -7721805057305804111L;
@@ -1524,8 +1527,9 @@ public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {
      */
     private void writeObject(java.io.ObjectOutputStream s)
         throws java.io.IOException {
+        Aux a;
         s.defaultWriteObject();
-        s.writeObject(getException());
+        s.writeObject((a = aux) == null ? null : a.ex);
     }
 
     /**
@@ -1540,15 +1544,14 @@ private void readObject(java.io.ObjectInputStream s)
         s.defaultReadObject();
         Object ex = s.readObject();
         if (ex != null)
-            setExceptionalCompletion((Throwable)ex);
+            trySetThrown((Throwable)ex);
     }
 
-    // VarHandle mechanics
-    private static final VarHandle STATUS;
     static {
         try {
             MethodHandles.Lookup l = MethodHandles.lookup();
             STATUS = l.findVarHandle(ForkJoinTask.class, "status", int.class);
+            AUX = l.findVarHandle(ForkJoinTask.class, "aux", Aux.class);
         } catch (ReflectiveOperationException e) {
             throw new ExceptionInInitializerError(e);
         }
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
index 1a455216ea535..5817b8fc70adb 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
@@ -35,10 +35,8 @@
 
 package java.util.concurrent;
 
-import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 
 /**
  * A thread managed by a {@link ForkJoinPool}, which executes
@@ -62,66 +60,47 @@ public class ForkJoinWorkerThread extends Thread {
      * ForkJoinTasks. For explanation, see the internal documentation
      * of class ForkJoinPool.
      *
-     * This class just maintains links to its pool and WorkQueue.  The
-     * pool field is set immediately upon construction, but the
-     * workQueue field is not set until a call to registerWorker
-     * completes. This leads to a visibility race, that is tolerated
-     * by requiring that the workQueue field is only accessed by the
-     * owning thread.
-     *
-     * Support for (non-public) subclass InnocuousForkJoinWorkerThread
-     * requires that we break quite a lot of encapsulation (via helper
-     * methods in ThreadLocalRandom) both here and in the subclass to
-     * access and set Thread fields.
+     * This class just maintains links to its pool and WorkQueue.
      */
 
     final ForkJoinPool pool;                // the pool this thread works in
     final ForkJoinPool.WorkQueue workQueue; // work-stealing mechanics
 
-    /** An AccessControlContext supporting no privileges */
-    private static final AccessControlContext INNOCUOUS_ACC =
-        new AccessControlContext(
-            new ProtectionDomain[] { new ProtectionDomain(null, null) });
-
     /**
-     * Creates a ForkJoinWorkerThread operating in the given pool.
-     *
-     * @param pool the pool this thread works in
-     * @throws NullPointerException if pool is null
+     * Full nonpublic constructor.
      */
-    protected ForkJoinWorkerThread(ForkJoinPool pool) {
-        // Use a placeholder until a useful name can be set in registerWorker
-        super("aForkJoinWorkerThread");
-        this.pool = pool;
-        this.workQueue = pool.registerWorker(this);
+    ForkJoinWorkerThread(ThreadGroup group, ForkJoinPool pool,
+                         boolean useSystemClassLoader, boolean isInnocuous) {
+        super(group, null, pool.nextWorkerThreadName(), 0L);
+        UncaughtExceptionHandler handler = (this.pool = pool).ueh;
+        this.workQueue = new ForkJoinPool.WorkQueue(this, isInnocuous);
+        super.setDaemon(true);
+        if (handler != null)
+            super.setUncaughtExceptionHandler(handler);
+        if (useSystemClassLoader)
+            super.setContextClassLoader(ClassLoader.getSystemClassLoader());
     }
 
     /**
-     * Version for use by the default pool.  Supports setting the
-     * context class loader.  This is a separate constructor to avoid
-     * affecting the protected constructor.
+     * Creates a ForkJoinWorkerThread operating in the given thread group and
+     * pool.
+     *
+     * @param group if non-null, the thread group for this thread
+     * @param pool the pool this thread works in
+     * @throws NullPointerException if pool is null
      */
-    ForkJoinWorkerThread(ForkJoinPool pool, ClassLoader ccl) {
-        super("aForkJoinWorkerThread");
-        super.setContextClassLoader(ccl);
-        ThreadLocalRandom.setInheritedAccessControlContext(this, INNOCUOUS_ACC);
-        this.pool = pool;
-        this.workQueue = pool.registerWorker(this);
+    /* TODO: protected */ ForkJoinWorkerThread(ThreadGroup group, ForkJoinPool pool) {
+        this(group, pool, false, false);
     }
 
     /**
-     * Version for InnocuousForkJoinWorkerThread.
+     * Creates a ForkJoinWorkerThread operating in the given pool.
+     *
+     * @param pool the pool this thread works in
+     * @throws NullPointerException if pool is null
      */
-    ForkJoinWorkerThread(ForkJoinPool pool,
-                         ClassLoader ccl,
-                         ThreadGroup threadGroup,
-                         AccessControlContext acc) {
-        super(threadGroup, null, "aForkJoinWorkerThread");
-        super.setContextClassLoader(ccl);
-        ThreadLocalRandom.setInheritedAccessControlContext(this, acc);
-        ThreadLocalRandom.eraseThreadLocals(this); // clear before registering
-        this.pool = pool;
-        this.workQueue = pool.registerWorker(this);
+    protected ForkJoinWorkerThread(ForkJoinPool pool) {
+        this(null, pool, false, false);
     }
 
     /**
@@ -176,11 +155,14 @@ protected void onTermination(Throwable exception) {
      * {@link ForkJoinTask}s.
      */
     public void run() {
-        if (workQueue.array == null) { // only run once
-            Throwable exception = null;
+        Throwable exception = null;
+        ForkJoinPool p = pool;
+        ForkJoinPool.WorkQueue w = workQueue;
+        if (p != null && w != null) {   // skip on failed initialization
             try {
+                p.registerWorker(w);
                 onStart();
-                pool.runWorker(workQueue);
+                p.runWorker(w);
             } catch (Throwable ex) {
                 exception = ex;
             } finally {
@@ -190,18 +172,12 @@ public void run() {
                     if (exception == null)
                         exception = ex;
                 } finally {
-                    pool.deregisterWorker(this, exception);
+                    p.deregisterWorker(this, exception);
                 }
             }
         }
     }
 
-    /**
-     * Non-public hook method for InnocuousForkJoinWorkerThread.
-     */
-    void afterTopLevelExec() {
-    }
-
     /**
      * A worker thread that has no permissions, is not a member of any
      * user-defined ThreadGroup, uses the system class loader as
@@ -221,15 +197,7 @@ public ThreadGroup run() {
                 }});
 
         InnocuousForkJoinWorkerThread(ForkJoinPool pool) {
-            super(pool,
-                  ClassLoader.getSystemClassLoader(),
-                  innocuousThreadGroup,
-                  INNOCUOUS_ACC);
-        }
-
-        @Override // to erase ThreadLocals
-        void afterTopLevelExec() {
-            ThreadLocalRandom.eraseThreadLocals(this);
+            super(innocuousThreadGroup, pool, true, true);
         }
 
         @Override // to silently fail
diff --git a/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNow.java b/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNow.java
new file mode 100644
index 0000000000000..7ae3a0a685305
--- /dev/null
+++ b/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNow.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @run testng AsyncShutdownNow
+ * @summary Test invoking shutdownNow with threads blocked in Future.get,
+ *          invokeAll, and invokeAny
+ */
+
+// TODO: this test is far too slow
+
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class AsyncShutdownNow {
+
+    // long running interruptible task
+    private static final Callable<Void> SLEEP_FOR_A_DAY = () -> {
+        Thread.sleep(86400_000);
+        return null;
+    };
+
+    private ScheduledExecutorService scheduledExecutor;
+
+    @BeforeClass
+    public void setup() {
+        scheduledExecutor = Executors.newScheduledThreadPool(1);
+    }
+
+    @AfterClass
+    public void teardown() {
+        scheduledExecutor.shutdown();
+    }
+
+    /**
+     * Schedule the given executor service to be shutdown abruptly after the given
+     * delay, in seconds.
+     */
+    private void scheduleShutdownNow(ExecutorService executor, int delayInSeconds) {
+        scheduledExecutor.schedule(() -> {
+            executor.shutdownNow();
+            return null;
+        }, delayInSeconds, TimeUnit.SECONDS);
+    }
+
+    /**
+     * The executors to test.
+     */
+    @DataProvider(name = "executors")
+    public Object[][] executors() {
+        return new Object[][] {
+                { new ForkJoinPool() },
+                { new ForkJoinPool(1) },
+        };
+    }
+
+    /**
+     * Test shutdownNow with running task and thread blocked in Future::get.
+     */
+    @Test(dataProvider = "executors")
+    public void testFutureGet(ExecutorService executor) throws Exception {
+        System.out.format("testFutureGet: %s%n", executor);
+        scheduleShutdownNow(executor, 5);
+        try {
+            // submit long running task, the task should be cancelled
+            Future<?> future = executor.submit(SLEEP_FOR_A_DAY);
+            try {
+                future.get();
+                assertTrue(false);
+            } catch (ExecutionException e) {
+                // expected
+            }
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    /**
+     * Test shutdownNow with running task and thread blocked in a timed Future::get.
+     */
+    @Test(dataProvider = "executors")
+    public void testTimedFutureGet(ExecutorService executor) throws Exception {
+        System.out.format("testTimedFutureGet: %s%n", executor);
+        scheduleShutdownNow(executor, 5);
+        try {
+            // submit long running task, the task should be cancelled
+            Future<?> future = executor.submit(SLEEP_FOR_A_DAY);
+            try {
+                future.get(1, TimeUnit.HOURS);
+                assertTrue(false);
+            } catch (ExecutionException e) {
+                // expected
+            }
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    /**
+     * Test shutdownNow with thread blocked in invokeAll.
+     */
+    @Test(dataProvider = "executors")
+    public void testInvokeAll(ExecutorService executor) throws Exception {
+        System.out.format("testInvokeAll: %s%n", executor);
+        scheduleShutdownNow(executor, 5);
+        try {
+            // execute long running tasks
+            List<Future<Void>> futures = executor.invokeAll(List.of(SLEEP_FOR_A_DAY, SLEEP_FOR_A_DAY));
+            for (Future<Void> f : futures) {
+                assertTrue(f.isDone());
+                try {
+                    Object result = f.get();
+                    assertTrue(false);
+                } catch (ExecutionException | CancellationException e) {
+                    // expected
+                }
+            }
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    /**
+     * Test shutdownNow with thread blocked in invokeAny.
+     */
+    @Test(dataProvider = "executors")
+    public void testInvokeAny(ExecutorService executor) throws Exception {
+        System.out.format("testInvokeAny: %s%n", executor);
+        scheduleShutdownNow(executor, 5);
+        try {
+            try {
+                // execute long running tasks
+                executor.invokeAny(List.of(SLEEP_FOR_A_DAY, SLEEP_FOR_A_DAY));
+                assertTrue(false);
+            } catch (ExecutionException e) {
+                // expected
+            }
+        } finally {
+            executor.shutdown();
+        }
+    }
+}
diff --git a/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAny.java b/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAny.java
new file mode 100644
index 0000000000000..4b1f2eccfe222
--- /dev/null
+++ b/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAny.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @run testng AsyncShutdownNowInvokeAny
+ * @summary A variant of AsyncShutdownNow useful for race bug hunting
+ */
+
+// TODO: reorganize all of the AsyncShutdown tests
+
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class AsyncShutdownNowInvokeAny {
+
+    // long running interruptible task
+    private static final Callable<Void> SLEEP_FOR_A_DAY = () -> {
+        Thread.sleep(86400_000);
+        return null;
+    };
+
+    private ScheduledExecutorService scheduledExecutor;
+
+    @BeforeClass
+    public void setup() {
+        scheduledExecutor = Executors.newScheduledThreadPool(1);
+    }
+
+    @AfterClass
+    public void teardown() {
+        scheduledExecutor.shutdown();
+    }
+
+    /**
+     * Schedule the given executor service to be shutdown abruptly after the given
+     * delay, in seconds.
+     */
+    private void scheduleShutdownNow(ExecutorService executor, int delayInSeconds) {
+        scheduledExecutor.schedule(() -> {
+            executor.shutdownNow();
+            return null;
+        }, delayInSeconds, TimeUnit.SECONDS);
+    }
+
+    /**
+     * Test shutdownNow with thread blocked in invokeAny.
+     */
+    @Test
+    public void testInvokeAny() throws Exception {
+        final int reps = 4;
+        for (int rep = 1; rep < reps; rep++) {
+            ExecutorService pool = new ForkJoinPool(1);
+            scheduleShutdownNow(pool, 5);
+            try {
+                try {
+                    // execute long running tasks
+                    pool.invokeAny(List.of(SLEEP_FOR_A_DAY, SLEEP_FOR_A_DAY));
+                    assertTrue(false);
+                } catch (ExecutionException e) {
+                    // expected
+                }
+            } finally {
+                pool.shutdown();
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAnyRace.java b/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAnyRace.java
new file mode 100644
index 0000000000000..c48cf94954664
--- /dev/null
+++ b/test/jdk/java/util/concurrent/forkjoin/AsyncShutdownNowInvokeAnyRace.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @run testng AsyncShutdownNowInvokeAnyRace
+ * @summary A variant of AsyncShutdownNow useful for race bug hunting
+ */
+
+// TODO: reorganize all of the AsyncShutdown tests
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.LockInfo;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class AsyncShutdownNowInvokeAnyRace {
+
+    // TODO: even more jitter-inducing parallelism?
+
+//         int nThreads = ThreadLocalRandom.current().nextInt(1, 50);
+//         ExecutorService pool = Executors.newCachedThreadPool();
+//         Callable<Void> task = () -> { testInvokeAny_1(); return null; };
+//         List<Callable<Void>> tasks = Collections.nCopies(nThreads, task);
+//         try {
+//             for (Future<Void> future : pool.invokeAll(tasks)) {
+//                 future.get();
+//             }
+//         } finally {
+//             pool.shutdown();
+//         }
+//     }
+
+//     public void testInvokeAny_1() throws Exception {
+
+    /**
+     * Test shutdownNow with thread blocked in invokeAny.
+     */
+    @Test
+    public void testInvokeAny() throws Exception {
+        final int reps = 30_000;
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
+        int falseAlarms = 0;
+        for (int rep = 1; rep < reps; rep++) {
+            ForkJoinPool pool = new ForkJoinPool(1);
+            CountDownLatch pleaseShutdownNow = new CountDownLatch(1);
+            int nTasks = rnd.nextInt(2, 5);
+            AtomicInteger threadsStarted = new AtomicInteger(0);
+            AtomicReference<String> poolAtShutdownNow = new AtomicReference<>();
+            Callable<Void> blockPool = () -> {
+                threadsStarted.getAndIncrement();
+                // await submission quiescence; may false-alarm
+                // TODO: consider re-checking to reduce false alarms
+                while (threadsStarted.get() + pool.getQueuedSubmissionCount() < nTasks)
+                    Thread.yield();
+                pleaseShutdownNow.countDown();
+                Thread.sleep(86400_000);
+                return null;
+            };
+            List<Callable<Void>> tasks = Collections.nCopies(nTasks, blockPool);
+            Runnable shutdown = () -> {
+                try {
+                    pleaseShutdownNow.await();
+                    poolAtShutdownNow.set(pool.toString());
+                    pool.shutdownNow();
+                } catch (Throwable t) { throw new AssertionError(t); }
+            };
+            Future<Void> shutdownResult = CompletableFuture.runAsync(shutdown);
+            try {
+                try {
+                    if (rnd.nextBoolean())
+                        pool.invokeAny(tasks, 10L, SECONDS);
+                    else
+                        pool.invokeAny(tasks);
+                    throw new AssertionError("should throw");
+                } catch (RejectedExecutionException re) {
+                    falseAlarms++;
+                } catch (CancellationException re) {
+                } catch (ExecutionException ex) {
+                    Throwable cause = ex.getCause();
+                    if (!(cause instanceof InterruptedException) &&
+                        !(cause instanceof CancellationException))
+                        throw ex;
+                } catch (TimeoutException ex) {
+                    dumpTestThreads();
+                    int i = rep;
+                    String detail = String.format(
+                        "invokeAny timed out, "
+                        + "nTasks=%d rep=%d threadsStarted=%d%n"
+                        + "poolAtShutdownNow=%s%n"
+                        + "poolAtTimeout=%s%n"
+                        + "queuedTaskCount=%d queuedSubmissionCount=%d",
+                        nTasks, i, threadsStarted.get(),
+                        poolAtShutdownNow,
+                        pool,
+                        pool.getQueuedTaskCount(),
+                        pool.getQueuedSubmissionCount());
+                    throw new AssertionError(detail, ex);
+                }
+            } finally {
+                pool.shutdown();
+            }
+            if (falseAlarms != 0)
+                System.out.println("Premature shutdowns = " + falseAlarms);
+            shutdownResult.get();
+        }
+    }
+
+    //--- thread stack dumping (from JSR166TestCase.java) ---
+
+    private static final ThreadMXBean THREAD_MXBEAN
+        = ManagementFactory.getThreadMXBean();
+
+    /** Returns true if thread info might be useful in a thread dump. */
+    static boolean threadOfInterest(ThreadInfo info) {
+        final String name = info.getThreadName();
+        String lockName;
+        if (name == null)
+            return true;
+        if (name.equals("Signal Dispatcher")
+            || name.equals("WedgedTestDetector"))
+            return false;
+        if (name.equals("Reference Handler")) {
+            // Reference Handler stacktrace changed in JDK-8156500
+            StackTraceElement[] stackTrace; String methodName;
+            if ((stackTrace = info.getStackTrace()) != null
+                && stackTrace.length > 0
+                && (methodName = stackTrace[0].getMethodName()) != null
+                && methodName.equals("waitForReferencePendingList"))
+                return false;
+            // jdk8 Reference Handler stacktrace
+            if ((lockName = info.getLockName()) != null
+                && lockName.startsWith("java.lang.ref"))
+                return false;
+        }
+        if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
+            && (lockName = info.getLockName()) != null
+            && lockName.startsWith("java.lang.ref"))
+            return false;
+        if (name.startsWith("ForkJoinPool.commonPool-worker")
+            && (lockName = info.getLockName()) != null
+            && lockName.startsWith("java.util.concurrent.ForkJoinPool"))
+            return false;
+        return true;
+    }
+
+    /**
+     * A debugging tool to print stack traces of most threads, as jstack does.
+     * Uninteresting threads are filtered out.
+     */
+    static void dumpTestThreads() {
+        System.err.println("------ stacktrace dump start ------");
+        for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
+            if (threadOfInterest(info))
+                System.err.print(info);
+        System.err.println("------ stacktrace dump end ------");
+    }
+
+}
diff --git a/test/jdk/java/util/concurrent/forkjoin/FJExceptionTableLeak.java b/test/jdk/java/util/concurrent/forkjoin/FJExceptionTableLeak.java
deleted file mode 100644
index f62c7beb0192b..0000000000000
--- a/test/jdk/java/util/concurrent/forkjoin/FJExceptionTableLeak.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea and Martin Buchholz with assistance from
- * members of JCP JSR-166 Expert Group and released to the public
- * domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/*
- * @test
- * @bug 8004138 8205576
- * @modules java.base/java.util.concurrent:open
- * @run testng FJExceptionTableLeak
- * @summary Checks that ForkJoinTask thrown exceptions are not leaked.
- * This whitebox test is sensitive to forkjoin implementation details.
- */
-
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.RecursiveAction;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.BooleanSupplier;
-
-@Test
-public class FJExceptionTableLeak {
-    final ThreadLocalRandom rnd = ThreadLocalRandom.current();
-    final VarHandle NEXT, EX;
-    final Object[] exceptionTable;
-    final ReentrantLock exceptionTableLock;
-
-    FJExceptionTableLeak() throws ReflectiveOperationException {
-        MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(
-            ForkJoinTask.class, MethodHandles.lookup());
-        Class<?> nodeClass = Class.forName(
-            ForkJoinTask.class.getName() + "$ExceptionNode");
-        VarHandle exceptionTableHandle = lookup.findStaticVarHandle(
-            ForkJoinTask.class, "exceptionTable", arrayClass(nodeClass));
-        VarHandle exceptionTableLockHandle = lookup.findStaticVarHandle(
-            ForkJoinTask.class, "exceptionTableLock", ReentrantLock.class);
-        exceptionTable = (Object[]) exceptionTableHandle.get();
-        exceptionTableLock = (ReentrantLock) exceptionTableLockHandle.get();
-
-        NEXT = lookup.findVarHandle(nodeClass, "next", nodeClass);
-        EX = lookup.findVarHandle(nodeClass, "ex", Throwable.class);
-    }
-
-    static <T> Class<T[]> arrayClass(Class<T> klazz) {
-        try {
-            return (Class<T[]>) Class.forName("[L" + klazz.getName() + ";");
-        } catch (ReflectiveOperationException ex) {
-            throw new Error(ex);
-        }
-    }
-
-    Object next(Object node) { return NEXT.get(node); }
-    Throwable ex(Object node) { return (Throwable) EX.get(node); }
-
-    static class FailingTaskException extends RuntimeException {}
-    static class FailingTask extends RecursiveAction {
-        public void compute() { throw new FailingTaskException(); }
-    }
-
-    /** Counts all FailingTaskExceptions still recorded in exceptionTable. */
-    int retainedExceptions() {
-        exceptionTableLock.lock();
-        try {
-            int count = 0;
-            for (Object node : exceptionTable)
-                for (; node != null; node = next(node))
-                    if (ex(node) instanceof FailingTaskException)
-                        count++;
-            return count;
-        } finally {
-            exceptionTableLock.unlock();
-        }
-    }
-
-    @Test
-    public void exceptionTableCleanup() throws Exception {
-        ArrayList<FailingTask> failedTasks = failedTasks();
-
-        // Retain a strong ref to one last failing task
-        FailingTask lastTask = failedTasks.get(rnd.nextInt(failedTasks.size()));
-
-        // Clear all other strong refs, making exception table cleanable
-        failedTasks.clear();
-
-        BooleanSupplier exceptionTableIsClean = () -> {
-            try {
-                // Trigger exception table expunging as side effect
-                lastTask.join();
-                throw new AssertionError("should throw");
-            } catch (FailingTaskException expected) {}
-            int count = retainedExceptions();
-            if (count == 0)
-                throw new AssertionError("expected to find last task");
-            return count == 1;
-        };
-        gcAwait(exceptionTableIsClean);
-    }
-
-    /** Sequestered into a separate method to inhibit GC retention. */
-    ArrayList<FailingTask> failedTasks()
-        throws Exception {
-        final ForkJoinPool pool = new ForkJoinPool(rnd.nextInt(1, 4));
-
-        assertEquals(0, retainedExceptions());
-
-        final ArrayList<FailingTask> tasks = new ArrayList<>();
-
-        for (int i = exceptionTable.length; i--> 0; ) {
-            FailingTask task = new FailingTask();
-            pool.execute(task);
-            tasks.add(task); // retain strong refs to all tasks, for now
-            task = null;     // excessive GC retention paranoia
-        }
-        for (FailingTask task : tasks) {
-            try {
-                task.join();
-                throw new AssertionError("should throw");
-            } catch (FailingTaskException success) {}
-            task = null;     // excessive GC retention paranoia
-        }
-
-        if (rnd.nextBoolean())
-            gcAwait(() -> retainedExceptions() == tasks.size());
-
-        return tasks;
-    }
-
-    // --------------- GC finalization infrastructure ---------------
-
-    /** No guarantees, but effective in practice. */
-    static void forceFullGc() {
-        long timeoutMillis = 1000L;
-        CountDownLatch finalized = new CountDownLatch(1);
-        ReferenceQueue<Object> queue = new ReferenceQueue<>();
-        WeakReference<Object> ref = new WeakReference<>(
-            new Object() { protected void finalize() { finalized.countDown(); }},
-            queue);
-        try {
-            for (int tries = 3; tries--> 0; ) {
-                System.gc();
-                if (finalized.await(timeoutMillis, MILLISECONDS)
-                    && queue.remove(timeoutMillis) != null
-                    && ref.get() == null) {
-                    System.runFinalization(); // try to pick up stragglers
-                    return;
-                }
-                timeoutMillis *= 4;
-            }
-        } catch (InterruptedException unexpected) {
-            throw new AssertionError("unexpected InterruptedException");
-        }
-        throw new AssertionError("failed to do a \"full\" gc");
-    }
-
-    static void gcAwait(BooleanSupplier s) {
-        for (int i = 0; i < 10; i++) {
-            if (s.getAsBoolean())
-                return;
-            forceFullGc();
-        }
-        throw new AssertionError("failed to satisfy condition");
-    }
-}
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java b/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java
index 16a043cd9d7b8..3dc450e6fb83a 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java
@@ -1720,4 +1720,20 @@ public void testAdapt_Callable_toString() {
                 task.toString());
         }
     }
+
+    // adaptInterruptible deferred to its own independent change
+    // https://bugs.openjdk.java.net/browse/JDK-8246587
+
+//     /**
+//      * adaptInterruptible(callable).toString() contains toString of wrapped task
+//      */
+//     public void testAdaptInterruptible_Callable_toString() {
+//         if (testImplementationDetails) {
+//             Callable<String> c = () -> "";
+//             ForkJoinTask<String> task = ForkJoinTask.adaptInterruptible(c);
+//             assertEquals(
+//                 identityString(task) + "[Wrapped task = " + c.toString() + "]",
+//                 task.toString());
+//         }
+//     }
 }

From 63e3bd7613918c6838ee89151d62a8695e27dcba Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Sat, 9 Jan 2021 21:08:32 +0000
Subject: [PATCH 091/129] 8246677: LinkedTransferQueue and SynchronousQueue
 synchronization updates

Reviewed-by: alanb, dl
---
 .../util/concurrent/LinkedTransferQueue.java  | 237 ++++-------
 .../util/concurrent/SynchronousQueue.java     | 368 ++++++++----------
 .../LinkedTransferQueue/WhiteBox.java         |  34 --
 3 files changed, 244 insertions(+), 395 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
index 06d04e22e6c1c..cc30c5dfeef5f 100644
--- a/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
@@ -309,31 +309,12 @@ public class LinkedTransferQueue<E> extends AbstractQueue<E>
      * 2. Await match or cancellation (method awaitMatch)
      *
      *    Wait for another thread to match node; instead cancelling if
-     *    the current thread was interrupted or the wait timed out. On
-     *    multiprocessors, we use front-of-queue spinning: If a node
-     *    appears to be the first unmatched node in the queue, it
-     *    spins a bit before blocking. In either case, before blocking
-     *    it tries to unsplice any nodes between the current "head"
-     *    and the first unmatched node.
-     *
-     *    Front-of-queue spinning vastly improves performance of
-     *    heavily contended queues. And so long as it is relatively
-     *    brief and "quiet", spinning does not much impact performance
-     *    of less-contended queues.  During spins threads check their
-     *    interrupt status and generate a thread-local random number
-     *    to decide to occasionally perform a Thread.yield. While
-     *    yield has underdefined specs, we assume that it might help,
-     *    and will not hurt, in limiting impact of spinning on busy
-     *    systems.  We also use smaller (1/2) spins for nodes that are
-     *    not known to be front but whose predecessors have not
-     *    blocked -- these "chained" spins avoid artifacts of
-     *    front-of-queue rules which otherwise lead to alternating
-     *    nodes spinning vs blocking. Further, front threads that
-     *    represent phase changes (from data to request node or vice
-     *    versa) compared to their predecessors receive additional
-     *    chained spins, reflecting longer paths typically required to
-     *    unblock threads during phase changes.
-     *
+     *    the current thread was interrupted or the wait timed out. To
+     *    improve performance in common single-source / single-sink
+     *    usages when there are more tasks that cores, an initial
+     *    Thread.yield is tried when there is apparently only one
+     *    waiter.  In other cases, waiters may help with some
+     *    bookkeeping, then park/unpark.
      *
      * ** Unlinking removed interior nodes **
      *
@@ -369,30 +350,9 @@ public class LinkedTransferQueue<E> extends AbstractQueue<E>
      *
      * When these cases arise, rather than always retraversing the
      * entire list to find an actual predecessor to unlink (which
-     * won't help for case (1) anyway), we record a conservative
-     * estimate of possible unsplice failures (in "sweepVotes").
-     * We trigger a full sweep when the estimate exceeds a threshold
-     * ("SWEEP_THRESHOLD") indicating the maximum number of estimated
-     * removal failures to tolerate before sweeping through, unlinking
-     * cancelled nodes that were not unlinked upon initial removal.
-     * We perform sweeps by the thread hitting threshold (rather than
-     * background threads or by spreading work to other threads)
-     * because in the main contexts in which removal occurs, the
-     * caller is timed-out or cancelled, which are not time-critical
-     * enough to warrant the overhead that alternatives would impose
-     * on other threads.
-     *
-     * Because the sweepVotes estimate is conservative, and because
-     * nodes become unlinked "naturally" as they fall off the head of
-     * the queue, and because we allow votes to accumulate even while
-     * sweeps are in progress, there are typically significantly fewer
-     * such nodes than estimated.  Choice of a threshold value
-     * balances the likelihood of wasted effort and contention, versus
-     * providing a worst-case bound on retention of interior nodes in
-     * quiescent queues. The value defined below was chosen
-     * empirically to balance these under various timeout scenarios.
-     *
-     * Because traversal operations on the linked list of nodes are a
+     * won't help for case (1) anyway), we record the need to sweep the
+     * next time any thread would otherwise block in awaitMatch. Also,
+     * because traversal operations on the linked list of nodes are a
      * natural opportunity to sweep dead nodes, we generally do so,
      * including all the operations that might remove elements as they
      * traverse, such as removeIf and Iterator.remove.  This largely
@@ -405,28 +365,12 @@ public class LinkedTransferQueue<E> extends AbstractQueue<E>
      * self-linked.
      */
 
-    /** True if on multiprocessor */
-    private static final boolean MP =
-        Runtime.getRuntime().availableProcessors() > 1;
-
-    /**
-     * The number of times to spin (with randomly interspersed calls
-     * to Thread.yield) on multiprocessor before blocking when a node
-     * is apparently the first waiter in the queue.  See above for
-     * explanation. Must be a power of two. The value is empirically
-     * derived -- it works pretty well across a variety of processors,
-     * numbers of CPUs, and OSes.
-     */
-    private static final int FRONT_SPINS   = 1 << 7;
-
     /**
-     * The number of times to spin before blocking when a node is
-     * preceded by another node that is apparently spinning.  Also
-     * serves as an increment to FRONT_SPINS on phase changes, and as
-     * base average frequency for yielding during spins. Must be a
-     * power of two.
+     * The number of nanoseconds for which it is faster to spin
+     * rather than to use timed park. A rough estimate suffices.
+     * Using a power of two minus one simplifies some comparisons.
      */
-    private static final int CHAINED_SPINS = FRONT_SPINS >>> 1;
+    static final long SPIN_FOR_TIMEOUT_THRESHOLD = 1023L;
 
     /**
      * The maximum number of estimated removal failures (sweepVotes)
@@ -442,7 +386,7 @@ public class LinkedTransferQueue<E> extends AbstractQueue<E>
      * them after use.  Writes that are intrinsically ordered wrt
      * other accesses or CASes use simple relaxed forms.
      */
-    static final class Node {
+    static final class Node implements ForkJoinPool.ManagedBlocker {
         final boolean isData;   // false if this is a request node
         volatile Object item;   // initially non-null if isData; CASed to match
         volatile Node next;
@@ -487,24 +431,7 @@ final void selfLink() {
         final void appendRelaxed(Node next) {
             // assert next != null;
             // assert this.next == null;
-            NEXT.set(this, next);
-        }
-
-        /**
-         * Sets item (of a request node) to self and waiter to null,
-         * to avoid garbage retention after matching or cancelling.
-         * Uses relaxed writes because order is already constrained in
-         * the only calling contexts: item is forgotten only after
-         * volatile/atomic mechanics that extract items, and visitors
-         * of request nodes only ever check whether item is null.
-         * Similarly, clearing waiter follows either CAS or return
-         * from park (if ever parked; else we don't care).
-         */
-        final void forgetContents() {
-            // assert isMatched();
-            if (!isData)
-                ITEM.set(this, this);
-            WAITER.set(this, null);
+            NEXT.setOpaque(this, next);
         }
 
         /**
@@ -534,6 +461,16 @@ final boolean cannotPrecede(boolean haveData) {
             return d != haveData && d != (item == null);
         }
 
+        public final boolean isReleasable() {
+            return (isData == (item == null)) ||
+                Thread.currentThread().isInterrupted();
+        }
+
+        public final boolean block() {
+            while (!isReleasable()) LockSupport.park();
+            return true;
+        }
+
         private static final long serialVersionUID = -3375979862319811754L;
     }
 
@@ -566,7 +503,7 @@ final boolean cannotPrecede(boolean haveData) {
     private transient volatile Node tail;
 
     /** The number of apparent failures to unsplice cancelled nodes */
-    private transient volatile int sweepVotes;
+    private transient volatile boolean needSweep;
 
     private boolean casTail(Node cmp, Node val) {
         // assert cmp != null;
@@ -578,11 +515,6 @@ private boolean casHead(Node cmp, Node val) {
         return HEAD.compareAndSet(this, cmp, val);
     }
 
-    /** Atomic version of ++sweepVotes. */
-    private int incSweepVotes() {
-        return (int) SWEEPVOTES.getAndAdd(this, 1) + 1;
-    }
-
     /**
      * Tries to CAS pred.next (or head, if pred is null) from c to p.
      * Caller must ensure that we're not unlinking the trailing node.
@@ -689,7 +621,7 @@ private E xfer(E e, boolean haveData, int how, long nanos) {
     }
 
     /**
-     * Spins/yields/blocks until node s is matched or caller gives up.
+     * Possibly blocks until node s is matched or caller gives up.
      *
      * @param s the waiting node
      * @param pred the predecessor of s, or null if unknown (the null
@@ -700,65 +632,55 @@ private E xfer(E e, boolean haveData, int how, long nanos) {
      * @param nanos timeout in nanosecs, used only if timed is true
      * @return matched item, or e if unmatched on interrupt or timeout
      */
+    @SuppressWarnings("unchecked")
     private E awaitMatch(Node s, Node pred, E e, boolean timed, long nanos) {
+        final boolean isData = s.isData;
         final long deadline = timed ? System.nanoTime() + nanos : 0L;
-        Thread w = Thread.currentThread();
-        int spins = -1; // initialized after first item and cancel checks
-        ThreadLocalRandom randomYields = null; // bound if needed
-
-        for (;;) {
-            final Object item;
-            if ((item = s.item) != e) {       // matched
-                // assert item != s;
-                s.forgetContents();           // avoid garbage
-                @SuppressWarnings("unchecked") E itemE = (E) item;
-                return itemE;
-            }
-            else if (w.isInterrupted() || (timed && nanos <= 0L)) {
-                // try to cancel and unlink
-                if (s.casItem(e, s.isData ? null : s)) {
-                    unsplice(pred, s);
+        final Thread w = Thread.currentThread();
+        int stat = -1;                   // -1: may yield, +1: park, else 0
+        Object item;
+        while ((item = s.item) == e) {
+            if (needSweep)               // help clean
+                sweep();
+            else if ((timed && nanos <= 0L) || w.isInterrupted()) {
+                if (s.casItem(e, (e == null) ? s : null)) {
+                    unsplice(pred, s);   // cancelled
                     return e;
                 }
-                // return normally if lost CAS
-            }
-            else if (spins < 0) {            // establish spins at/near front
-                if ((spins = spinsFor(pred, s.isData)) > 0)
-                    randomYields = ThreadLocalRandom.current();
             }
-            else if (spins > 0) {             // spin
-                --spins;
-                if (randomYields.nextInt(CHAINED_SPINS) == 0)
-                    Thread.yield();           // occasionally yield
+            else if (stat <= 0) {
+                if (pred != null && pred.next == s) {
+                    if (stat < 0 &&
+                        (pred.isData != isData || pred.isMatched())) {
+                        stat = 0;        // yield once if first
+                        Thread.yield();
+                    }
+                    else {
+                        stat = 1;
+                        s.waiter = w;    // enable unpark
+                    }
+                }                        // else signal in progress
             }
-            else if (s.waiter == null) {
-                s.waiter = w;                 // request unpark then recheck
+            else if ((item = s.item) != e)
+                break;                   // recheck
+            else if (!timed) {
+                LockSupport.setCurrentBlocker(this);
+                try {
+                    ForkJoinPool.managedBlock(s);
+                } catch (InterruptedException cannotHappen) { }
+                LockSupport.setCurrentBlocker(null);
             }
-            else if (timed) {
+            else {
                 nanos = deadline - System.nanoTime();
-                if (nanos > 0L)
+                if (nanos > SPIN_FOR_TIMEOUT_THRESHOLD)
                     LockSupport.parkNanos(this, nanos);
             }
-            else {
-                LockSupport.park(this);
-            }
-        }
-    }
-
-    /**
-     * Returns spin/yield value for a node with given predecessor and
-     * data mode. See above for explanation.
-     */
-    private static int spinsFor(Node pred, boolean haveData) {
-        if (MP && pred != null) {
-            if (pred.isData != haveData)      // phase change
-                return FRONT_SPINS + CHAINED_SPINS;
-            if (pred.isMatched())             // probably at front
-                return FRONT_SPINS;
-            if (pred.waiter == null)          // pred apparently spinning
-                return CHAINED_SPINS;
         }
-        return 0;
+        if (stat == 1)
+            WAITER.set(s, null);
+        if (!isData)
+            ITEM.set(s, s);              // self-link to avoid garbage
+        return (E) item;
     }
 
     /* -------------- Traversal methods -------------- */
@@ -1181,8 +1103,7 @@ final void unsplice(Node pred, Node s) {
          * See above for rationale. Briefly: if pred still points to
          * s, try to unlink s.  If s cannot be unlinked, because it is
          * trailing node or pred might be unlinked, and neither pred
-         * nor s are head or offlist, add to sweepVotes, and if enough
-         * votes have accumulated, sweep.
+         * nor s are head or offlist, set needSweep;
          */
         if (pred != null && pred.next == s) {
             Node n = s.next;
@@ -1200,10 +1121,8 @@ final void unsplice(Node pred, Node s) {
                     if (hn != h && casHead(h, hn))
                         h.selfLink();  // advance head
                 }
-                // sweep every SWEEP_THRESHOLD votes
-                if (pred.next != pred && s.next != s // recheck if offlist
-                    && (incSweepVotes() & (SWEEP_THRESHOLD - 1)) == 0)
-                    sweep();
+                if (pred.next != pred && s.next != s)
+                    needSweep = true;
             }
         }
     }
@@ -1213,6 +1132,7 @@ final void unsplice(Node pred, Node s) {
      * traversal from head.
      */
     private void sweep() {
+        needSweep = false;
         for (Node p = head, s, n; p != null && (s = p.next) != null; ) {
             if (!s.isMatched())
                 // Unmatched nodes are never self-linked
@@ -1265,7 +1185,7 @@ public LinkedTransferQueue(Collection<? extends E> c) {
      * @throws NullPointerException if the specified element is null
      */
     public void put(E e) {
-        xfer(e, true, ASYNC, 0);
+        xfer(e, true, ASYNC, 0L);
     }
 
     /**
@@ -1278,7 +1198,7 @@ public void put(E e) {
      * @throws NullPointerException if the specified element is null
      */
     public boolean offer(E e, long timeout, TimeUnit unit) {
-        xfer(e, true, ASYNC, 0);
+        xfer(e, true, ASYNC, 0L);
         return true;
     }
 
@@ -1290,7 +1210,7 @@ public boolean offer(E e, long timeout, TimeUnit unit) {
      * @throws NullPointerException if the specified element is null
      */
     public boolean offer(E e) {
-        xfer(e, true, ASYNC, 0);
+        xfer(e, true, ASYNC, 0L);
         return true;
     }
 
@@ -1303,7 +1223,7 @@ public boolean offer(E e) {
      * @throws NullPointerException if the specified element is null
      */
     public boolean add(E e) {
-        xfer(e, true, ASYNC, 0);
+        xfer(e, true, ASYNC, 0L);
         return true;
     }
 
@@ -1318,7 +1238,7 @@ public boolean add(E e) {
      * @throws NullPointerException if the specified element is null
      */
     public boolean tryTransfer(E e) {
-        return xfer(e, true, NOW, 0) == null;
+        return xfer(e, true, NOW, 0L) == null;
     }
 
     /**
@@ -1333,7 +1253,7 @@ public boolean tryTransfer(E e) {
      * @throws NullPointerException if the specified element is null
      */
     public void transfer(E e) throws InterruptedException {
-        if (xfer(e, true, SYNC, 0) != null) {
+        if (xfer(e, true, SYNC, 0L) != null) {
             Thread.interrupted(); // failure possible only due to interrupt
             throw new InterruptedException();
         }
@@ -1363,7 +1283,7 @@ public boolean tryTransfer(E e, long timeout, TimeUnit unit)
     }
 
     public E take() throws InterruptedException {
-        E e = xfer(null, false, SYNC, 0);
+        E e = xfer(null, false, SYNC, 0L);
         if (e != null)
             return e;
         Thread.interrupted();
@@ -1378,7 +1298,7 @@ public E poll(long timeout, TimeUnit unit) throws InterruptedException {
     }
 
     public E poll() {
-        return xfer(null, false, NOW, 0);
+        return xfer(null, false, NOW, 0L);
     }
 
     /**
@@ -1722,7 +1642,6 @@ public void forEach(Consumer<? super E> action) {
     // VarHandle mechanics
     private static final VarHandle HEAD;
     private static final VarHandle TAIL;
-    private static final VarHandle SWEEPVOTES;
     static final VarHandle ITEM;
     static final VarHandle NEXT;
     static final VarHandle WAITER;
@@ -1733,8 +1652,6 @@ public void forEach(Consumer<? super E> action) {
                                    Node.class);
             TAIL = l.findVarHandle(LinkedTransferQueue.class, "tail",
                                    Node.class);
-            SWEEPVOTES = l.findVarHandle(LinkedTransferQueue.class, "sweepVotes",
-                                         int.class);
             ITEM = l.findVarHandle(Node.class, "item", Object.class);
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
             WAITER = l.findVarHandle(Node.class, "waiter", Thread.class);
diff --git a/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
index 8de28b87987f7..926897c4f1d8d 100644
--- a/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
@@ -166,6 +166,18 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
      * old head pointers), but references in Queue nodes must be
      * aggressively forgotten to avoid reachability of everything any
      * node has ever referred to since arrival.
+     *
+     * The above steps improve throughput when many threads produce
+     * and/or consume data. But they don't help much with
+     * single-source / single-sink usages in which one side or the
+     * other is always transiently blocked, and so throughput is
+     * mainly a function of thread scheduling. This is not usually
+     * noticeably improved with bounded short spin-waits. Instead both
+     * forms of transfer try Thread.yield if apparently the sole
+     * waiter. This works well when there are more tasks that cores,
+     * which is expected to be the main usage context of this mode. In
+     * other cases, waiters may help with some bookkeeping, then
+     * park/unpark.
      */
 
     /**
@@ -188,28 +200,11 @@ abstract static class Transferer<E> {
         abstract E transfer(E e, boolean timed, long nanos);
     }
 
-    /**
-     * The number of times to spin before blocking in timed waits.
-     * The value is empirically derived -- it works well across a
-     * variety of processors and OSes. Empirically, the best value
-     * seems not to vary with number of CPUs (beyond 2) so is just
-     * a constant.
-     */
-    static final int MAX_TIMED_SPINS =
-        (Runtime.getRuntime().availableProcessors() < 2) ? 0 : 32;
-
-    /**
-     * The number of times to spin before blocking in untimed waits.
-     * This is greater than timed value because untimed waits spin
-     * faster since they don't need to check times on each spin.
-     */
-    static final int MAX_UNTIMED_SPINS = MAX_TIMED_SPINS * 16;
-
     /**
      * The number of nanoseconds for which it is faster to spin
      * rather than to use timed park. A rough estimate suffices.
      */
-    static final long SPIN_FOR_TIMEOUT_THRESHOLD = 1000L;
+    static final long SPIN_FOR_TIMEOUT_THRESHOLD = 1023L;
 
     /** Dual stack */
     static final class TransferStack<E> extends Transferer<E> {
@@ -233,7 +228,7 @@ static final class TransferStack<E> extends Transferer<E> {
         static boolean isFulfilling(int m) { return (m & FULFILLING) != 0; }
 
         /** Node class for TransferStacks. */
-        static final class SNode {
+        static final class SNode implements ForkJoinPool.ManagedBlocker {
             volatile SNode next;        // next node in stack
             volatile SNode match;       // the node matched to this
             volatile Thread waiter;     // to control park/unpark
@@ -261,37 +256,53 @@ boolean casNext(SNode cmp, SNode val) {
              * @return true if successfully matched to s
              */
             boolean tryMatch(SNode s) {
-                if (match == null &&
-                    SMATCH.compareAndSet(this, null, s)) {
-                    Thread w = waiter;
-                    if (w != null) {    // waiters need at most one unpark
-                        waiter = null;
-                        LockSupport.unpark(w);
+                SNode m; Thread w;
+                if ((m = match) == null) {
+                    if (SMATCH.compareAndSet(this, null, s)) {
+                        if ((w = waiter) != null)
+                            LockSupport.unpark(w);
+                        return true;
                     }
-                    return true;
+                    else
+                        m = match;
                 }
-                return match == s;
+                return m == s;
             }
 
             /**
              * Tries to cancel a wait by matching node to itself.
              */
-            void tryCancel() {
-                SMATCH.compareAndSet(this, null, this);
+            boolean tryCancel() {
+                return SMATCH.compareAndSet(this, null, this);
             }
 
             boolean isCancelled() {
                 return match == this;
             }
 
+            public final boolean isReleasable() {
+                return match != null || Thread.currentThread().isInterrupted();
+            }
+
+            public final boolean block() {
+                while (!isReleasable()) LockSupport.park();
+                return true;
+            }
+
+            void forgetWaiter() {
+                SWAITER.setOpaque(this, null);
+            }
+
             // VarHandle mechanics
             private static final VarHandle SMATCH;
             private static final VarHandle SNEXT;
+            private static final VarHandle SWAITER;
             static {
                 try {
                     MethodHandles.Lookup l = MethodHandles.lookup();
                     SMATCH = l.findVarHandle(SNode.class, "match", SNode.class);
                     SNEXT = l.findVarHandle(SNode.class, "next", SNode.class);
+                    SWAITER = l.findVarHandle(SNode.class, "waiter", Thread.class);
                 } catch (ReflectiveOperationException e) {
                     throw new ExceptionInInitializerError(e);
                 }
@@ -358,14 +369,43 @@ E transfer(E e, boolean timed, long nanos) {
                         else
                             return null;
                     } else if (casHead(h, s = snode(s, e, h, mode))) {
-                        SNode m = awaitFulfill(s, timed, nanos);
-                        if (m == s) {               // wait was cancelled
-                            clean(s);
-                            return null;
+                        long deadline = timed ? System.nanoTime() + nanos : 0L;
+                        Thread w = Thread.currentThread();
+                        int stat = -1; // -1: may yield, +1: park, else 0
+                        SNode m;                    // await fulfill or cancel
+                        while ((m = s.match) == null) {
+                            if ((timed &&
+                                 (nanos = deadline - System.nanoTime()) <= 0) ||
+                                w.isInterrupted()) {
+                                if (s.tryCancel()) {
+                                    clean(s);       // wait cancelled
+                                    return null;
+                                }
+                            } else if ((m = s.match) != null) {
+                                break;              // recheck
+                            } else if (stat <= 0) {
+                                if (stat < 0 && h == null && head == s) {
+                                    stat = 0;       // yield once if was empty
+                                    Thread.yield();
+                                } else {
+                                    stat = 1;
+                                    s.waiter = w;   // enable signal
+                                }
+                            } else if (!timed) {
+                                LockSupport.setCurrentBlocker(this);
+                                try {
+                                    ForkJoinPool.managedBlock(s);
+                                } catch (InterruptedException cannotHappen) { }
+                                LockSupport.setCurrentBlocker(null);
+                            } else if (nanos > SPIN_FOR_TIMEOUT_THRESHOLD)
+                                LockSupport.parkNanos(this, nanos);
                         }
-                        if ((h = head) != null && h.next == s)
-                            casHead(h, s.next);     // help s's fulfiller
-                        return (E) ((mode == REQUEST) ? m.item : s.item);
+                        if (stat == 1)
+                            s.forgetWaiter();
+                        Object result = (mode == REQUEST) ? m.item : s.item;
+                        if (h != null && h.next == s)
+                            casHead(h, s.next);     // help fulfiller
+                        return (E) result;
                     }
                 } else if (!isFulfilling(h.mode)) { // try to fulfill
                     if (h.isCancelled())            // already cancelled
@@ -401,83 +441,12 @@ else if (casHead(h, s=snode(s, e, h, FULFILLING|mode))) {
             }
         }
 
-        /**
-         * Spins/blocks until node s is matched by a fulfill operation.
-         *
-         * @param s the waiting node
-         * @param timed true if timed wait
-         * @param nanos timeout value
-         * @return matched node, or s if cancelled
-         */
-        SNode awaitFulfill(SNode s, boolean timed, long nanos) {
-            /*
-             * When a node/thread is about to block, it sets its waiter
-             * field and then rechecks state at least one more time
-             * before actually parking, thus covering race vs
-             * fulfiller noticing that waiter is non-null so should be
-             * woken.
-             *
-             * When invoked by nodes that appear at the point of call
-             * to be at the head of the stack, calls to park are
-             * preceded by spins to avoid blocking when producers and
-             * consumers are arriving very close in time.  This can
-             * happen enough to bother only on multiprocessors.
-             *
-             * The order of checks for returning out of main loop
-             * reflects fact that interrupts have precedence over
-             * normal returns, which have precedence over
-             * timeouts. (So, on timeout, one last check for match is
-             * done before giving up.) Except that calls from untimed
-             * SynchronousQueue.{poll/offer} don't check interrupts
-             * and don't wait at all, so are trapped in transfer
-             * method rather than calling awaitFulfill.
-             */
-            final long deadline = timed ? System.nanoTime() + nanos : 0L;
-            Thread w = Thread.currentThread();
-            int spins = shouldSpin(s)
-                ? (timed ? MAX_TIMED_SPINS : MAX_UNTIMED_SPINS)
-                : 0;
-            for (;;) {
-                if (w.isInterrupted())
-                    s.tryCancel();
-                SNode m = s.match;
-                if (m != null)
-                    return m;
-                if (timed) {
-                    nanos = deadline - System.nanoTime();
-                    if (nanos <= 0L) {
-                        s.tryCancel();
-                        continue;
-                    }
-                }
-                if (spins > 0) {
-                    Thread.onSpinWait();
-                    spins = shouldSpin(s) ? (spins - 1) : 0;
-                }
-                else if (s.waiter == null)
-                    s.waiter = w; // establish waiter so can park next iter
-                else if (!timed)
-                    LockSupport.park(this);
-                else if (nanos > SPIN_FOR_TIMEOUT_THRESHOLD)
-                    LockSupport.parkNanos(this, nanos);
-            }
-        }
-
-        /**
-         * Returns true if node s is at head or there is an active
-         * fulfiller.
-         */
-        boolean shouldSpin(SNode s) {
-            SNode h = head;
-            return (h == s || h == null || isFulfilling(h.mode));
-        }
-
         /**
          * Unlinks s from the stack.
          */
         void clean(SNode s) {
             s.item = null;   // forget item
-            s.waiter = null; // forget thread
+            s.forgetWaiter();
 
             /*
              * At worst we may need to traverse entire stack to unlink
@@ -533,7 +502,7 @@ static final class TransferQueue<E> extends Transferer<E> {
          */
 
         /** Node class for TransferQueue. */
-        static final class QNode {
+        static final class QNode implements ForkJoinPool.ManagedBlocker {
             volatile QNode next;          // next node in queue
             volatile Object item;         // CAS'ed to or from null
             volatile Thread waiter;       // to control park/unpark
@@ -557,8 +526,8 @@ boolean casItem(Object cmp, Object val) {
             /**
              * Tries to cancel by CAS'ing ref to this as item.
              */
-            void tryCancel(Object cmp) {
-                QITEM.compareAndSet(this, cmp, this);
+            boolean tryCancel(Object cmp) {
+                return QITEM.compareAndSet(this, cmp, this);
             }
 
             boolean isCancelled() {
@@ -574,14 +543,36 @@ boolean isOffList() {
                 return next == this;
             }
 
+            void forgetWaiter() {
+                QWAITER.setOpaque(this, null);
+            }
+
+            boolean isFulfilled() {
+                Object x;
+                return isData == ((x = item) == null) || x == this;
+            }
+
+            public final boolean isReleasable() {
+                Object x;
+                return isData == ((x = item) == null) || x == this ||
+                    Thread.currentThread().isInterrupted();
+            }
+
+            public final boolean block() {
+                while (!isReleasable()) LockSupport.park();
+                return true;
+            }
+
             // VarHandle mechanics
             private static final VarHandle QITEM;
             private static final VarHandle QNEXT;
+            private static final VarHandle QWAITER;
             static {
                 try {
                     MethodHandles.Lookup l = MethodHandles.lookup();
                     QITEM = l.findVarHandle(QNode.class, "item", Object.class);
                     QNEXT = l.findVarHandle(QNode.class, "next", QNode.class);
+                    QWAITER = l.findVarHandle(QNode.class, "waiter", Thread.class);
                 } catch (ReflectiveOperationException e) {
                     throw new ExceptionInInitializerError(e);
                 }
@@ -661,104 +652,79 @@ E transfer(E e, boolean timed, long nanos) {
              * than having them implicitly interspersed.
              */
 
-            QNode s = null; // constructed/reused as needed
+            QNode s = null;                  // constructed/reused as needed
             boolean isData = (e != null);
-
             for (;;) {
-                QNode t = tail;
-                QNode h = head;
-                if (t == null || h == null)         // saw uninitialized value
-                    continue;                       // spin
-
-                if (h == t || t.isData == isData) { // empty or same-mode
-                    QNode tn = t.next;
-                    if (t != tail)                  // inconsistent read
-                        continue;
-                    if (tn != null) {               // lagging tail
+                QNode t = tail, h = head, m, tn;         // m is node to fulfill
+                if (t == null || h == null)
+                    ;                                    // inconsistent
+                else if (h == t || t.isData == isData) { // empty or same-mode
+                    if (t != tail)                       // inconsistent
+                        ;
+                    else if ((tn = t.next) != null)      // lagging tail
                         advanceTail(t, tn);
-                        continue;
-                    }
-                    if (timed && nanos <= 0L)       // can't wait
+                    else if (timed && nanos <= 0L)       // can't wait
                         return null;
-                    if (s == null)
-                        s = new QNode(e, isData);
-                    if (!t.casNext(null, s))        // failed to link in
-                        continue;
-
-                    advanceTail(t, s);              // swing tail and wait
-                    Object x = awaitFulfill(s, e, timed, nanos);
-                    if (x == s) {                   // wait was cancelled
-                        clean(t, s);
-                        return null;
-                    }
-
-                    if (!s.isOffList()) {           // not already unlinked
-                        advanceHead(t, s);          // unlink if head
-                        if (x != null)              // and forget fields
-                            s.item = s;
-                        s.waiter = null;
+                    else if (t.casNext(null, (s != null) ? s :
+                                       (s = new QNode(e, isData)))) {
+                        advanceTail(t, s);
+                        long deadline = timed ? System.nanoTime() + nanos : 0L;
+                        Thread w = Thread.currentThread();
+                        int stat = -1; // same idea as TransferStack
+                        Object item;
+                        while ((item = s.item) == e) {
+                            if ((timed &&
+                                 (nanos = deadline - System.nanoTime()) <= 0) ||
+                                w.isInterrupted()) {
+                                if (s.tryCancel(e)) {
+                                    clean(t, s);
+                                    return null;
+                                }
+                            } else if ((item = s.item) != e) {
+                                break;                   // recheck
+                            } else if (stat <= 0) {
+                                if (t.next == s) {
+                                    if (stat < 0 && t.isFulfilled()) {
+                                        stat = 0;        // yield once if first
+                                        Thread.yield();
+                                    }
+                                    else {
+                                        stat = 1;
+                                        s.waiter = w;
+                                    }
+                                }
+                            } else if (!timed) {
+                                LockSupport.setCurrentBlocker(this);
+                                try {
+                                    ForkJoinPool.managedBlock(s);
+                                } catch (InterruptedException cannotHappen) { }
+                                LockSupport.setCurrentBlocker(null);
+                            }
+                            else if (nanos > SPIN_FOR_TIMEOUT_THRESHOLD)
+                                LockSupport.parkNanos(this, nanos);
+                        }
+                        if (stat == 1)
+                            s.forgetWaiter();
+                        if (!s.isOffList()) {            // not already unlinked
+                            advanceHead(t, s);           // unlink if head
+                            if (item != null)            // and forget fields
+                                s.item = s;
+                        }
+                        return (item != null) ? (E)item : e;
                     }
-                    return (x != null) ? (E)x : e;
-
-                } else {                            // complementary-mode
-                    QNode m = h.next;               // node to fulfill
-                    if (t != tail || m == null || h != head)
-                        continue;                   // inconsistent read
 
+                } else if ((m = h.next) != null && t == tail && h == head) {
+                    Thread waiter;
                     Object x = m.item;
-                    if (isData == (x != null) ||    // m already fulfilled
-                        x == m ||                   // m cancelled
-                        !m.casItem(x, e)) {         // lost CAS
-                        advanceHead(h, m);          // dequeue and retry
-                        continue;
+                    boolean fulfilled = ((isData == (x == null)) &&
+                                         x != m && m.casItem(x, e));
+                    advanceHead(h, m);                    // (help) dequeue
+                    if (fulfilled) {
+                        if ((waiter = m.waiter) != null)
+                            LockSupport.unpark(waiter);
+                        return (x != null) ? (E)x : e;
                     }
-
-                    advanceHead(h, m);              // successfully fulfilled
-                    LockSupport.unpark(m.waiter);
-                    return (x != null) ? (E)x : e;
-                }
-            }
-        }
-
-        /**
-         * Spins/blocks until node s is fulfilled.
-         *
-         * @param s the waiting node
-         * @param e the comparison value for checking match
-         * @param timed true if timed wait
-         * @param nanos timeout value
-         * @return matched item, or s if cancelled
-         */
-        Object awaitFulfill(QNode s, E e, boolean timed, long nanos) {
-            /* Same idea as TransferStack.awaitFulfill */
-            final long deadline = timed ? System.nanoTime() + nanos : 0L;
-            Thread w = Thread.currentThread();
-            int spins = (head.next == s)
-                ? (timed ? MAX_TIMED_SPINS : MAX_UNTIMED_SPINS)
-                : 0;
-            for (;;) {
-                if (w.isInterrupted())
-                    s.tryCancel(e);
-                Object x = s.item;
-                if (x != e)
-                    return x;
-                if (timed) {
-                    nanos = deadline - System.nanoTime();
-                    if (nanos <= 0L) {
-                        s.tryCancel(e);
-                        continue;
-                    }
-                }
-                if (spins > 0) {
-                    --spins;
-                    Thread.onSpinWait();
                 }
-                else if (s.waiter == null)
-                    s.waiter = w;
-                else if (!timed)
-                    LockSupport.park(this);
-                else if (nanos > SPIN_FOR_TIMEOUT_THRESHOLD)
-                    LockSupport.parkNanos(this, nanos);
             }
         }
 
@@ -766,7 +732,7 @@ else if (nanos > SPIN_FOR_TIMEOUT_THRESHOLD)
          * Gets rid of cancelled node s with original predecessor pred.
          */
         void clean(QNode pred, QNode s) {
-            s.waiter = null; // forget thread
+            s.forgetWaiter();
             /*
              * At any given time, exactly one node on list cannot be
              * deleted -- the last inserted node. To accommodate this,
diff --git a/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java b/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java
index e1e4607813d4f..df32846f58df5 100644
--- a/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java
+++ b/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java
@@ -61,7 +61,6 @@
 public class WhiteBox {
     final ThreadLocalRandom rnd = ThreadLocalRandom.current();
     final VarHandle HEAD, TAIL, ITEM, NEXT;
-    final int SWEEP_THRESHOLD;
 
     public WhiteBox() throws ReflectiveOperationException {
         Class<?> qClass = LinkedTransferQueue.class;
@@ -72,9 +71,6 @@ public WhiteBox() throws ReflectiveOperationException {
         TAIL = lookup.findVarHandle(qClass, "tail", nodeClass);
         NEXT = lookup.findVarHandle(nodeClass, "next", nodeClass);
         ITEM = lookup.findVarHandle(nodeClass, "item", Object.class);
-        SWEEP_THRESHOLD = (int)
-            lookup.findStaticVarHandle(qClass, "SWEEP_THRESHOLD", int.class)
-            .get();
     }
 
     Object head(LinkedTransferQueue q) { return HEAD.getVolatile(q); }
@@ -367,36 +363,6 @@ public void testSerialization() {
         assertInvariants(q);
     }
 
-    public void cancelledNodeSweeping() throws Throwable {
-        assertEquals(SWEEP_THRESHOLD & (SWEEP_THRESHOLD - 1), 0);
-        LinkedTransferQueue q = new LinkedTransferQueue();
-        Thread blockHead = null;
-        if (rnd.nextBoolean()) {
-            blockHead = new Thread(
-                () -> { try { q.take(); } catch (InterruptedException ok) {}});
-            blockHead.start();
-            while (nodeCount(q) != 2) { Thread.yield(); }
-            assertTrue(q.hasWaitingConsumer());
-            assertEquals(q.getWaitingConsumerCount(), 1);
-        }
-        int initialNodeCount = nodeCount(q);
-
-        // Some dead nodes do in fact accumulate ...
-        if (blockHead != null)
-            while (nodeCount(q) < initialNodeCount + SWEEP_THRESHOLD / 2)
-                q.poll(1L, TimeUnit.MICROSECONDS);
-
-        // ... but no more than SWEEP_THRESHOLD nodes accumulate
-        for (int i = rnd.nextInt(SWEEP_THRESHOLD * 10); i-->0; )
-            q.poll(1L, TimeUnit.MICROSECONDS);
-        assertTrue(nodeCount(q) <= initialNodeCount + SWEEP_THRESHOLD);
-
-        if (blockHead != null) {
-            blockHead.interrupt();
-            blockHead.join();
-        }
-    }
-
     /** Checks conditions which should always be true. */
     void assertInvariants(LinkedTransferQueue q) {
         assertNotNull(head(q));

From 270014ab4ec4588a0f662e0b9bbdfb3feaf4e723 Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Sat, 9 Jan 2021 21:59:27 +0000
Subject: [PATCH 092/129] 8234131: Miscellaneous changes imported from jsr166
 CVS 2021-01 8257671: ThreadPoolExecutor.Discard*Policy: rejected tasks are
 not cancelled

Reviewed-by: alanb, prappo, dl
---
 .../concurrent/AbstractExecutorService.java   |  4 +-
 .../util/concurrent/CopyOnWriteArraySet.java  |  2 +-
 .../java/util/concurrent/CountDownLatch.java  |  8 +-
 .../java/util/concurrent/CyclicBarrier.java   |  4 +-
 .../java/util/concurrent/Exchanger.java       |  6 +-
 .../java/util/concurrent/ExecutorService.java |  2 +-
 .../classes/java/util/concurrent/Future.java  | 39 +++++----
 .../classes/java/util/concurrent/Phaser.java  |  4 +-
 .../concurrent/PriorityBlockingQueue.java     |  6 +-
 .../java/util/concurrent/Semaphore.java       |  2 +-
 .../util/concurrent/SubmissionPublisher.java  | 85 ++++++++++++++-----
 .../util/concurrent/ThreadPoolExecutor.java   | 38 +++++++--
 .../util/concurrent/atomic/AtomicBoolean.java |  3 +-
 .../atomic/AtomicReferenceFieldUpdater.java   |  2 +-
 .../concurrent/atomic/DoubleAccumulator.java  |  5 +-
 .../util/concurrent/atomic/DoubleAdder.java   |  5 +-
 .../concurrent/atomic/LongAccumulator.java    |  5 +-
 .../util/concurrent/atomic/LongAdder.java     |  5 +-
 .../util/concurrent/atomic/Striped64.java     | 53 ++++++------
 .../util/concurrent/atomic/package-info.java  |  2 +-
 .../locks/AbstractQueuedSynchronizer.java     |  4 +-
 .../util/concurrent/locks/ReentrantLock.java  |  6 +-
 .../locks/ReentrantReadWriteLock.java         |  4 +-
 .../util/concurrent/locks/StampedLock.java    |  4 +-
 .../Collection/IteratorMicroBenchmark.java    |  1 -
 .../concurrent/ExecutorService/Invoke.java    | 39 ++++-----
 .../tck/ArrayBlockingQueueTest.java           |  2 +-
 .../util/concurrent/tck/ArrayDequeTest.java   |  2 +-
 .../util/concurrent/tck/ArrayListTest.java    |  2 +-
 .../util/concurrent/tck/Collection8Test.java  |  3 -
 .../concurrent/tck/CompletableFutureTest.java | 19 +----
 .../tck/ConcurrentLinkedDequeTest.java        |  1 -
 .../util/concurrent/tck/ExecutorsTest.java    | 29 ++++---
 .../util/concurrent/tck/ForkJoinPoolTest.java |  6 +-
 .../util/concurrent/tck/JSR166TestCase.java   |  3 +-
 .../concurrent/tck/RecursiveTaskTest.java     | 16 ++--
 .../concurrent/tck/SplittableRandomTest.java  | 27 +++---
 .../util/concurrent/tck/StampedLockTest.java  |  9 +-
 .../tck/SubmissionPublisherTest.java          |  2 +-
 .../concurrent/tck/SynchronousQueueTest.java  |  2 +-
 .../concurrent/tck/ThreadLocalRandomTest.java | 19 ++---
 41 files changed, 273 insertions(+), 207 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
index 741fe3097c1ab..f45c0036230f0 100644
--- a/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
+++ b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
@@ -54,13 +54,13 @@
  * to return {@code RunnableFuture} implementations other than
  * {@code FutureTask}.
  *
- * <p><b>Extension example</b>. Here is a sketch of a class
+ * <p><b>Extension example.</b> Here is a sketch of a class
  * that customizes {@link ThreadPoolExecutor} to use
  * a {@code CustomTask} class instead of the default {@code FutureTask}:
  * <pre> {@code
  * public class CustomThreadPoolExecutor extends ThreadPoolExecutor {
  *
- *   static class CustomTask<V> implements RunnableFuture<V> {...}
+ *   static class CustomTask<V> implements RunnableFuture<V> { ... }
  *
  *   protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
  *       return new CustomTask<V>(c);
diff --git a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
index b14a3e8ea899d..ab48a44c97acf 100644
--- a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
+++ b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
@@ -69,7 +69,7 @@
  * perform some action upon state updates.
  *
  * <pre> {@code
- * class Handler { void handle(); ... }
+ * class Handler { void handle() { ... } }
  *
  * class X {
  *   private final CopyOnWriteArraySet<Handler> handlers
diff --git a/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java b/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java
index 8d85418147be6..3b41b49a60555 100644
--- a/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java
+++ b/src/java.base/share/classes/java/util/concurrent/CountDownLatch.java
@@ -118,7 +118,7 @@
  * class Driver2 { // ...
  *   void main() throws InterruptedException {
  *     CountDownLatch doneSignal = new CountDownLatch(N);
- *     Executor e = ...
+ *     Executor e = ...;
  *
  *     for (int i = 0; i < N; ++i) // create and start threads
  *       e.execute(new WorkerRunnable(doneSignal, i));
@@ -135,10 +135,8 @@
  *     this.i = i;
  *   }
  *   public void run() {
- *     try {
- *       doWork(i);
- *       doneSignal.countDown();
- *     } catch (InterruptedException ex) {} // return;
+ *     doWork();
+ *     doneSignal.countDown();
  *   }
  *
  *   void doWork() { ... }
diff --git a/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java b/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
index 1e8ef5405aa08..87e498d9c247a 100644
--- a/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
+++ b/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
@@ -94,7 +94,9 @@
  *
  *     // wait until done
  *     for (Thread thread : threads)
- *       thread.join();
+ *       try {
+ *         thread.join();
+ *       } catch (InterruptedException ex) { }
  *   }
  * }}</pre>
  *
diff --git a/src/java.base/share/classes/java/util/concurrent/Exchanger.java b/src/java.base/share/classes/java/util/concurrent/Exchanger.java
index 4d6e2d62d7cd6..3fae1b0b781e1 100644
--- a/src/java.base/share/classes/java/util/concurrent/Exchanger.java
+++ b/src/java.base/share/classes/java/util/concurrent/Exchanger.java
@@ -57,8 +57,8 @@
  * <pre> {@code
  * class FillAndEmpty {
  *   Exchanger<DataBuffer> exchanger = new Exchanger<>();
- *   DataBuffer initialEmptyBuffer = ... a made-up type
- *   DataBuffer initialFullBuffer = ...
+ *   DataBuffer initialEmptyBuffer = ...; // a made-up type
+ *   DataBuffer initialFullBuffer = ...;
  *
  *   class FillingLoop implements Runnable {
  *     public void run() {
@@ -69,7 +69,7 @@
  *           if (currentBuffer.isFull())
  *             currentBuffer = exchanger.exchange(currentBuffer);
  *         }
- *       } catch (InterruptedException ex) { ... handle ... }
+ *       } catch (InterruptedException ex) { ... handle ...}
  *     }
  *   }
  *
diff --git a/src/java.base/share/classes/java/util/concurrent/ExecutorService.java b/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
index 9e9b63e40031f..119c941a4bdac 100644
--- a/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
+++ b/src/java.base/share/classes/java/util/concurrent/ExecutorService.java
@@ -117,7 +117,7 @@
  *       if (!pool.awaitTermination(60, TimeUnit.SECONDS))
  *           System.err.println("Pool did not terminate");
  *     }
- *   } catch (InterruptedException ie) {
+ *   } catch (InterruptedException ex) {
  *     // (Re-)Cancel if current thread also interrupted
  *     pool.shutdownNow();
  *     // Preserve interrupt status
diff --git a/src/java.base/share/classes/java/util/concurrent/Future.java b/src/java.base/share/classes/java/util/concurrent/Future.java
index 6099c7caf417f..ebbf14dd4d191 100644
--- a/src/java.base/share/classes/java/util/concurrent/Future.java
+++ b/src/java.base/share/classes/java/util/concurrent/Future.java
@@ -56,8 +56,8 @@
  * <pre> {@code
  * interface ArchiveSearcher { String search(String target); }
  * class App {
- *   ExecutorService executor = ...
- *   ArchiveSearcher searcher = ...
+ *   ExecutorService executor = ...;
+ *   ArchiveSearcher searcher = ...;
  *   void showSearch(String target) throws InterruptedException {
  *     Callable<String> task = () -> searcher.search(target);
  *     Future<String> future = executor.submit(task);
@@ -88,25 +88,28 @@
 public interface Future<V> {
 
     /**
-     * Attempts to cancel execution of this task.  This attempt will
-     * fail if the task has already completed, has already been cancelled,
-     * or could not be cancelled for some other reason. If successful,
-     * and this task has not started when {@code cancel} is called,
-     * this task should never run.  If the task has already started,
-     * then the {@code mayInterruptIfRunning} parameter determines
-     * whether the thread executing this task should be interrupted in
-     * an attempt to stop the task.
+     * Attempts to cancel execution of this task.  This method has no
+     * effect if the task is already completed or cancelled, or could
+     * not be cancelled for some other reason.  Otherwise, if this
+     * task has not started when {@code cancel} is called, this task
+     * should never run.  If the task has already started, then the
+     * {@code mayInterruptIfRunning} parameter determines whether the
+     * thread executing this task (when known by the implementation)
+     * is interrupted in an attempt to stop the task.
      *
-     * <p>After this method returns, subsequent calls to {@link #isDone} will
-     * always return {@code true}.  Subsequent calls to {@link #isCancelled}
-     * will always return {@code true} if this method returned {@code true}.
+     * <p>The return value from this method does not necessarily
+     * indicate whether the task is now cancelled; use {@link
+     * #isCancelled}.
      *
-     * @param mayInterruptIfRunning {@code true} if the thread executing this
-     * task should be interrupted; otherwise, in-progress tasks are allowed
-     * to complete
+     * @param mayInterruptIfRunning {@code true} if the thread
+     * executing this task should be interrupted (if the thread is
+     * known to the implementation); otherwise, in-progress tasks are
+     * allowed to complete
      * @return {@code false} if the task could not be cancelled,
-     * typically because it has already completed normally;
-     * {@code true} otherwise
+     * typically because it has already completed; {@code true}
+     * otherwise. If two or more threads cause a task to be cancelled,
+     * then at least one of them returns {@code true}. Implementations
+     * may provide stronger guarantees.
      */
     boolean cancel(boolean mayInterruptIfRunning);
 
diff --git a/src/java.base/share/classes/java/util/concurrent/Phaser.java b/src/java.base/share/classes/java/util/concurrent/Phaser.java
index 41178c2950631..9c4f2a57f86a9 100644
--- a/src/java.base/share/classes/java/util/concurrent/Phaser.java
+++ b/src/java.base/share/classes/java/util/concurrent/Phaser.java
@@ -245,7 +245,7 @@
  * be appropriate for extremely small per-phase task bodies (thus
  * high rates), or up to hundreds for extremely large ones.
  *
- * <p><b>Implementation notes</b>: This implementation restricts the
+ * <p><b>Implementation notes:</b> This implementation restricts the
  * maximum number of parties to 65535. Attempts to register additional
  * parties result in {@code IllegalStateException}. However, you can and
  * should create tiered phasers to accommodate arbitrarily large sets
@@ -919,7 +919,7 @@ public boolean isTerminated() {
      * <pre> {@code
      * Phaser phaser = new Phaser() {
      *   protected boolean onAdvance(int phase, int parties) { return false; }
-     * }}</pre>
+     * };}</pre>
      *
      * @param phase the current phase number on entry to this method,
      * before this phaser is advanced
diff --git a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
index ef239b1baa642..908a59de469a8 100644
--- a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
@@ -87,7 +87,7 @@
  * <pre> {@code
  * class FIFOEntry<E extends Comparable<? super E>>
  *     implements Comparable<FIFOEntry<E>> {
- *   static final AtomicLong seq = new AtomicLong(0);
+ *   static final AtomicLong seq = new AtomicLong();
  *   final long seqNum;
  *   final E entry;
  *   public FIFOEntry(E entry) {
@@ -290,7 +290,9 @@ private void tryGrow(Object[] array, int oldCap) {
         if (allocationSpinLock == 0 &&
             ALLOCATIONSPINLOCK.compareAndSet(this, 0, 1)) {
             try {
-                int growth = oldCap < 64 ? oldCap + 2 : oldCap >> 1;
+                int growth = (oldCap < 64)
+                    ? (oldCap + 2) // grow faster if small
+                    : (oldCap >> 1);
                 int newCap = ArraysSupport.newLength(oldCap, 1, growth);
                 if (queue == array)
                     newArray = new Object[newCap];
diff --git a/src/java.base/share/classes/java/util/concurrent/Semaphore.java b/src/java.base/share/classes/java/util/concurrent/Semaphore.java
index 86ee638f78dbf..5c299659d6a3f 100644
--- a/src/java.base/share/classes/java/util/concurrent/Semaphore.java
+++ b/src/java.base/share/classes/java/util/concurrent/Semaphore.java
@@ -66,7 +66,7 @@
  *
  *   // Not a particularly efficient data structure; just for demo
  *
- *   protected Object[] items = ... whatever kinds of items being managed
+ *   protected Object[] items = ...; // whatever kinds of items being managed
  *   protected boolean[] used = new boolean[MAX_AVAILABLE];
  *
  *   protected synchronized Object getNextAvailableItem() {
diff --git a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
index 9efb01d1a0da6..e3c2a6098d800 100644
--- a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
+++ b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
@@ -41,6 +41,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
@@ -175,11 +176,11 @@ public class SubmissionPublisher<T> implements Publisher<T>,
     /*
      * Most mechanics are handled by BufferedSubscription. This class
      * mainly tracks subscribers and ensures sequentiality, by using
-     * built-in synchronization locks across public methods. Using
-     * built-in locks works well in the most typical case in which
-     * only one thread submits items. We extend this idea in
-     * submission methods by detecting single-ownership to reduce
-     * producer-consumer synchronization strength.
+     * locks across public methods, to ensure thread-safety in the
+     * presence of multiple sources and maintain acquire-release
+     * ordering around user operations. However, we also track whether
+     * there is only a single source, and if so streamline some buffer
+     * operations by avoiding some atomics.
      */
 
     /** The largest possible power of two array size. */
@@ -234,6 +235,8 @@ private static final class ThreadPerTaskExecutor implements Executor {
      */
     BufferedSubscription<T> clients;
 
+    /** Lock for exclusion across multiple sources */
+    final ReentrantLock lock;
     /** Run status, updated only within locks */
     volatile boolean closed;
     /** Set true on first call to subscribe, to initialize possible owner */
@@ -274,6 +277,7 @@ public SubmissionPublisher(Executor executor, int maxBufferCapacity,
             throw new NullPointerException();
         if (maxBufferCapacity <= 0)
             throw new IllegalArgumentException("capacity must be positive");
+        this.lock = new ReentrantLock();
         this.executor = executor;
         this.onNextHandler = handler;
         this.maxBufferCapacity = roundCapacity(maxBufferCapacity);
@@ -337,13 +341,15 @@ public SubmissionPublisher() {
      */
     public void subscribe(Subscriber<? super T> subscriber) {
         if (subscriber == null) throw new NullPointerException();
+        ReentrantLock lock = this.lock;
         int max = maxBufferCapacity; // allocate initial array
         Object[] array = new Object[max < INITIAL_CAPACITY ?
                                     max : INITIAL_CAPACITY];
         BufferedSubscription<T> subscription =
             new BufferedSubscription<T>(subscriber, executor, onNextHandler,
                                         array, max);
-        synchronized (this) {
+        lock.lock();
+        try {
             if (!subscribed) {
                 subscribed = true;
                 owner = Thread.currentThread();
@@ -378,6 +384,8 @@ else if (subscriber.equals(b.subscriber)) {
                     pred = b;
                 b = next;
             }
+        } finally {
+            lock.unlock();
         }
     }
 
@@ -390,7 +398,9 @@ private int doOffer(T item, long nanos,
         if (item == null) throw new NullPointerException();
         int lag = 0;
         boolean complete, unowned;
-        synchronized (this) {
+        ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
             Thread t = Thread.currentThread(), o;
             BufferedSubscription<T> b = clients;
             if ((unowned = ((o = owner) != t)) && o != null)
@@ -421,6 +431,8 @@ else if (stat > lag)
                 if (retries != null || cleanMe)
                     lag = retryOffer(item, nanos, onDrop, retries, lag, cleanMe);
             }
+        } finally {
+            lock.unlock();
         }
         if (complete)
             throw new IllegalStateException("Closed");
@@ -609,14 +621,18 @@ public int offer(T item, long timeout, TimeUnit unit,
      * subscribers have yet completed.
      */
     public void close() {
+        ReentrantLock lock = this.lock;
         if (!closed) {
             BufferedSubscription<T> b;
-            synchronized (this) {
+            lock.lock();
+            try {
                 // no need to re-check closed here
                 b = clients;
                 clients = null;
                 owner = null;
                 closed = true;
+            } finally {
+                lock.unlock();
             }
             while (b != null) {
                 BufferedSubscription<T> next = b.next;
@@ -641,9 +657,11 @@ public void close() {
     public void closeExceptionally(Throwable error) {
         if (error == null)
             throw new NullPointerException();
+        ReentrantLock lock = this.lock;
         if (!closed) {
             BufferedSubscription<T> b;
-            synchronized (this) {
+            lock.lock();
+            try {
                 b = clients;
                 if (!closed) {  // don't clobber racing close
                     closedException = error;
@@ -651,6 +669,8 @@ public void closeExceptionally(Throwable error) {
                     owner = null;
                     closed = true;
                 }
+            } finally {
+                lock.unlock();
             }
             while (b != null) {
                 BufferedSubscription<T> next = b.next;
@@ -688,7 +708,9 @@ public Throwable getClosedException() {
      */
     public boolean hasSubscribers() {
         boolean nonEmpty = false;
-        synchronized (this) {
+        ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
             for (BufferedSubscription<T> b = clients; b != null;) {
                 BufferedSubscription<T> next = b.next;
                 if (b.isClosed()) {
@@ -700,6 +722,8 @@ public boolean hasSubscribers() {
                     break;
                 }
             }
+        } finally {
+            lock.unlock();
         }
         return nonEmpty;
     }
@@ -710,9 +734,15 @@ public boolean hasSubscribers() {
      * @return the number of current subscribers
      */
     public int getNumberOfSubscribers() {
-        synchronized (this) {
-            return cleanAndCount();
+        int n;
+        ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
+            n = cleanAndCount();
+        } finally {
+            lock.unlock();
         }
+        return n;
     }
 
     /**
@@ -742,7 +772,9 @@ public int getMaxBufferCapacity() {
      */
     public List<Subscriber<? super T>> getSubscribers() {
         ArrayList<Subscriber<? super T>> subs = new ArrayList<>();
-        synchronized (this) {
+        ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
             BufferedSubscription<T> pred = null, next;
             for (BufferedSubscription<T> b = clients; b != null; b = next) {
                 next = b.next;
@@ -758,6 +790,8 @@ public List<Subscriber<? super T>> getSubscribers() {
                     pred = b;
                 }
             }
+        } finally {
+            lock.unlock();
         }
         return subs;
     }
@@ -771,8 +805,11 @@ public List<Subscriber<? super T>> getSubscribers() {
      */
     public boolean isSubscribed(Subscriber<? super T> subscriber) {
         if (subscriber == null) throw new NullPointerException();
+        boolean subscribed = false;
+        ReentrantLock lock = this.lock;
         if (!closed) {
-            synchronized (this) {
+            lock.lock();
+            try {
                 BufferedSubscription<T> pred = null, next;
                 for (BufferedSubscription<T> b = clients; b != null; b = next) {
                     next = b.next;
@@ -783,14 +820,16 @@ public boolean isSubscribed(Subscriber<? super T> subscriber) {
                         else
                             pred.next = next;
                     }
-                    else if (subscriber.equals(b.subscriber))
-                        return true;
+                    else if (subscribed = subscriber.equals(b.subscriber))
+                        break;
                     else
                         pred = b;
                 }
+            } finally {
+                lock.unlock();
             }
         }
-        return false;
+        return subscribed;
     }
 
     /**
@@ -803,7 +842,9 @@ else if (subscriber.equals(b.subscriber))
     public long estimateMinimumDemand() {
         long min = Long.MAX_VALUE;
         boolean nonEmpty = false;
-        synchronized (this) {
+        ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
             BufferedSubscription<T> pred = null, next;
             for (BufferedSubscription<T> b = clients; b != null; b = next) {
                 int n; long d;
@@ -822,6 +863,8 @@ public long estimateMinimumDemand() {
                     pred = b;
                 }
             }
+        } finally {
+            lock.unlock();
         }
         return nonEmpty ? min : 0;
     }
@@ -834,7 +877,9 @@ public long estimateMinimumDemand() {
      */
     public int estimateMaximumLag() {
         int max = 0;
-        synchronized (this) {
+        ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
             BufferedSubscription<T> pred = null, next;
             for (BufferedSubscription<T> b = clients; b != null; b = next) {
                 int n;
@@ -852,6 +897,8 @@ public int estimateMaximumLag() {
                     pred = b;
                 }
             }
+        } finally {
+            lock.unlock();
         }
         return max;
     }
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
index 5c61ab0855e8c..b5dcd794b13ee 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
@@ -221,13 +221,18 @@
  * simple feedback control mechanism that will slow down the rate that
  * new tasks are submitted.
  *
- * <li>In {@link ThreadPoolExecutor.DiscardPolicy}, a task that
- * cannot be executed is simply dropped.
+ * <li>In {@link ThreadPoolExecutor.DiscardPolicy}, a task that cannot
+ * be executed is simply dropped. This policy is designed only for
+ * those rare cases in which task completion is never relied upon.
  *
  * <li>In {@link ThreadPoolExecutor.DiscardOldestPolicy}, if the
  * executor is not shut down, the task at the head of the work queue
  * is dropped, and then execution is retried (which can fail again,
- * causing this to be repeated.)
+ * causing this to be repeated.) This policy is rarely acceptable.  In
+ * nearly all cases, you should also cancel the task to cause an
+ * exception in any component waiting for its completion, and/or log
+ * the failure, as illustrated in {@link
+ * ThreadPoolExecutor.DiscardOldestPolicy} documentation.
  *
  * </ol>
  *
@@ -272,7 +277,7 @@
  *
  * </dl>
  *
- * <p><b>Extension example</b>. Most extensions of this class
+ * <p><b>Extension example.</b> Most extensions of this class
  * override one or more of the protected hook methods. For example,
  * here is a subclass that adds a simple pause/resume feature:
  *
@@ -1149,8 +1154,10 @@ final void runWorker(Worker w) {
 
     /**
      * Creates a new {@code ThreadPoolExecutor} with the given initial
-     * parameters, the default thread factory and the default rejected
-     * execution handler.
+     * parameters, the
+     * {@linkplain Executors#defaultThreadFactory default thread factory}
+     * and the {@linkplain ThreadPoolExecutor.AbortPolicy
+     * default rejected execution handler}.
      *
      * <p>It may be more convenient to use one of the {@link Executors}
      * factory methods instead of this general purpose constructor.
@@ -1184,7 +1191,7 @@ public ThreadPoolExecutor(int corePoolSize,
 
     /**
      * Creates a new {@code ThreadPoolExecutor} with the given initial
-     * parameters and {@linkplain ThreadPoolExecutor.AbortPolicy
+     * parameters and the {@linkplain ThreadPoolExecutor.AbortPolicy
      * default rejected execution handler}.
      *
      * @param corePoolSize the number of threads to keep in the pool, even
@@ -1220,7 +1227,7 @@ public ThreadPoolExecutor(int corePoolSize,
 
     /**
      * Creates a new {@code ThreadPoolExecutor} with the given initial
-     * parameters and
+     * parameters and the
      * {@linkplain Executors#defaultThreadFactory default thread factory}.
      *
      * @param corePoolSize the number of threads to keep in the pool, even
@@ -2081,7 +2088,20 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
     /**
      * A handler for rejected tasks that discards the oldest unhandled
      * request and then retries {@code execute}, unless the executor
-     * is shut down, in which case the task is discarded.
+     * is shut down, in which case the task is discarded. This policy is
+     * rarely useful in cases where other threads may be waiting for
+     * tasks to terminate, or failures must be recorded. Instead consider
+     * using a handler of the form:
+     * <pre> {@code
+     * new RejectedExecutionHandler() {
+     *   public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
+     *     Runnable dropped = e.getQueue().poll();
+     *     if (dropped instanceof Future<?>) {
+     *       ((Future<?>)dropped).cancel(false);
+     *       // also consider logging the failure
+     *     }
+     *     e.execute(r);  // retry
+     * }}}</pre>
      */
     public static class DiscardOldestPolicy implements RejectedExecutionHandler {
         /**
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
index caff3c423e3d6..1555c22caa486 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
@@ -68,9 +68,8 @@ public class AtomicBoolean implements java.io.Serializable {
      * @param initialValue the initial value
      */
     public AtomicBoolean(boolean initialValue) {
-        if (initialValue) {
+        if (initialValue)
             value = 1;
-        }
     }
 
     /**
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
index 7f70f1e893f9a..fea91ff0ab23a 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
@@ -62,7 +62,7 @@
  *
  *   private static final AtomicReferenceFieldUpdater<Node, Node> leftUpdater =
  *     AtomicReferenceFieldUpdater.newUpdater(Node.class, Node.class, "left");
- *   private static AtomicReferenceFieldUpdater<Node, Node> rightUpdater =
+ *   private static final AtomicReferenceFieldUpdater<Node, Node> rightUpdater =
  *     AtomicReferenceFieldUpdater.newUpdater(Node.class, Node.class, "right");
  *
  *   Node getLeft() { return left; }
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java b/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
index 9e62a2cb2a247..d04b8253ee76d 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
@@ -111,16 +111,17 @@ public void accumulate(double x) {
             || ((r = doubleToRawLongBits
                 (function.applyAsDouble(longBitsToDouble(b = base), x))) != b
                 && !casBase(b, r))) {
+            int index = getProbe();
             boolean uncontended = true;
             if (cs == null
                 || (m = cs.length - 1) < 0
-                || (c = cs[getProbe() & m]) == null
+                || (c = cs[index & m]) == null
                 || !(uncontended =
                      ((r = doubleToRawLongBits
                        (function.applyAsDouble
                         (longBitsToDouble(v = c.value), x))) == v)
                      || c.cas(v, r)))
-                doubleAccumulate(x, function, uncontended);
+                doubleAccumulate(x, function, uncontended, index);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java b/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java
index 1d1a42e0f610c..70a714e168a14 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java
@@ -92,13 +92,14 @@ public void add(double x) {
             !casBase(b = base,
                      Double.doubleToRawLongBits
                      (Double.longBitsToDouble(b) + x))) {
+            int index = getProbe();
             boolean uncontended = true;
             if (cs == null || (m = cs.length - 1) < 0 ||
-                (c = cs[getProbe() & m]) == null ||
+                (c = cs[index & m]) == null ||
                 !(uncontended = c.cas(v = c.value,
                                       Double.doubleToRawLongBits
                                       (Double.longBitsToDouble(v) + x))))
-                doubleAccumulate(x, null, uncontended);
+                doubleAccumulate(x, null, uncontended, index);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java b/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java
index 39c53d2099918..be96853ce0921 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java
@@ -108,14 +108,15 @@ public void accumulate(long x) {
         if ((cs = cells) != null
             || ((r = function.applyAsLong(b = base, x)) != b
                 && !casBase(b, r))) {
+            int index = getProbe();
             boolean uncontended = true;
             if (cs == null
                 || (m = cs.length - 1) < 0
-                || (c = cs[getProbe() & m]) == null
+                || (c = cs[index & m]) == null
                 || !(uncontended =
                      (r = function.applyAsLong(v = c.value, x)) == v
                      || c.cas(v, r)))
-                longAccumulate(x, function, uncontended);
+                longAccumulate(x, function, uncontended, index);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java b/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java
index 08466abbb8abf..c069249a535cc 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java
@@ -85,11 +85,12 @@ public LongAdder() {
     public void add(long x) {
         Cell[] cs; long b, v; int m; Cell c;
         if ((cs = cells) != null || !casBase(b = base, b + x)) {
+            int index = getProbe();
             boolean uncontended = true;
             if (cs == null || (m = cs.length - 1) < 0 ||
-                (c = cs[getProbe() & m]) == null ||
+                (c = cs[index & m]) == null ||
                 !(uncontended = c.cas(v = c.value, v + x)))
-                longAccumulate(x, null, uncontended);
+                longAccumulate(x, null, uncontended, index);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
index 9c21fa36e5af4..7b44eca5af8f9 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
@@ -125,7 +125,7 @@ abstract class Striped64 extends Number {
         volatile long value;
         Cell(long x) { value = x; }
         final boolean cas(long cmp, long val) {
-            return VALUE.compareAndSet(this, cmp, val);
+            return VALUE.weakCompareAndSetRelease(this, cmp, val);
         }
         final void reset() {
             VALUE.setVolatile(this, 0L);
@@ -178,7 +178,7 @@ final long getAndSet(long val) {
      * CASes the base field.
      */
     final boolean casBase(long cmp, long val) {
-        return BASE.compareAndSet(this, cmp, val);
+        return BASE.weakCompareAndSetRelease(this, cmp, val);
     }
 
     final long getAndSetBase(long val) {
@@ -224,20 +224,19 @@ static final int advanceProbe(int probe) {
      * @param fn the update function, or null for add (this convention
      * avoids the need for an extra field or function in LongAdder).
      * @param wasUncontended false if CAS failed before call
+     * @param index thread index from getProbe
      */
     final void longAccumulate(long x, LongBinaryOperator fn,
-                              boolean wasUncontended) {
-        int h;
-        if ((h = getProbe()) == 0) {
+                              boolean wasUncontended, int index) {
+        if (index == 0) {
             ThreadLocalRandom.current(); // force initialization
-            h = getProbe();
+            index = getProbe();
             wasUncontended = true;
         }
-        boolean collide = false;                // True if last slot nonempty
-        done: for (;;) {
+        for (boolean collide = false;;) {       // True if last slot nonempty
             Cell[] cs; Cell c; int n; long v;
             if ((cs = cells) != null && (n = cs.length) > 0) {
-                if ((c = cs[(n - 1) & h]) == null) {
+                if ((c = cs[(n - 1) & index]) == null) {
                     if (cellsBusy == 0) {       // Try to attach new Cell
                         Cell r = new Cell(x);   // Optimistically create
                         if (cellsBusy == 0 && casCellsBusy()) {
@@ -245,9 +244,9 @@ final void longAccumulate(long x, LongBinaryOperator fn,
                                 Cell[] rs; int m, j;
                                 if ((rs = cells) != null &&
                                     (m = rs.length) > 0 &&
-                                    rs[j = (m - 1) & h] == null) {
+                                    rs[j = (m - 1) & index] == null) {
                                     rs[j] = r;
-                                    break done;
+                                    break;
                                 }
                             } finally {
                                 cellsBusy = 0;
@@ -276,15 +275,15 @@ else if (cellsBusy == 0 && casCellsBusy()) {
                     collide = false;
                     continue;                   // Retry with expanded table
                 }
-                h = advanceProbe(h);
+                index = advanceProbe(index);
             }
             else if (cellsBusy == 0 && cells == cs && casCellsBusy()) {
                 try {                           // Initialize table
                     if (cells == cs) {
                         Cell[] rs = new Cell[2];
-                        rs[h & 1] = new Cell(x);
+                        rs[index & 1] = new Cell(x);
                         cells = rs;
-                        break done;
+                        break;
                     }
                 } finally {
                     cellsBusy = 0;
@@ -293,7 +292,7 @@ else if (cellsBusy == 0 && cells == cs && casCellsBusy()) {
             // Fall back on using base
             else if (casBase(v = base,
                              (fn == null) ? v + x : fn.applyAsLong(v, x)))
-                break done;
+                break;
         }
     }
 
@@ -310,18 +309,16 @@ private static long apply(DoubleBinaryOperator fn, long v, double x) {
      * maintained by copy/paste/adapt.
      */
     final void doubleAccumulate(double x, DoubleBinaryOperator fn,
-                                boolean wasUncontended) {
-        int h;
-        if ((h = getProbe()) == 0) {
+                                boolean wasUncontended, int index) {
+        if (index == 0) {
             ThreadLocalRandom.current(); // force initialization
-            h = getProbe();
+            index = getProbe();
             wasUncontended = true;
         }
-        boolean collide = false;                // True if last slot nonempty
-        done: for (;;) {
+        for (boolean collide = false;;) {       // True if last slot nonempty
             Cell[] cs; Cell c; int n; long v;
             if ((cs = cells) != null && (n = cs.length) > 0) {
-                if ((c = cs[(n - 1) & h]) == null) {
+                if ((c = cs[(n - 1) & index]) == null) {
                     if (cellsBusy == 0) {       // Try to attach new Cell
                         Cell r = new Cell(Double.doubleToRawLongBits(x));
                         if (cellsBusy == 0 && casCellsBusy()) {
@@ -329,9 +326,9 @@ final void doubleAccumulate(double x, DoubleBinaryOperator fn,
                                 Cell[] rs; int m, j;
                                 if ((rs = cells) != null &&
                                     (m = rs.length) > 0 &&
-                                    rs[j = (m - 1) & h] == null) {
+                                    rs[j = (m - 1) & index] == null) {
                                     rs[j] = r;
-                                    break done;
+                                    break;
                                 }
                             } finally {
                                 cellsBusy = 0;
@@ -359,15 +356,15 @@ else if (cellsBusy == 0 && casCellsBusy()) {
                     collide = false;
                     continue;                   // Retry with expanded table
                 }
-                h = advanceProbe(h);
+                index = advanceProbe(index);
             }
             else if (cellsBusy == 0 && cells == cs && casCellsBusy()) {
                 try {                           // Initialize table
                     if (cells == cs) {
                         Cell[] rs = new Cell[2];
-                        rs[h & 1] = new Cell(Double.doubleToRawLongBits(x));
+                        rs[index & 1] = new Cell(Double.doubleToRawLongBits(x));
                         cells = rs;
-                        break done;
+                        break;
                     }
                 } finally {
                     cellsBusy = 0;
@@ -375,7 +372,7 @@ else if (cellsBusy == 0 && cells == cs && casCellsBusy()) {
             }
             // Fall back on using base
             else if (casBase(v = base, apply(fn, v, x)))
-                break done;
+                break;
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java b/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java
index 8390ff35d0b85..ef3c08b4a2c78 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java
@@ -54,7 +54,7 @@
  * <pre> {@code
  * class Sequencer {
  *   private final AtomicLong sequenceNumber
- *     = new AtomicLong(0);
+ *     = new AtomicLong(17);
  *   public long next() {
  *     return sequenceNumber.getAndIncrement();
  *   }
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index 83b434ff7a144..73e04fc90281d 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
@@ -137,13 +137,13 @@
  * of exclusive synchronization takes the form:
  *
  * <pre>
- * Acquire:
+ * <em>Acquire:</em>
  *     while (!tryAcquire(arg)) {
  *        <em>enqueue thread if it is not already queued</em>;
  *        <em>possibly block current thread</em>;
  *     }
  *
- * Release:
+ * <em>Release:</em>
  *     if (tryRelease(arg))
  *        <em>unblock the first queued thread</em>;
  * </pre>
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
index be46131d3e24d..c58925b086e6d 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
@@ -550,7 +550,7 @@ public Condition newCondition() {
      *
      * <pre> {@code
      * class X {
-     *   ReentrantLock lock = new ReentrantLock();
+     *   final ReentrantLock lock = new ReentrantLock();
      *   // ...
      *   public void m() {
      *     assert lock.getHoldCount() == 0;
@@ -580,7 +580,7 @@ public int getHoldCount() {
      *
      * <pre> {@code
      * class X {
-     *   ReentrantLock lock = new ReentrantLock();
+     *   final ReentrantLock lock = new ReentrantLock();
      *   // ...
      *
      *   public void m() {
@@ -594,7 +594,7 @@ public int getHoldCount() {
      *
      * <pre> {@code
      * class X {
-     *   ReentrantLock lock = new ReentrantLock();
+     *   final ReentrantLock lock = new ReentrantLock();
      *   // ...
      *
      *   public void m() {
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
index 843a18c5f99f2..c73bd41cea87a 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
@@ -128,7 +128,7 @@
  * locks: a deserialized lock is in the unlocked state, regardless of
  * its state when serialized.
  *
- * <p><b>Sample usages</b>. Here is a code sketch showing how to perform
+ * <p><b>Sample usages.</b> Here is a code sketch showing how to perform
  * lock downgrading after updating a cache (exception handling is
  * particularly tricky when handling multiple locks in a non-nested
  * fashion):
@@ -149,7 +149,7 @@
  *         // Recheck state because another thread might have
  *         // acquired write lock and changed state before we did.
  *         if (!cacheValid) {
- *           data = ...
+ *           data = ...;
  *           cacheValid = true;
  *         }
  *         // Downgrade by acquiring read lock before releasing write lock
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
index b13df1ce38153..b9f0e9340b7d9 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
@@ -212,8 +212,8 @@
  *     }
  *   }
  *
- *   // Upgrade read lock to write lock
- *   void moveIfAtOrigin(double newX, double newY) {
+ *   // upgrade read lock to write lock
+ *   void moveIfAtOrigin2(double newX, double newY) {
  *     long stamp = sl.readLock();
  *     try {
  *       while (x == 0.0 && y == 0.0) {
diff --git a/test/jdk/java/util/Collection/IteratorMicroBenchmark.java b/test/jdk/java/util/Collection/IteratorMicroBenchmark.java
index 72902d33ef6c6..45426cc6127bd 100644
--- a/test/jdk/java/util/Collection/IteratorMicroBenchmark.java
+++ b/test/jdk/java/util/Collection/IteratorMicroBenchmark.java
@@ -360,7 +360,6 @@ boolean isMutable(Collection<Integer> x) {
     }
 
     Stream<Job> jobs(Collection<Integer> x) {
-        final String klazz = goodClassName(x);
         return concatStreams(
             collectionJobs(x),
 
diff --git a/test/jdk/java/util/concurrent/ExecutorService/Invoke.java b/test/jdk/java/util/concurrent/ExecutorService/Invoke.java
index 918c9acdde02c..a999a14388eca 100644
--- a/test/jdk/java/util/concurrent/ExecutorService/Invoke.java
+++ b/test/jdk/java/util/concurrent/ExecutorService/Invoke.java
@@ -84,9 +84,16 @@ static void awaitInterrupt(long timeoutSeconds) {
 
     public static void main(String[] args) {
         try {
-            testInvokeAll();
-            testInvokeAny();
-            testInvokeAny_cancellationInterrupt();
+            for (int nThreads = 1; nThreads <= 6; ++nThreads) {
+                // untimed
+                testInvokeAll(nThreads, false);
+                testInvokeAny(nThreads, false);
+                testInvokeAny_cancellationInterrupt(nThreads, false);
+                // timed
+                testInvokeAll(nThreads, true);
+                testInvokeAny(nThreads, true);
+                testInvokeAny_cancellationInterrupt(nThreads, true);
+            }
         } catch (Throwable t) {  unexpected(t); }
 
         if (failed > 0)
@@ -96,10 +103,8 @@ public static void main(String[] args) {
 
     static final long timeoutSeconds = 10L;
 
-    static void testInvokeAll() throws Throwable {
+    static void testInvokeAll(int nThreads, boolean timed) throws Throwable {
         final ThreadLocalRandom rnd = ThreadLocalRandom.current();
-        final int nThreads = rnd.nextInt(2, 7);
-        final boolean timed = rnd.nextBoolean();
         final ExecutorService pool = Executors.newFixedThreadPool(nThreads);
         final AtomicLong count = new AtomicLong(0);
         class Task implements Callable<Long> {
@@ -136,17 +141,15 @@ public Long call() throws Exception {
         }
     }
 
-    static void testInvokeAny() throws Throwable {
+    static void testInvokeAny(int nThreads, boolean timed) throws Throwable {
         final ThreadLocalRandom rnd = ThreadLocalRandom.current();
-        final boolean timed = rnd.nextBoolean();
-        final ExecutorService pool = Executors.newSingleThreadExecutor();
+        final ExecutorService pool = Executors.newFixedThreadPool(nThreads);
         final AtomicLong count = new AtomicLong(0);
         final CountDownLatch invokeAnyDone = new CountDownLatch(1);
         class Task implements Callable<Long> {
             public Long call() throws Exception {
                 long x = count.incrementAndGet();
-                check(x <= 2);
-                if (x == 2) {
+                if (x > 1) {
                     // wait for main thread to interrupt us ...
                     awaitInterrupt(timeoutSeconds);
                     // ... and then for invokeAny to return
@@ -173,12 +176,12 @@ public Long call() throws Exception {
             check(val == 1);
             invokeAnyDone.countDown();
 
-            // inherent race between main thread interrupt and
-            // start of second task
-            check(count.get() == 1 || count.get() == 2);
-
             pool.shutdown();
             check(pool.awaitTermination(timeoutSeconds, SECONDS));
+
+            long c = count.get();
+            check(c >= 1 && c <= tasks.size());
+
         } finally {
             pool.shutdownNow();
         }
@@ -187,18 +190,16 @@ public Long call() throws Exception {
     /**
      * Every remaining running task is sent an interrupt for cancellation.
      */
-    static void testInvokeAny_cancellationInterrupt() throws Throwable {
+    static void testInvokeAny_cancellationInterrupt(int nThreads, boolean timed) throws Throwable {
         final ThreadLocalRandom rnd = ThreadLocalRandom.current();
-        final int nThreads = rnd.nextInt(2, 7);
-        final boolean timed = rnd.nextBoolean();
         final ExecutorService pool = Executors.newFixedThreadPool(nThreads);
         final AtomicLong count = new AtomicLong(0);
         final AtomicLong interruptedCount = new AtomicLong(0);
         final CyclicBarrier allStarted = new CyclicBarrier(nThreads);
         class Task implements Callable<Long> {
             public Long call() throws Exception {
-                allStarted.await();
                 long x = count.incrementAndGet();
+                allStarted.await();
                 if (x > 1)
                     // main thread will interrupt us
                     awaitInterrupt(timeoutSeconds);
diff --git a/test/jdk/java/util/concurrent/tck/ArrayBlockingQueueTest.java b/test/jdk/java/util/concurrent/tck/ArrayBlockingQueueTest.java
index 0a783d7068946..61d1d4f5762ab 100644
--- a/test/jdk/java/util/concurrent/tck/ArrayBlockingQueueTest.java
+++ b/test/jdk/java/util/concurrent/tck/ArrayBlockingQueueTest.java
@@ -715,7 +715,7 @@ void checkToArray(ArrayBlockingQueue<Integer> q) {
             Integer x = (Integer) it.next();
             assertEquals(s + i, (int) x);
             for (Object[] a : as)
-                assertSame(a1[i], x);
+                assertSame(a[i], x);
         }
     }
 
diff --git a/test/jdk/java/util/concurrent/tck/ArrayDequeTest.java b/test/jdk/java/util/concurrent/tck/ArrayDequeTest.java
index 88f70a50d9dd4..0ed9159d2292e 100644
--- a/test/jdk/java/util/concurrent/tck/ArrayDequeTest.java
+++ b/test/jdk/java/util/concurrent/tck/ArrayDequeTest.java
@@ -738,7 +738,7 @@ void checkToArray(ArrayDeque<Integer> q) {
             Integer x = (Integer) it.next();
             assertEquals(s + i, (int) x);
             for (Object[] a : as)
-                assertSame(a1[i], x);
+                assertSame(a[i], x);
         }
     }
 
diff --git a/test/jdk/java/util/concurrent/tck/ArrayListTest.java b/test/jdk/java/util/concurrent/tck/ArrayListTest.java
index 203c04c6ea90e..56ddb49ff0b0c 100644
--- a/test/jdk/java/util/concurrent/tck/ArrayListTest.java
+++ b/test/jdk/java/util/concurrent/tck/ArrayListTest.java
@@ -57,7 +57,7 @@ public List emptyCollection() {
             }
         }
         return newTestSuite(
-                // ArrayListTest.class,
+                ArrayListTest.class,
                 CollectionTest.testSuite(new Implementation()),
                 CollectionTest.testSuite(new SubListImplementation()));
     }
diff --git a/test/jdk/java/util/concurrent/tck/Collection8Test.java b/test/jdk/java/util/concurrent/tck/Collection8Test.java
index 807ff49036733..e90d52bba4675 100644
--- a/test/jdk/java/util/concurrent/tck/Collection8Test.java
+++ b/test/jdk/java/util/concurrent/tck/Collection8Test.java
@@ -440,7 +440,6 @@ public void testRandomElementRemovalDuringTraversal() {
             if (rnd.nextBoolean()) assertTrue(it.hasNext());
             it.next();
         }
-        Consumer alwaysThrows = e -> { throw new AssertionError(); };
         // TODO: many more removal methods
         if (rnd.nextBoolean()) {
             for (Iterator z = c.iterator(); z.hasNext(); ) {
@@ -661,7 +660,6 @@ public void testRemoveAfterForEachRemaining() {
      */
     public void testStreamForEach() throws Throwable {
         final Collection c = impl.emptyCollection();
-        final AtomicLong count = new AtomicLong(0L);
         final Object x = impl.makeElement(1);
         final Object y = impl.makeElement(2);
         final ArrayList found = new ArrayList();
@@ -719,7 +717,6 @@ public void testStreamForEachConcurrentStressTest() throws Throwable {
      */
     public void testForEach() throws Throwable {
         final Collection c = impl.emptyCollection();
-        final AtomicLong count = new AtomicLong(0L);
         final Object x = impl.makeElement(1);
         final Object y = impl.makeElement(2);
         final ArrayList found = new ArrayList();
diff --git a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
index 2f940855e63dd..7b03ecd5d216a 100644
--- a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
+++ b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
@@ -3778,16 +3778,6 @@ public void testFailedFuture() {
         checkCompletedExceptionally(f, ex);
     }
 
-    /**
-     * failedFuture(null) throws NPE
-     */
-    public void testFailedFuture_null() {
-        try {
-            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
     /**
      * copy returns a CompletableFuture that is completed normally,
      * with the same value, when source is.
@@ -4217,12 +4207,9 @@ public void testMinimalCompletionStage_minimality() {
             // Manufacture boxed primitives for primitive params
             for (int i = 0; i < args.length; i++) {
                 Class<?> type = parameterTypes[i];
-                if (parameterTypes[i] == boolean.class)
-                    args[i] = false;
-                else if (parameterTypes[i] == int.class)
-                    args[i] = 0;
-                else if (parameterTypes[i] == long.class)
-                    args[i] = 0L;
+                if      (type == boolean.class) args[i] = false;
+                else if (type == int.class)     args[i] = 0;
+                else if (type == long.class)    args[i] = 0L;
             }
             for (CompletionStage<Integer> stage : stages) {
                 try {
diff --git a/test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java
index e193c92392182..e6861c077c87e 100644
--- a/test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java
+++ b/test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java
@@ -1010,7 +1010,6 @@ public void testBug8188900_reverse() {
      * ant -Djsr166.expensiveTests=true -Djsr166.tckTestClass=ConcurrentLinkedDequeTest -Djsr166.methodFilter=testBug8189387 tck
      */
     public void testBug8189387() {
-        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
         Object x = new Object();
         for (int n = expensiveTests ? 100_000 : 10; n--> 0; ) {
             ConcurrentLinkedDeque<Object> d = new ConcurrentLinkedDeque<>();
diff --git a/test/jdk/java/util/concurrent/tck/ExecutorsTest.java b/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
index faf72c729296c..a2e9f1ba36cb8 100644
--- a/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
+++ b/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
@@ -90,7 +90,7 @@ public void testNewCachedThreadPool2() {
      */
     public void testNewCachedThreadPool3() {
         try {
-            ExecutorService e = Executors.newCachedThreadPool(null);
+            ExecutorService unused = Executors.newCachedThreadPool(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -124,7 +124,7 @@ public void testNewSingleThreadExecutor2() {
      */
     public void testNewSingleThreadExecutor3() {
         try {
-            ExecutorService e = Executors.newSingleThreadExecutor(null);
+            ExecutorService unused = Executors.newSingleThreadExecutor(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -172,7 +172,7 @@ public void testNewFixedThreadPool2() {
      */
     public void testNewFixedThreadPool3() {
         try {
-            ExecutorService e = Executors.newFixedThreadPool(2, null);
+            ExecutorService unused = Executors.newFixedThreadPool(2, null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -182,7 +182,7 @@ public void testNewFixedThreadPool3() {
      */
     public void testNewFixedThreadPool4() {
         try {
-            ExecutorService e = Executors.newFixedThreadPool(0);
+            ExecutorService unused = Executors.newFixedThreadPool(0);
             shouldThrow();
         } catch (IllegalArgumentException success) {}
     }
@@ -204,7 +204,8 @@ public void testUnconfigurableExecutorService() {
      */
     public void testUnconfigurableExecutorServiceNPE() {
         try {
-            ExecutorService e = Executors.unconfigurableExecutorService(null);
+            ExecutorService unused =
+                Executors.unconfigurableExecutorService(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -214,7 +215,8 @@ public void testUnconfigurableExecutorServiceNPE() {
      */
     public void testUnconfigurableScheduledExecutorServiceNPE() {
         try {
-            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
+            ExecutorService unused =
+                Executors.unconfigurableScheduledExecutorService(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -304,9 +306,11 @@ public void testTimedCallable() throws Exception {
             Executors.newScheduledThreadPool(2),
         };
 
-        final Runnable sleeper = new CheckedInterruptedRunnable() {
+        final CountDownLatch done = new CountDownLatch(1);
+
+        final Runnable sleeper = new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                delay(LONG_DELAY_MS);
+                done.await(LONG_DELAY_MS, MILLISECONDS);
             }};
 
         List<Thread> threads = new ArrayList<>();
@@ -319,6 +323,7 @@ public void realRun() {
         }
         for (Thread thread : threads)
             awaitTermination(thread);
+        done.countDown();
         for (ExecutorService executor : executors)
             joinPool(executor);
     }
@@ -578,7 +583,7 @@ public void testCallable4() throws Exception {
      */
     public void testCallableNPE1() {
         try {
-            Callable c = Executors.callable((Runnable) null);
+            Callable unused = Executors.callable((Runnable) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -588,7 +593,7 @@ public void testCallableNPE1() {
      */
     public void testCallableNPE2() {
         try {
-            Callable c = Executors.callable((Runnable) null, one);
+            Callable unused = Executors.callable((Runnable) null, one);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -598,7 +603,7 @@ public void testCallableNPE2() {
      */
     public void testCallableNPE3() {
         try {
-            Callable c = Executors.callable((PrivilegedAction) null);
+            Callable unused = Executors.callable((PrivilegedAction) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -608,7 +613,7 @@ public void testCallableNPE3() {
      */
     public void testCallableNPE4() {
         try {
-            Callable c = Executors.callable((PrivilegedExceptionAction) null);
+            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java b/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
index 56ffd3c4a7bfd..09d93a8eecc06 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
@@ -375,7 +375,7 @@ public void testSubmitAfterShutdown() {
             p.shutdown();
             assertTrue(p.isShutdown());
             try {
-                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
+                ForkJoinTask<Integer> unused = p.submit(new FibTask(8));
                 shouldThrow();
             } catch (RejectedExecutionException success) {}
         }
@@ -563,7 +563,7 @@ public void testExecuteNullRunnable() {
         ExecutorService e = new ForkJoinPool(1);
         try (PoolCleaner cleaner = cleaner(e)) {
             try {
-                Future<?> future = e.submit((Runnable) null);
+                Future<?> unused = e.submit((Runnable) null);
                 shouldThrow();
             } catch (NullPointerException success) {}
         }
@@ -576,7 +576,7 @@ public void testSubmitNullCallable() {
         ExecutorService e = new ForkJoinPool(1);
         try (PoolCleaner cleaner = cleaner(e)) {
             try {
-                Future<String> future = e.submit((Callable) null);
+                Future<String> unused = e.submit((Callable) null);
                 shouldThrow();
             } catch (NullPointerException success) {}
         }
diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index f10204afa5861..ba7b6df82df16 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -1227,8 +1227,9 @@ void assertFutureTimesOut(Future future, long timeoutMillis) {
         } catch (TimeoutException success) {
         } catch (Exception fail) {
             threadUnexpectedException(fail);
-        } finally { future.cancel(true); }
+        }
         assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
+        assertFalse(future.isDone());
     }
 
     /**
diff --git a/test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java b/test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java
index d6dae5ed3455e..0eb2380be0623 100644
--- a/test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java
+++ b/test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java
@@ -408,7 +408,7 @@ public Integer realCompute() {
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.join();
+                    f.join();
                     shouldThrow();
                 } catch (FJException success) {
                     checkCompletedAbnormally(f, success);
@@ -427,7 +427,7 @@ public Integer realCompute() throws Exception {
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get();
+                    f.get();
                     shouldThrow();
                 } catch (ExecutionException success) {
                     Throwable cause = success.getCause();
@@ -448,7 +448,7 @@ public Integer realCompute() throws Exception {
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (ExecutionException success) {
                     Throwable cause = success.getCause();
@@ -485,7 +485,7 @@ public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertTrue(f.cancel(true));
                 try {
-                    Integer r = f.invoke();
+                    f.invoke();
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -505,7 +505,7 @@ public Integer realCompute() {
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.join();
+                    f.join();
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -525,7 +525,7 @@ public Integer realCompute() throws Exception {
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get();
+                    f.get();
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -545,7 +545,7 @@ public Integer realCompute() throws Exception {
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -689,7 +689,7 @@ public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 f.completeExceptionally(new FJException());
                 try {
-                    Integer r = f.invoke();
+                    f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
                     checkCompletedAbnormally(f, success);
diff --git a/test/jdk/java/util/concurrent/tck/SplittableRandomTest.java b/test/jdk/java/util/concurrent/tck/SplittableRandomTest.java
index f9544c9c9039b..38f4fecefc11b 100644
--- a/test/jdk/java/util/concurrent/tck/SplittableRandomTest.java
+++ b/test/jdk/java/util/concurrent/tck/SplittableRandomTest.java
@@ -39,6 +39,9 @@
 import java.lang.reflect.Method;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.DoubleStream;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -357,12 +360,12 @@ public void testBadStreamSize() {
         SplittableRandom r = new SplittableRandom();
         assertThrows(
             IllegalArgumentException.class,
-            () -> { java.util.stream.IntStream x = r.ints(-1L); },
-            () -> { java.util.stream.IntStream x = r.ints(-1L, 2, 3); },
-            () -> { java.util.stream.LongStream x = r.longs(-1L); },
-            () -> { java.util.stream.LongStream x = r.longs(-1L, -1L, 1L); },
-            () -> { java.util.stream.DoubleStream x = r.doubles(-1L); },
-            () -> { java.util.stream.DoubleStream x = r.doubles(-1L, .5, .6); });
+            () -> { IntStream unused = r.ints(-1L); },
+            () -> { IntStream unused = r.ints(-1L, 2, 3); },
+            () -> { LongStream unused = r.longs(-1L); },
+            () -> { LongStream unused = r.longs(-1L, -1L, 1L); },
+            () -> { DoubleStream unused = r.doubles(-1L); },
+            () -> { DoubleStream unused = r.doubles(-1L, .5, .6); });
     }
 
     /**
@@ -373,12 +376,12 @@ public void testBadStreamBounds() {
         SplittableRandom r = new SplittableRandom();
         assertThrows(
             IllegalArgumentException.class,
-            () -> { java.util.stream.IntStream x = r.ints(2, 1); },
-            () -> { java.util.stream.IntStream x = r.ints(10, 42, 42); },
-            () -> { java.util.stream.LongStream x = r.longs(-1L, -1L); },
-            () -> { java.util.stream.LongStream x = r.longs(10, 1L, -2L); },
-            () -> { java.util.stream.DoubleStream x = r.doubles(0.0, 0.0); },
-            () -> { java.util.stream.DoubleStream x = r.doubles(10, .5, .4); });
+            () -> { IntStream unused = r.ints(2, 1); },
+            () -> { IntStream unused = r.ints(10, 42, 42); },
+            () -> { LongStream unused = r.longs(-1L, -1L); },
+            () -> { LongStream unused = r.longs(10, 1L, -2L); },
+            () -> { DoubleStream unused = r.doubles(0.0, 0.0); },
+            () -> { DoubleStream unused = r.doubles(10, .5, .4); });
     }
 
     /**
diff --git a/test/jdk/java/util/concurrent/tck/StampedLockTest.java b/test/jdk/java/util/concurrent/tck/StampedLockTest.java
index a1ef302d9980e..3ed481122f824 100644
--- a/test/jdk/java/util/concurrent/tck/StampedLockTest.java
+++ b/test/jdk/java/util/concurrent/tck/StampedLockTest.java
@@ -370,7 +370,7 @@ public void realRun() throws Throwable {
      */
     public void testInterruptibleOperationsThrowInterruptedExceptionWriteLockedInterrupted() {
         final StampedLock lock = new StampedLock();
-        long s = lock.writeLock();
+        long stamp = lock.writeLock();
 
         Action[] interruptibleLockBlockingActions = {
             () -> lock.writeLockInterruptibly(),
@@ -385,6 +385,8 @@ public void testInterruptibleOperationsThrowInterruptedExceptionWriteLockedInter
         shuffle(interruptibleLockBlockingActions);
 
         assertThrowInterruptedExceptionWhenInterrupted(interruptibleLockBlockingActions);
+
+        releaseWriteLock(lock, stamp);
     }
 
     /**
@@ -392,7 +394,7 @@ public void testInterruptibleOperationsThrowInterruptedExceptionWriteLockedInter
      */
     public void testInterruptibleOperationsThrowInterruptedExceptionReadLockedInterrupted() {
         final StampedLock lock = new StampedLock();
-        long s = lock.readLock();
+        long stamp = lock.readLock();
 
         Action[] interruptibleLockBlockingActions = {
             () -> lock.writeLockInterruptibly(),
@@ -403,6 +405,8 @@ public void testInterruptibleOperationsThrowInterruptedExceptionReadLockedInterr
         shuffle(interruptibleLockBlockingActions);
 
         assertThrowInterruptedExceptionWhenInterrupted(interruptibleLockBlockingActions);
+
+        releaseReadLock(lock, stamp);
     }
 
     /**
@@ -726,6 +730,7 @@ public void testToString() {
         lock.unlockWrite(s);
         s = lock.readLock();
         assertTrue(lock.toString().contains("Read-locks"));
+        releaseReadLock(lock, s);
     }
 
     /**
diff --git a/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java b/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java
index 2f153ee5d6b57..aceafeb155f82 100644
--- a/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java
+++ b/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java
@@ -985,7 +985,7 @@ public void testConsume() {
     public void testConsumeNPE() {
         SubmissionPublisher<Integer> p = basicPublisher();
         try {
-            CompletableFuture<Void> f = p.consume(null);
+            CompletableFuture<Void> unused = p.consume(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
diff --git a/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java b/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java
index 00f66a2995074..4a1d7cbd33cc6 100644
--- a/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java
+++ b/test/jdk/java/util/concurrent/tck/SynchronousQueueTest.java
@@ -464,7 +464,7 @@ public void testToArray2(boolean fair) {
     public void testToArray_null(boolean fair) {
         final SynchronousQueue q = new SynchronousQueue(fair);
         try {
-            Object[] o = q.toArray((Object[])null);
+            Object[] unused = q.toArray((Object[])null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
diff --git a/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java b/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java
index 0100cf3c8ca1f..3159dfbaa4a0e 100644
--- a/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java
+++ b/test/jdk/java/util/concurrent/tck/ThreadLocalRandomTest.java
@@ -384,27 +384,24 @@ public void testDifferentSequences() {
             new AtomicReference<>();
         final AtomicLong rand = new AtomicLong();
 
-        long firstRand = 0;
-        ThreadLocalRandom firstThreadLocalRandom = null;
-
         Runnable getRandomState = new CheckedRunnable() {
             public void realRun() {
                 ThreadLocalRandom current = ThreadLocalRandom.current();
                 assertSame(current, ThreadLocalRandom.current());
-                // test bug: the following is not guaranteed and not true in JDK8
-                //                assertNotSame(current, threadLocalRandom.get());
                 rand.set(current.nextLong());
                 threadLocalRandom.set(current);
             }};
 
-        Thread first = newStartedThread(getRandomState);
-        awaitTermination(first);
-        firstRand = rand.get();
-        firstThreadLocalRandom = threadLocalRandom.get();
+        awaitTermination(newStartedThread(getRandomState));
+        long firstRand = rand.get();
+        ThreadLocalRandom firstThreadLocalRandom = threadLocalRandom.get();
+        assertNotNull(firstThreadLocalRandom);
 
         for (int i = 0; i < NCALLS; i++) {
-            Thread t = newStartedThread(getRandomState);
-            awaitTermination(t);
+            awaitTermination(newStartedThread(getRandomState));
+            if (testImplementationDetails)
+                // ThreadLocalRandom has been a singleton since jdk8.
+                assertSame(firstThreadLocalRandom, threadLocalRandom.get());
             if (firstRand != rand.get())
                 return;
         }

From 81db63e8d74c0d85cdadb0a70580a33c79d0bb80 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Sun, 10 Jan 2021 04:36:12 +0000
Subject: [PATCH 093/129] 8259517: Incorrect test path in test cases

Reviewed-by: weijun
---
 test/jdk/javax/net/ssl/SSLEngine/ArgCheck.java          | 6 +++---
 test/jdk/javax/net/ssl/SSLEngine/Basics.java            | 4 ++--
 test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/jdk/javax/net/ssl/SSLEngine/ArgCheck.java b/test/jdk/javax/net/ssl/SSLEngine/ArgCheck.java
index 3b94c6e29929d..4781d15972b76 100644
--- a/test/jdk/javax/net/ssl/SSLEngine/ArgCheck.java
+++ b/test/jdk/javax/net/ssl/SSLEngine/ArgCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,7 +152,7 @@ private static void trySmallBufs(SSLEngine ssle,
 
         // For unwrap(), the BUFFER_OVERFLOW will not be generated
         // until received SSL/TLS application data.
-        // Test test/javax/net/ssl/NewAPIs/SSLEngine/LargePacket will check
+        // Test test/jdk/javax/net/ssl/SSLEngine/LargePacket.java will check
         // BUFFER_OVERFLOW/UNDERFLOW for both wrap() and unwrap().
         //
         //res = ssle.unwrap(netBB, smallAppBB);
@@ -172,7 +172,7 @@ private static void trySmallBufsArray(SSLEngine ssle,
 
         // For unwrap(), the BUFFER_OVERFLOW will not be generated
         // until received SSL/TLS application data.
-        // Test test/javax/net/ssl/NewAPIs/SSLEngine/LargePacket will check
+        // Test test/jdk/javax/net/ssl/SSLEngine/LargePacket.java will check
         // BUFFER_OVERFLOW/UNDERFLOW for both wrap() and unwrap().
         //
         //res = ssle.unwrap(netBB, smallAppBB, 0, appBB.length);
diff --git a/test/jdk/javax/net/ssl/SSLEngine/Basics.java b/test/jdk/javax/net/ssl/SSLEngine/Basics.java
index 8c17e735c555d..6e38c884e06ab 100644
--- a/test/jdk/javax/net/ssl/SSLEngine/Basics.java
+++ b/test/jdk/javax/net/ssl/SSLEngine/Basics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,7 +177,7 @@ public static void main(String args[]) throws Exception {
 
         // For unwrap(), the BUFFER_OVERFLOW will not be generated
         // until received SSL/TLS application data.
-        // Test test/javax/net/ssl/NewAPIs/SSLEngine/LargePacket will check
+        // Test test/jdk/javax/net/ssl/SSLEngine/LargePacket.java will check
         // BUFFER_OVERFLOW/UNDERFLOW for both wrap() and unwrap().
         //
         //if (ssle.unwrap(smallBB, smallBB).getStatus() !=
diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index c1ec829b8237d..7b72d42849dc6 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,8 @@
  * Template to help speed your client/server tests.
  *
  * Two examples that use this template:
- *    test/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
- *    test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java
+ * test/jdk/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
+ * test/jdk/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java
  */
 public class SSLSocketTemplate {
 

From 65ca5c6656a36b47be9e5274f70e55f757d3c980 Mon Sep 17 00:00:00 2001
From: Tejpal Rebari <trebari@openjdk.org>
Date: Sun, 10 Jan 2021 12:38:10 +0000
Subject: [PATCH 094/129] 8048109: JToggleButton does not fire actionPerformed
 under certain conditions

Reviewed-by: serb, psadhukhan, vdyakov
---
 .../java/swing/plaf/gtk/GTKLookAndFeel.java   |   2 +-
 .../swing/plaf/motif/MotifLookAndFeel.java    |   2 +-
 .../classes/javax/swing/plaf/nimbus/skin.laf  |   2 +-
 .../plaf/windows/WindowsLookAndFeel.java      |   2 +-
 .../JPopupMenu/SetInvokerJPopupMenuTest.java  | 165 ++++++++++++++++++
 5 files changed, 169 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/javax/swing/JPopupMenu/SetInvokerJPopupMenuTest.java

diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 27f3ce4b67cc9..ca53eabd5e325 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -803,7 +803,7 @@ public Object createValue(UIDefaults table) {
             "PasswordField.font", new FontLazyValue(Region.PASSWORD_FIELD),
 
 
-            "PopupMenu.consumeEventOnClose", Boolean.TRUE,
+            "PopupMenu.consumeEventOnClose", Boolean.FALSE,
             "PopupMenu.selectedWindowInputMapBindings", new Object[] {
                   "ESCAPE", "cancel",
                     "DOWN", "selectNext",
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
index d4993c11eb989..3ddd144be7892 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
@@ -678,7 +678,7 @@ public Object createValue(UIDefaults table) {
             "PopupMenu.border", popupMenuBorder,
             "PopupMenu.foreground", table.get("menuText"),
             "PopupMenu.font", dialogPlain12,
-            "PopupMenu.consumeEventOnClose", Boolean.TRUE,
+            "PopupMenu.consumeEventOnClose", Boolean.FALSE,
 
             "Label.font", dialogPlain12,
             "Label.background", table.get("control"),
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
index a3766bdba75b0..e2157810990b2 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
@@ -15193,7 +15193,7 @@
             <maxHozCachedImgScaling>INF</maxHozCachedImgScaling>
             <maxVertCachedImgScaling>INF</maxVertCachedImgScaling>
             <uiproperties>
-               <uiProperty name="consumeEventOnClose" type="BOOLEAN" value="true"/>
+               <uiProperty name="consumeEventOnClose" type="BOOLEAN" value="false"/>
             </uiproperties>
          </style>
          <backgroundStates>
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index 91a5732fc9e72..225cfce10384c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -958,7 +958,7 @@ protected void initComponentDefaults(UIDefaults table)
             "PopupMenu.background", MenuBackgroundColor,
             "PopupMenu.foreground", MenuTextColor,
             "PopupMenu.popupSound", "win.sound.menuPopup",
-            "PopupMenu.consumeEventOnClose", Boolean.TRUE,
+            "PopupMenu.consumeEventOnClose", Boolean.FALSE,
 
             // Menus
             "Menu.font", MenuFont,
diff --git a/test/jdk/javax/swing/JPopupMenu/SetInvokerJPopupMenuTest.java b/test/jdk/javax/swing/JPopupMenu/SetInvokerJPopupMenuTest.java
new file mode 100644
index 0000000000000..d8617ddca1572
--- /dev/null
+++ b/test/jdk/javax/swing/JPopupMenu/SetInvokerJPopupMenuTest.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import java.awt.Container;
+import java.awt.FlowLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.io.StringWriter;
+import java.io.PrintWriter;
+
+/**
+ *  @test
+ *  @bug 8048109
+ *  @summary JToggleButton does not fire actionPerformed under certain
+ *  conditions
+ *  @key headful
+ *  @run main SetInvokerJPopupMenuTest
+ */
+
+public class SetInvokerJPopupMenuTest {
+
+    private static MyPopupMenu popup;
+    private static MyButton jtb ;
+    private static Robot robot;
+    private static JFrame f;
+    private static Point p;
+    private static boolean isPopupVisible;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.LookAndFeelInfo[] installedLookAndFeels;
+        installedLookAndFeels = UIManager.getInstalledLookAndFeels();
+
+        for(UIManager.LookAndFeelInfo LF : installedLookAndFeels) {
+            try {
+                robot = new Robot();
+                UIManager.setLookAndFeel(LF.getClassName());
+                SwingUtilities.invokeAndWait(() -> {
+                    jtb = new MyButton("Press Me");
+                    jtb.addActionListener(new ActionListener( ) {
+                        @Override
+                        public void actionPerformed(ActionEvent ev) {
+                            if (!popup.isVisible()) {
+                                postUp();
+                            }
+                            else {
+                                postDown();
+                            }
+                        }
+                    });
+
+                    f = new JFrame( );
+                    f.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+                    f.setLocationRelativeTo(null);
+                    f.setSize(300, 400);
+                    Container c = f.getContentPane( );
+                    c.setLayout(new FlowLayout( ));
+                    c.add(jtb);
+                    f.setVisible(true);
+                    popup = new MyPopupMenu();
+                    popup.add(new JMenuItem("A"));
+                    popup.add(new JMenuItem("B"));
+                    popup.add(new JMenuItem("C"));
+                    popup.setVisible(false);
+                    p = jtb.getLocationOnScreen();
+                });
+
+                robot.waitForIdle();
+                robot.setAutoDelay(50);
+                robot.mouseMove(p.x + 15, p.y + 15);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+                robot.waitForIdle();
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            } catch (UnsupportedLookAndFeelException e) {
+                System.out.println("Note: LookAndFeel " + LF.getClassName()
+                        + " is not supported on this configuration");
+            } finally {
+                if (f != null) {
+                    SwingUtilities.invokeAndWait(() -> f.dispose());
+                }
+            }
+
+            SwingUtilities.invokeAndWait(() -> {
+                isPopupVisible = popup.isVisible();
+            });
+
+            if (isPopupVisible) {
+                throw new RuntimeException("PopupMenu is not taken down after"+
+                        " single button click");
+            }
+        }
+    }
+
+    public static void postUp() {
+        popup.setInvoker(jtb);
+        popup.setVisible(true);
+    }
+
+    public static void postDown() {
+        popup.setVisible(false);
+    }
+
+    private static class MyButton extends JButton {
+        public MyButton(String string) {
+            super (string);
+        }
+        @Override
+        protected void processMouseEvent(MouseEvent e) {
+            super.processMouseEvent(e);
+        }
+    }
+
+    private static class MyPopupMenu extends JPopupMenu {
+        @Override
+        public void setVisible( boolean state ) {
+            if( !state ) {
+                Exception ex = new Exception();
+                StringWriter stringWriter = new StringWriter();
+                PrintWriter printWriter = new PrintWriter( stringWriter );
+                ex.printStackTrace( printWriter );
+                String traceString = stringWriter.getBuffer().toString();
+                if( traceString.lastIndexOf( "windowDeactivated" ) > 0
+                        || traceString.lastIndexOf( "menuSelectionChanged" )
+                        > 0 ) {
+                    return;
+                }
+            }
+            super.setVisible(state);
+        }
+    }
+}

From 11d5b047913d95f28fe876a52d38fdab4e4e8153 Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Sun, 10 Jan 2021 18:20:16 +0000
Subject: [PATCH 095/129] 8258217: PriorityBlockingQueue constructor spec and
 behavior mismatch

Reviewed-by: dl
---
 .../classes/java/util/concurrent/PriorityBlockingQueue.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
index 908a59de469a8..fdb0128b7a755 100644
--- a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
@@ -226,7 +226,7 @@ public PriorityBlockingQueue(int initialCapacity,
     /**
      * Creates a {@code PriorityBlockingQueue} containing the elements
      * in the specified collection.  If the specified collection is a
-     * {@link SortedSet} or a {@link PriorityQueue}, this
+     * {@link SortedSet} or a {@link PriorityBlockingQueue}, this
      * priority queue will be ordered according to the same ordering.
      * Otherwise, this priority queue will be ordered according to the
      * {@linkplain Comparable natural ordering} of its elements.

From e7c174083a3df8711568fadf77ad513c7a582443 Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Sun, 10 Jan 2021 18:38:00 +0000
Subject: [PATCH 096/129] 8258187: IllegalMonitorStateException in
 ArrayBlockingQueue

Reviewed-by: dl
---
 .../locks/AbstractQueuedLongSynchronizer.java | 19 +++++++++++++++----
 .../locks/AbstractQueuedSynchronizer.java     | 19 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index 3e30fb0dbc5c8..c50621090bb51 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -40,6 +40,7 @@
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.RejectedExecutionException;
 import jdk.internal.misc.Unsafe;
 
 /**
@@ -1197,13 +1198,18 @@ public final void awaitUninterruptibly() {
             ConditionNode node = new ConditionNode();
             long savedState = enableWait(node);
             LockSupport.setCurrentBlocker(this); // for back-compatibility
-            boolean interrupted = false;
+            boolean interrupted = false, rejected = false;
             while (!canReacquire(node)) {
                 if (Thread.interrupted())
                     interrupted = true;
                 else if ((node.status & COND) != 0) {
                     try {
-                        ForkJoinPool.managedBlock(node);
+                        if (rejected)
+                            node.block();
+                        else
+                            ForkJoinPool.managedBlock(node);
+                    } catch (RejectedExecutionException ex) {
+                        rejected = true;
                     } catch (InterruptedException ie) {
                         interrupted = true;
                     }
@@ -1236,14 +1242,19 @@ public final void await() throws InterruptedException {
             ConditionNode node = new ConditionNode();
             long savedState = enableWait(node);
             LockSupport.setCurrentBlocker(this); // for back-compatibility
-            boolean interrupted = false, cancelled = false;
+            boolean interrupted = false, cancelled = false, rejected = false;
             while (!canReacquire(node)) {
                 if (interrupted |= Thread.interrupted()) {
                     if (cancelled = (node.getAndUnsetStatus(COND) & COND) != 0)
                         break;              // else interrupted after signal
                 } else if ((node.status & COND) != 0) {
                     try {
-                        ForkJoinPool.managedBlock(node);
+                        if (rejected)
+                            node.block();
+                        else
+                            ForkJoinPool.managedBlock(node);
+                    } catch (RejectedExecutionException ex) {
+                        rejected = true;
                     } catch (InterruptedException ie) {
                         interrupted = true;
                     }
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index 73e04fc90281d..921150f58ca76 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
@@ -40,6 +40,7 @@
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.RejectedExecutionException;
 import jdk.internal.misc.Unsafe;
 
 /**
@@ -1565,13 +1566,18 @@ public final void awaitUninterruptibly() {
             ConditionNode node = new ConditionNode();
             int savedState = enableWait(node);
             LockSupport.setCurrentBlocker(this); // for back-compatibility
-            boolean interrupted = false;
+            boolean interrupted = false, rejected = false;
             while (!canReacquire(node)) {
                 if (Thread.interrupted())
                     interrupted = true;
                 else if ((node.status & COND) != 0) {
                     try {
-                        ForkJoinPool.managedBlock(node);
+                        if (rejected)
+                            node.block();
+                        else
+                            ForkJoinPool.managedBlock(node);
+                    } catch (RejectedExecutionException ex) {
+                        rejected = true;
                     } catch (InterruptedException ie) {
                         interrupted = true;
                     }
@@ -1604,14 +1610,19 @@ public final void await() throws InterruptedException {
             ConditionNode node = new ConditionNode();
             int savedState = enableWait(node);
             LockSupport.setCurrentBlocker(this); // for back-compatibility
-            boolean interrupted = false, cancelled = false;
+            boolean interrupted = false, cancelled = false, rejected = false;
             while (!canReacquire(node)) {
                 if (interrupted |= Thread.interrupted()) {
                     if (cancelled = (node.getAndUnsetStatus(COND) & COND) != 0)
                         break;              // else interrupted after signal
                 } else if ((node.status & COND) != 0) {
                     try {
-                        ForkJoinPool.managedBlock(node);
+                        if (rejected)
+                            node.block();
+                        else
+                            ForkJoinPool.managedBlock(node);
+                    } catch (RejectedExecutionException ex) {
+                        rejected = true;
                     } catch (InterruptedException ie) {
                         interrupted = true;
                     }

From 9154f643497f509407b02613253969154118bf9a Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Sun, 10 Jan 2021 23:47:04 +0000
Subject: [PATCH 097/129] 8254973: CompletableFuture.ThreadPerTaskExecutor does
 not throw NPE in #execute

Reviewed-by: dl
---
 .../classes/java/util/concurrent/CompletableFuture.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
index fbb34e84756d0..03e1b68d3a563 100644
--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
@@ -43,6 +43,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.Objects;
 
 /**
  * A {@link Future} that may be explicitly completed (setting its
@@ -438,7 +439,10 @@ public static interface AsynchronousCompletionTask {
 
     /** Fallback if ForkJoinPool.commonPool() cannot support parallelism */
     static final class ThreadPerTaskExecutor implements Executor {
-        public void execute(Runnable r) { new Thread(r).start(); }
+        public void execute(Runnable r) {
+            Objects.requireNonNull(r);
+            new Thread(r).start();
+        }
     }
 
     /**

From b72de3c5fc99f365e9fb25114ddd28eceddfa6e8 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Mon, 11 Jan 2021 00:33:22 +0000
Subject: [PATCH 098/129] 8259385: Cleanup unused assignment

Reviewed-by: attila
---
 .../sun/security/ssl/CertStatusExtension.java |  2 +-
 .../sun/security/ssl/CertificateStatus.java   | 44 +++++++++----------
 .../sun/security/ssl/CertificateVerify.java   | 30 ++++++-------
 .../sun/security/ssl/DHServerKeyExchange.java |  6 +--
 .../sun/security/ssl/DTLSInputRecord.java     |  2 +-
 .../security/ssl/ECDHClientKeyExchange.java   |  2 -
 .../security/ssl/ECDHServerKeyExchange.java   |  6 +--
 .../classes/sun/security/ssl/Finished.java    |  2 +-
 .../sun/security/ssl/OutputRecord.java        |  2 +-
 .../sun/security/ssl/RSAKeyExchange.java      |  4 +-
 .../security/ssl/RSAServerKeyExchange.java    |  4 +-
 .../classes/sun/security/ssl/SSLCipher.java   | 10 ++---
 .../sun/security/ssl/SSLContextImpl.java      |  8 ++--
 .../security/ssl/SSLEngineInputRecord.java    |  5 +--
 .../sun/security/ssl/SSLSessionImpl.java      |  6 +--
 .../security/ssl/SSLSocketInputRecord.java    |  4 +-
 .../sun/security/ssl/SSLTransport.java        |  4 +-
 .../security/ssl/X509TrustManagerImpl.java    |  8 ++--
 18 files changed, 70 insertions(+), 79 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
index 7919ff18d8af4..680c2a2a369fc 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
@@ -1103,7 +1103,7 @@ private CTCertStatusResponseProducer() {
         public byte[] produce(ConnectionContext context,
                 HandshakeMessage message) throws IOException {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
-            byte[] producedData = null;
+            byte[] producedData;
 
             // Stapling needs to be active and have valid data to proceed
             if (shc.stapleParams == null) {
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
index da8f88adc4991..c426c48efda0f 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,8 +85,8 @@ final class CertificateStatus {
     static final class CertificateStatusMessage extends HandshakeMessage {
 
         final CertStatusRequestType statusType;
-        int encodedResponsesLen = 0;
-        int messageLength = -1;
+        final int encodedResponsesLen;
+        final int messageLength;
         final List<byte[]> encodedResponses = new ArrayList<>();
 
         CertificateStatusMessage(HandshakeContext handshakeContext) {
@@ -114,6 +114,7 @@ static final class CertificateStatusMessage extends HandshakeMessage {
             // Walk the certificate list and add the correct encoded responses
             // to the encoded responses list
             statusType = stapleParams.statReqType;
+            int encodedLen = 0;
             if (statusType == CertStatusRequestType.OCSP) {
                 // Just worry about the first cert in the chain
                 byte[] resp = stapleParams.responseMap.get(certChain[0]);
@@ -124,7 +125,7 @@ static final class CertificateStatusMessage extends HandshakeMessage {
                     resp = new byte[0];
                 }
                 encodedResponses.add(resp);
-                encodedResponsesLen += resp.length + 3;
+                encodedLen += resp.length + 3;
             } else if (statusType == CertStatusRequestType.OCSP_MULTI) {
                 for (X509Certificate cert : certChain) {
                     byte[] resp = stapleParams.responseMap.get(cert);
@@ -132,14 +133,15 @@ static final class CertificateStatusMessage extends HandshakeMessage {
                         resp = new byte[0];
                     }
                     encodedResponses.add(resp);
-                    encodedResponsesLen += resp.length + 3;
+                    encodedLen += resp.length + 3;
                 }
             } else {
                 throw new IllegalArgumentException(
                         "Unsupported StatusResponseType: " + statusType);
             }
 
-            messageLength = messageLength();
+            encodedResponsesLen = encodedLen;
+            messageLength = messageLength(statusType, encodedResponsesLen);
         }
 
         CertificateStatusMessage(HandshakeContext handshakeContext,
@@ -182,7 +184,18 @@ static final class CertificateStatusMessage extends HandshakeMessage {
                         Alert.HANDSHAKE_FAILURE,
                         "Unsupported StatusResponseType: " + statusType);
             }
-            messageLength = messageLength();
+            messageLength = messageLength(statusType, encodedResponsesLen);
+        }
+
+        private static int messageLength(
+                CertStatusRequestType statusType, int encodedResponsesLen) {
+            if (statusType == CertStatusRequestType.OCSP) {
+                return 1 + encodedResponsesLen;
+            } else if (statusType == CertStatusRequestType.OCSP_MULTI) {
+                return 4 + encodedResponsesLen;
+            }
+
+            return -1;
         }
 
         @Override
@@ -192,17 +205,6 @@ public SSLHandshake handshakeType() {
 
         @Override
         public int messageLength() {
-            int len = 1;
-
-            if (messageLength == -1) {
-                if (statusType == CertStatusRequestType.OCSP) {
-                    len += encodedResponsesLen;
-                } else if (statusType == CertStatusRequestType.OCSP_MULTI) {
-                    len += 3 + encodedResponsesLen;
-                }
-                messageLength = len;
-            }
-
             return messageLength;
         }
 
@@ -214,11 +216,7 @@ public void send(HandshakeOutStream s) throws IOException {
             } else if (statusType == CertStatusRequestType.OCSP_MULTI) {
                 s.putInt24(encodedResponsesLen);
                 for (byte[] respBytes : encodedResponses) {
-                    if (respBytes != null) {
-                        s.putBytes24(respBytes);
-                    } else {
-                        s.putBytes24(null);
-                    }
+                    s.putBytes24(respBytes);
                 }
             } else {
                 // It is highly unlikely that we will fall into this section
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java b/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
index 1aea41525665e..66f651e28aecf 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,7 +74,7 @@ static final class S30CertificateVerifyMessage extends HandshakeMessage {
 
             // This happens in client side only.
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
-            byte[] temproary = null;
+            byte[] temporary;
             String algorithm = x509Possession.popPrivateKey.getAlgorithm();
             try {
                 Signature signer =
@@ -82,7 +82,7 @@ static final class S30CertificateVerifyMessage extends HandshakeMessage {
                 byte[] hashes = chc.handshakeHash.digest(algorithm,
                         chc.handshakeSession.getMasterSecret());
                 signer.update(hashes);
-                temproary = signer.sign();
+                temporary = signer.sign();
             } catch (NoSuchAlgorithmException nsae) {
                 throw chc.conContext.fatal(Alert.INTERNAL_ERROR,
                         "Unsupported signature algorithm (" + algorithm +
@@ -92,7 +92,7 @@ static final class S30CertificateVerifyMessage extends HandshakeMessage {
                         "Cannot produce CertificateVerify signature", gse);
             }
 
-            this.signature = temproary;
+            this.signature = temporary;
         }
 
         S30CertificateVerifyMessage(HandshakeContext context,
@@ -194,7 +194,7 @@ public String toString() {
          */
         private static Signature getSignature(String algorithm,
                 Key key) throws GeneralSecurityException {
-            Signature signer = null;
+            Signature signer;
             switch (algorithm) {
                 case "RSA":
                     signer = Signature.getInstance(JsseJce.SIGNATURE_RAWRSA);
@@ -330,14 +330,14 @@ static final class T10CertificateVerifyMessage extends HandshakeMessage {
 
             // This happens in client side only.
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
-            byte[] temproary = null;
+            byte[] temporary;
             String algorithm = x509Possession.popPrivateKey.getAlgorithm();
             try {
                 Signature signer =
                         getSignature(algorithm, x509Possession.popPrivateKey);
                 byte[] hashes = chc.handshakeHash.digest(algorithm);
                 signer.update(hashes);
-                temproary = signer.sign();
+                temporary = signer.sign();
             } catch (NoSuchAlgorithmException nsae) {
                 throw chc.conContext.fatal(Alert.INTERNAL_ERROR,
                         "Unsupported signature algorithm (" + algorithm +
@@ -347,7 +347,7 @@ static final class T10CertificateVerifyMessage extends HandshakeMessage {
                     "Cannot produce CertificateVerify signature", gse);
             }
 
-            this.signature = temproary;
+            this.signature = temporary;
         }
 
         T10CertificateVerifyMessage(HandshakeContext context,
@@ -448,7 +448,7 @@ public String toString() {
          */
         private static Signature getSignature(String algorithm,
                 Key key) throws GeneralSecurityException {
-            Signature signer = null;
+            Signature signer;
             switch (algorithm) {
                 case "RSA":
                     signer = Signature.getInstance(JsseJce.SIGNATURE_RAWRSA);
@@ -605,17 +605,17 @@ static final class T12CertificateVerifyMessage extends HandshakeMessage {
             }
 
             this.signatureScheme = schemeAndSigner.getKey();
-            byte[] temproary = null;
+            byte[] temporary;
             try {
                 Signature signer = schemeAndSigner.getValue();
                 signer.update(chc.handshakeHash.archived());
-                temproary = signer.sign();
+                temporary = signer.sign();
             } catch (SignatureException ikse) {
                 throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "Cannot produce CertificateVerify signature", ikse);
             }
 
-            this.signature = temproary;
+            this.signature = temporary;
         }
 
         T12CertificateVerifyMessage(HandshakeContext handshakeContext,
@@ -930,17 +930,17 @@ static final class T13CertificateVerifyMessage extends HandshakeMessage {
                         serverSignHead.length, hashValue.length);
             }
 
-            byte[] temproary = null;
+            byte[] temporary;
             try {
                 Signature signer = schemeAndSigner.getValue();
                 signer.update(contentCovered);
-                temproary = signer.sign();
+                temporary = signer.sign();
             } catch (SignatureException ikse) {
                 throw context.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "Cannot produce CertificateVerify signature", ikse);
             }
 
-            this.signature = temproary;
+            this.signature = temporary;
         }
 
         T13CertificateVerifyMessage(HandshakeContext context,
diff --git a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
index b6bc18f2b0ecd..af64383457a8b 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
@@ -123,7 +123,7 @@ class DHServerKeyExchangeMessage extends HandshakeMessage {
             } else {
                 useExplicitSigAlgorithm =
                         shc.negotiatedProtocol.useTLS12PlusSpec();
-                Signature signer = null;
+                Signature signer;
                 if (useExplicitSigAlgorithm) {
                     Map.Entry<SignatureScheme, Signature> schemeAndSigner =
                             SignatureScheme.getSignerOfPreferableAlgorithm(
@@ -155,7 +155,7 @@ class DHServerKeyExchangeMessage extends HandshakeMessage {
                     }
                 }
 
-                byte[] signature = null;
+                byte[] signature;
                 try {
                     updateSignature(signer, shc.clientHelloRandom.randomBytes,
                             shc.serverHelloRandom.randomBytes);
@@ -415,7 +415,7 @@ public String toString() {
 
         private static Signature getSignature(String keyAlgorithm,
                 Key key) throws NoSuchAlgorithmException, InvalidKeyException {
-            Signature signer = null;
+            Signature signer;
             switch (keyAlgorithm) {
                 case "DSA":
                     signer = Signature.getInstance(JsseJce.SIGNATURE_DSA);
diff --git a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
index a6bb7ebba6e82..9fe425c49c8cd 100644
--- a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
@@ -1118,7 +1118,7 @@ private Plaintext acquireCachedMessage() throws SSLProtocolException {
             bufferedFragments.remove(rFrag);    // popup the fragment
 
             ByteBuffer fragment = ByteBuffer.wrap(rFrag.fragment);
-            ByteBuffer plaintextFragment = null;
+            ByteBuffer plaintextFragment;
             try {
                 Plaintext plaintext = readCipher.decrypt(
                         rFrag.contentType, fragment, rFrag.recordEnS);
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
index c0bde405a8a1a..f2cc67a793f19 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
@@ -367,7 +367,6 @@ public byte[] produce(ConnectionContext context,
 
             SSLCredentials sslCredentials = null;
             NamedGroup ng = null;
-            PublicKey publicKey = null;
 
             // Find a good EC/XEC credential to use, determine the
             // NamedGroup to use for creating Possessions/Credentials/Keys.
@@ -375,7 +374,6 @@ public byte[] produce(ConnectionContext context,
                 if (cd instanceof NamedGroupCredentials) {
                     NamedGroupCredentials creds = (NamedGroupCredentials)cd;
                     ng = creds.getNamedGroup();
-                    publicKey = creds.getPublicKey();
                     sslCredentials = cd;
                     break;
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
index d3d30f7cecaa5..11efab71c85c9 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
@@ -133,7 +133,7 @@ class ECDHServerKeyExchangeMessage extends HandshakeMessage {
             } else {
                 useExplicitSigAlgorithm =
                         shc.negotiatedProtocol.useTLS12PlusSpec();
-                Signature signer = null;
+                Signature signer;
                 if (useExplicitSigAlgorithm) {
                     Map.Entry<SignatureScheme, Signature> schemeAndSigner =
                             SignatureScheme.getSignerOfPreferableAlgorithm(
@@ -165,7 +165,7 @@ class ECDHServerKeyExchangeMessage extends HandshakeMessage {
                     }
                 }
 
-                byte[] signature = null;
+                byte[] signature;
                 try {
                     updateSignature(signer, shc.clientHelloRandom.randomBytes,
                             shc.serverHelloRandom.randomBytes,
@@ -419,7 +419,7 @@ public String toString() {
 
         private static Signature getSignature(String keyAlgorithm,
                 Key key) throws NoSuchAlgorithmException, InvalidKeyException {
-            Signature signer = null;
+            Signature signer;
             switch (keyAlgorithm) {
                 case "EC":
                     signer = Signature.getInstance(JsseJce.SIGNATURE_ECDSA);
diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 2e52d30992cf3..a1ecca519204d 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -79,7 +79,7 @@ private static final class FinishedMessage extends HandshakeMessage {
             VerifyDataScheme vds =
                     VerifyDataScheme.valueOf(context.negotiatedProtocol);
 
-            byte[] vd = null;
+            byte[] vd;
             try {
                 vd = vds.createVerifyData(context, false);
             } catch (IOException ioe) {
diff --git a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
index 9aa7f95876591..696251ff3b1c9 100644
--- a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
@@ -486,7 +486,7 @@ private long t13Encrypt(
         }
 
         // use the right TLSCiphertext.opaque_type and legacy_record_version
-        ProtocolVersion pv = protocolVersion;
+        ProtocolVersion pv;
         if (!encCipher.isNullCipher()) {
             pv = ProtocolVersion.TLS12;
             contentType = ContentType.APPLICATION_DATA.id;
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
index f9446999db49f..835bfc538d34f 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,7 +135,7 @@ static RSAPremasterSecret decode(ServerHandshakeContext shc,
                 byte[] encrypted) throws GeneralSecurityException {
 
             byte[] encoded = null;
-            boolean needFailover = false;
+            boolean needFailover;
             Cipher cipher = Cipher.getInstance(JsseJce.CIPHER_RSA_PKCS1);
             try {
                 // Try UNWRAP_MODE mode firstly.
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
index 2398a12c016c7..e7c76c96d9a40 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@ private RSAServerKeyExchangeMessage(HandshakeContext handshakeContext,
             RSAPublicKeySpec spec = JsseJce.getRSAPublicKeySpec(publicKey);
             this.modulus = Utilities.toByteArray(spec.getModulus());
             this.exponent = Utilities.toByteArray(spec.getPublicExponent());
-            byte[] signature = null;
+            byte[] signature;
             try {
                 Signature signer = RSASignature.getInstance();
                 signer.initSign(x509Possession.popPrivateKey,
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
index bb9b53cce2fcf..99d72e4fe56be 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2200,7 +2200,7 @@ public Plaintext decrypt(byte contentType, ByteBuffer bb,
 
                 // DON'T decrypt the nonce_explicit for AEAD mode. The buffer
                 // position has moved out of the nonce_explicit range.
-                int len = bb.remaining();
+                int len;
                 int pos = bb.position();
                 ByteBuffer dup = bb.duplicate();
                 try {
@@ -2320,7 +2320,6 @@ public int encrypt(byte contentType,
                 cipher.updateAAD(aad);
 
                 // DON'T encrypt the nonce for AEAD mode.
-                int len = bb.remaining();
                 int pos = bb.position();
                 if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
@@ -2339,6 +2338,7 @@ public int encrypt(byte contentType,
                     bb.limit(pos + outputSize);
                 }
 
+                int len;
                 try {
                     len = cipher.doFinal(dup, bb);
                 } catch (IllegalBlockSizeException |
@@ -2470,7 +2470,7 @@ public Plaintext decrypt(byte contentType, ByteBuffer bb,
                                         contentType, bb.remaining(), sn);
                 cipher.updateAAD(aad);
 
-                int len = bb.remaining();
+                int len;
                 int pos = bb.position();
                 ByteBuffer dup = bb.duplicate();
                 try {
@@ -2602,7 +2602,6 @@ public int encrypt(byte contentType,
                                         contentType, outputSize, sn);
                 cipher.updateAAD(aad);
 
-                int len = bb.remaining();
                 int pos = bb.position();
                 if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
@@ -2620,6 +2619,7 @@ public int encrypt(byte contentType,
                     bb.limit(pos + outputSize);
                 }
 
+                int len;
                 try {
                     len = cipher.doFinal(dup, bb);
                 } catch (IllegalBlockSizeException |
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
index d348bf60d9959..375fc1c2bfbd7 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1023,9 +1023,7 @@ public FileInputStream run() throws Exception {
                     passwd = defaultKeyStorePassword.toCharArray();
                 }
 
-                /**
-                 * Try to initialize key store.
-                 */
+                // Try to initialize key store.
                 if ((defaultKeyStoreType.length()) != 0) {
                     if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
                         SSLLogger.finest("init keystore");
@@ -1304,7 +1302,7 @@ private static class CustomizedDTLSContext extends AbstractDTLSContext {
         private static final List<CipherSuite> clientDefaultCipherSuites;
         private static final List<CipherSuite> serverDefaultCipherSuites;
 
-        private static IllegalArgumentException reservedException = null;
+        private static IllegalArgumentException reservedException;
 
         // Don't want a java.lang.LinkageError for illegal system property.
         //
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
index c9721be2be320..31abe94e9a112 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,8 +75,7 @@ private int bytesInCompletePacket(ByteBuffer packet) throws SSLException {
 
         int pos = packet.position();
         byte byteZero = packet.get(pos);
-
-        int len = 0;
+        int len;
 
         /*
          * If we have already verified previous packets, we can
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
index d93c892f57529..43b5df8a77589 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -307,9 +307,6 @@ final class SSLSessionImpl extends ExtendedSSLSession {
      */
 
     SSLSessionImpl(HandshakeContext hc, ByteBuffer buf) throws IOException {
-        int i = 0;
-        byte[] b;
-
         boundValues = new ConcurrentHashMap<>();
         this.protocolVersion =
                 ProtocolVersion.valueOf(Short.toUnsignedInt(buf.getShort()));
@@ -323,7 +320,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
 
         // Local Supported signature algorithms
         ArrayList<SignatureScheme> list = new ArrayList<>();
-        i = Byte.toUnsignedInt(buf.get());
+        int i = Byte.toUnsignedInt(buf.get());
         while (i-- > 0) {
             list.add(SignatureScheme.valueOf(
                     Short.toUnsignedInt(buf.getShort())));
@@ -340,6 +337,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         this.peerSupportedSignAlgs = Collections.unmodifiableCollection(list);
 
         // PSK
+        byte[] b;
         i = Short.toUnsignedInt(buf.getShort());
         if (i > 0) {
             b = new byte[i];
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
index f086cefd6d9c9..da189f4f3fff3 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -74,7 +74,7 @@ int bytesInCompletePacket() throws IOException {
         }
 
         byte byteZero = header[0];
-        int len = 0;
+        int len;
 
         /*
          * If we have already verified previous packets, we can
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
index 32075a3da51ff..efd2e00808f45 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,7 @@ static Plaintext decode(TransportContext context,
         ByteBuffer[] srcs, int srcsOffset, int srcsLength,
         ByteBuffer[] dsts, int dstsOffset, int dstsLength) throws IOException {
 
-        Plaintext[] plaintexts = null;
+        Plaintext[] plaintexts;
         try {
             plaintexts =
                     context.inputRecord.decode(srcs, srcsOffset, srcsLength);
diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index 398a84790dbe5..63651db53c36b 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,7 +156,7 @@ private Validator checkTrustedInit(X509Certificate[] chain,
                 "null or zero-length authentication type");
         }
 
-        Validator v = null;
+        Validator v;
         if (checkClientTrusted) {
             v = clientValidator;
             if (v == null) {
@@ -197,7 +197,7 @@ private void checkTrusted(X509Certificate[] chain,
             boolean checkClientTrusted) throws CertificateException {
         Validator v = checkTrustedInit(chain, authType, checkClientTrusted);
 
-        X509Certificate[] trustedChain = null;
+        X509Certificate[] trustedChain;
         if ((socket != null) && socket.isConnected() &&
                                         (socket instanceof SSLSocket)) {
 
@@ -254,7 +254,7 @@ private void checkTrusted(X509Certificate[] chain,
             boolean checkClientTrusted) throws CertificateException {
         Validator v = checkTrustedInit(chain, authType, checkClientTrusted);
 
-        X509Certificate[] trustedChain = null;
+        X509Certificate[] trustedChain;
         if (engine != null) {
             SSLSession session = engine.getHandshakeSession();
             if (session == null) {

From 2806bf2e7362f5442a1e959e68bed00c240319e3 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 11 Jan 2021 07:32:27 +0000
Subject: [PATCH 099/129] 8259475: Fix bad merge in compilerOracle

Reviewed-by: redestad, thartmann
---
 src/hotspot/share/compiler/compilerOracle.cpp | 13 -------------
 src/hotspot/share/compiler/compilerOracle.hpp |  4 ----
 2 files changed, 17 deletions(-)

diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index 3a095884443cd..b1cd911ddea4d 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -410,19 +410,6 @@ bool CompilerOracle::should_break_at(const methodHandle& method) {
   return check_predicate(CompileCommand::Break, method);
 }
 
-bool CompilerOracle::should_blackhole(const methodHandle& method) {
-  if (!check_predicate(CompileCommand::Blackhole, method)) {
-    return false;
-  }
-  guarantee(UnlockDiagnosticVMOptions, "Checked during initial parsing");
-  if (method->result_type() != T_VOID) {
-    warning("Blackhole compile option only works for methods with void type: %s",
-            method->name_and_sig_as_C_string());
-    return false;
-  }
-  return true;
-}
-
 static enum CompileCommand match_option_name(const char* line, int* bytes_read, char* errorbuf, int bufsize) {
   assert(ARRAY_SIZE(option_names) == static_cast<int>(CompileCommand::Count), "option_names size mismatch");
 
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 2d47df7c23990..7a58885884d78 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -51,7 +51,6 @@ class methodHandle;
   option(Print, "print", Bool) \
   option(Inline,  "inline", Bool) \
   option(DontInline,  "dontinline", Bool) \
-  option(Blackhole,  "blackhole", Bool) \
   option(CompileOnly, "compileonly", Bool)\
   option(Exclude, "exclude", Bool) \
   option(Break, "break", Bool) \
@@ -142,9 +141,6 @@ class CompilerOracle : AllStatic {
   // Tells whether to break when compiling method
   static bool should_break_at(const methodHandle& method);
 
-  // Tells whether to blackhole when compiling method
-  static bool should_blackhole(const methodHandle& method);
-
   // Tells whether there are any methods to print for print_method_statistics()
   static bool should_print_methods();
 

From bb247b02c82b5b74a3b3a1ce76075e5d109829e1 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 11 Jan 2021 07:32:57 +0000
Subject: [PATCH 100/129] 8259392: Zero error reporting is broken after
 JDK-8255711

Reviewed-by: dholmes
---
 src/hotspot/os/posix/signals_posix.cpp | 28 +++++++++++---------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 1c24bb6278035..71e2ce019df4f 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -608,26 +608,22 @@ int JVM_HANDLE_XXX_SIGNAL(int sig, siginfo_t* info,
       // prepare fault pc address for error reporting.
       if (S390_ONLY(sig == SIGILL || sig == SIGFPE) NOT_S390(false)) {
         pc = (address)info->si_addr;
+      } else if (ZERO_ONLY(true) NOT_ZERO(false)) {
+        // Non-arch-specific Zero code does not really know the pc.
+        // This can be alleviated by making arch-specific os::Posix::ucontext_get_pc
+        // available for Zero for known architectures. But for generic Zero
+        // code, it would still remain unknown.
+        pc = NULL;
       } else {
         pc = os::Posix::ucontext_get_pc(uc);
       }
     }
-#if defined(ZERO) && !defined(PRODUCT)
-    char buf[64];
-    VMError::report_and_die(t, sig, pc, info, ucVoid,
-          "\n#"
-          "\n#    /--------------------\\"
-          "\n#    |      %-7s       |"
-          "\n#    \\---\\ /--------------/"
-          "\n#        /"
-          "\n#    [-]        |\\_/|    "
-          "\n#    (+)=C      |o o|__  "
-          "\n#    | |        =-*-=__\\ "
-          "\n#    OOO        c_c_(___)",
-          get_signal_name(sig, buf, sizeof(buf)));
-#else
-    VMError::report_and_die(t, sig, pc, info, ucVoid);
-#endif
+    // For Zero, we ignore the crash context, because:
+    //  a) The crash would be in C++ interpreter code, so context is not really relevant;
+    //  b) Generic Zero code would not be able to parse it, so when generic error
+    //     reporting code asks e.g. about frames on stack, Zero would experience
+    //     a secondary ShouldNotCallThis() crash.
+    VMError::report_and_die(t, sig, pc, info, NOT_ZERO(ucVoid) ZERO_ONLY(NULL));
     // VMError should not return.
     ShouldNotReachHere();
   }

From 3974fd4f33fb7156e31a76bc039f493a86246988 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 11 Jan 2021 07:33:33 +0000
Subject: [PATCH 101/129] 8259451: Zero: skip serviceability/sa tests, set
 vm.hasSA to false

Reviewed-by: sgehwolf, cjplummer
---
 test/lib/jdk/test/lib/Platform.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index a2a8e23c23eda..912f93113a0aa 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -226,6 +226,9 @@ public static boolean isRoot() {
      * on this platform.
      */
     public static boolean hasSA() {
+        if (isZero()) {
+            return false; // SA is not enabled.
+        }
         if (isAix()) {
             return false; // SA not implemented.
         } else if (isLinux()) {

From d21a0ea1ff01e513b6700a8fff9865d3f3fa0480 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 11 Jan 2021 07:37:37 +0000
Subject: [PATCH 102/129] 8258449: Move make/hotspot/symbols to make/data

Reviewed-by: erikj
---
 .../symbols => data/hotspot-symbols}/symbols-aix     |  0
 .../hotspot-symbols}/symbols-aix-debug               |  0
 .../symbols => data/hotspot-symbols}/symbols-linux   |  0
 .../symbols => data/hotspot-symbols}/symbols-macosx  |  0
 .../symbols => data/hotspot-symbols}/symbols-shared  |  0
 .../symbols => data/hotspot-symbols}/symbols-unix    |  0
 make/hotspot/lib/JvmMapfile.gmk                      | 12 ++++++------
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename make/{hotspot/symbols => data/hotspot-symbols}/symbols-aix (100%)
 rename make/{hotspot/symbols => data/hotspot-symbols}/symbols-aix-debug (100%)
 rename make/{hotspot/symbols => data/hotspot-symbols}/symbols-linux (100%)
 rename make/{hotspot/symbols => data/hotspot-symbols}/symbols-macosx (100%)
 rename make/{hotspot/symbols => data/hotspot-symbols}/symbols-shared (100%)
 rename make/{hotspot/symbols => data/hotspot-symbols}/symbols-unix (100%)

diff --git a/make/hotspot/symbols/symbols-aix b/make/data/hotspot-symbols/symbols-aix
similarity index 100%
rename from make/hotspot/symbols/symbols-aix
rename to make/data/hotspot-symbols/symbols-aix
diff --git a/make/hotspot/symbols/symbols-aix-debug b/make/data/hotspot-symbols/symbols-aix-debug
similarity index 100%
rename from make/hotspot/symbols/symbols-aix-debug
rename to make/data/hotspot-symbols/symbols-aix-debug
diff --git a/make/hotspot/symbols/symbols-linux b/make/data/hotspot-symbols/symbols-linux
similarity index 100%
rename from make/hotspot/symbols/symbols-linux
rename to make/data/hotspot-symbols/symbols-linux
diff --git a/make/hotspot/symbols/symbols-macosx b/make/data/hotspot-symbols/symbols-macosx
similarity index 100%
rename from make/hotspot/symbols/symbols-macosx
rename to make/data/hotspot-symbols/symbols-macosx
diff --git a/make/hotspot/symbols/symbols-shared b/make/data/hotspot-symbols/symbols-shared
similarity index 100%
rename from make/hotspot/symbols/symbols-shared
rename to make/data/hotspot-symbols/symbols-shared
diff --git a/make/hotspot/symbols/symbols-unix b/make/data/hotspot-symbols/symbols-unix
similarity index 100%
rename from make/hotspot/symbols/symbols-unix
rename to make/data/hotspot-symbols/symbols-unix
diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk
index 7da46ebe69981..5cba93178c744 100644
--- a/make/hotspot/lib/JvmMapfile.gmk
+++ b/make/hotspot/lib/JvmMapfile.gmk
@@ -31,20 +31,20 @@ $(eval $(call IncludeCustomExtension, hotspot/lib/JvmMapfile.gmk))
 ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86_64)), false)
   # On Windows x86_64, we should not have any symbols at all, since that
   # results in duplicate warnings from the linker (JDK-8043491).
-  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-shared
+  SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-shared
 endif
 
 ifeq ($(call isTargetOsType, unix), true)
-  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-unix
+  SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-unix
 endif
 
-ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)), )
-  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)
+ifneq ($(wildcard $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)), )
+  SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)
 endif
 
 ifneq ($(findstring debug, $(DEBUG_LEVEL)), )
-  ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
-    SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
+  ifneq ($(wildcard $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
+    SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)-debug
   endif
 endif
 

From bd344184294dcb6e6196ebde9626406403fe61fd Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 11 Jan 2021 07:42:10 +0000
Subject: [PATCH 103/129] 8258445: Move make/templates to make/data

Reviewed-by: erikj
---
 make/{templates => data/license-templates}/bsd-header  |  0
 .../license-templates}/gpl-cp-header                   |  0
 make/{templates => data/license-templates}/gpl-header  |  0
 make/scripts/lic_check.sh                              | 10 +++++-----
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename make/{templates => data/license-templates}/bsd-header (100%)
 rename make/{templates => data/license-templates}/gpl-cp-header (100%)
 rename make/{templates => data/license-templates}/gpl-header (100%)

diff --git a/make/templates/bsd-header b/make/data/license-templates/bsd-header
similarity index 100%
rename from make/templates/bsd-header
rename to make/data/license-templates/bsd-header
diff --git a/make/templates/gpl-cp-header b/make/data/license-templates/gpl-cp-header
similarity index 100%
rename from make/templates/gpl-cp-header
rename to make/data/license-templates/gpl-cp-header
diff --git a/make/templates/gpl-header b/make/data/license-templates/gpl-header
similarity index 100%
rename from make/templates/gpl-header
rename to make/data/license-templates/gpl-header
diff --git a/make/scripts/lic_check.sh b/make/scripts/lic_check.sh
index c166115ebb63f..d70d891418191 100644
--- a/make/scripts/lic_check.sh
+++ b/make/scripts/lic_check.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -f
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 # This script checks a copyright notice.
 #
 # The script should be located in the main jdk repository under make/scripts.
-# It works with the templates in the make/templates directory of the jdk source.
+# It works with the templates in the make/data/license-templates directory of the jdk source.
 #
 # Usage: "lic_check.sh [-gpl] or [-gplcp] or [-bsd] file(s)"
 
@@ -61,12 +61,12 @@ D=`dirname "${script_directory}"`
 B=`basename "${script_directory}"`
 script_dir="`cd \"${D}\" 2>/dev/null && pwd || echo \"${D}\"`/${B}"
 
-# set up a variable for the templates directory
-template_dir=${script_dir}/../templates
+# set up a variable for the template directory
+template_dir=${script_dir}/../data/license-templates
 
 # Check existence of the template directory.
 if [ ! -d ${template_dir} ] ; then
-        echo "ERROR: The templates directory "${template_dir}" doesn't exist." 1>&2
+        echo "ERROR: The template directory "${template_dir}" doesn't exist." 1>&2
         exit 1
 fi
 

From e0d748d56f817b4fb5158aae86aee12d90b36356 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Mon, 11 Jan 2021 09:06:40 +0000
Subject: [PATCH 104/129] 8258606: os::print_signal_handlers() should resolve
 the function name of the handlers

Reviewed-by: dholmes, coleenp, gziemski
---
 src/hotspot/os/posix/signals_posix.cpp | 40 ++++-------
 src/hotspot/share/runtime/os.cpp       | 54 ++++++++++++++
 src/hotspot/share/runtime/os.hpp       | 18 +++++
 test/hotspot/gtest/runtime/test_os.cpp | 99 ++++++++++++++++++++++++++
 4 files changed, 184 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 71e2ce019df4f..5fbcff7f9b08f 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -650,29 +650,13 @@ static void UserHandler(int sig, void *siginfo, void *context) {
   os::signal_notify(sig);
 }
 
-static const char* get_signal_handler_name(address handler,
-                                           char* buf, int buflen) {
-  int offset = 0;
-  bool found = os::dll_address_to_library_name(handler, buf, buflen, &offset);
-  if (found) {
-    // skip directory names
-    const char *p1, *p2;
-    p1 = buf;
-    size_t len = strlen(os::file_separator());
-    while ((p2 = strstr(p1, os::file_separator())) != NULL) p1 = p2 + len;
-#if !defined(AIX)
-    jio_snprintf(buf, buflen, "%s+0x%x", p1, offset);
-#else
-    // The way os::dll_address_to_library_name is implemented on Aix
-    // right now, it always returns -1 for the offset which is not
-    // terribly informative.
-    // Will fix that. For now, omit the offset.
-    jio_snprintf(buf, buflen, "%s", p1);
-#endif
-  } else {
-    jio_snprintf(buf, buflen, PTR_FORMAT, handler);
-  }
-  return buf;
+static void print_signal_handler_name(outputStream* os, address handler, char* buf, size_t buflen) {
+  // We demangle, but omit arguments - signal handlers should have always the same prototype.
+  os::print_function_and_library_name(os, handler, buf, buflen,
+                                       true, // shorten_path
+                                       true, // demangle
+                                       true  // omit arguments
+                                       );
 }
 
 // Writes one-line description of a combination of sigaction.sa_flags into a user
@@ -826,8 +810,10 @@ static void check_signal_handler(int sig) {
 
   if (thisHandler != jvmHandler) {
     tty->print("Warning: %s handler ", os::exception_name(sig, buf, O_BUFLEN));
-    tty->print("expected:%s", get_signal_handler_name(jvmHandler, buf, O_BUFLEN));
-    tty->print_cr("  found:%s", get_signal_handler_name(thisHandler, buf, O_BUFLEN));
+    tty->print_raw("expected:");
+    print_signal_handler_name(tty, jvmHandler, buf, O_BUFLEN);
+    tty->print_raw("  found:");
+    print_signal_handler_name(tty, thisHandler, buf, O_BUFLEN);
     // No need to check this sig any longer
     sigaddset(&check_signal_done, sig);
     // Running under non-interactive shell, SHUTDOWN2_SIGNAL will be reassigned SIG_IGN
@@ -1368,7 +1354,7 @@ void PosixSignals::print_signal_handler(outputStream* st, int sig,
   // See comment for SA_RESTORER_FLAG_MASK
   LINUX_ONLY(sa.sa_flags &= SA_RESTORER_FLAG_MASK;)
 
-  st->print("%s: ", os::exception_name(sig, buf, buflen));
+  st->print("%10s: ", os::exception_name(sig, buf, buflen));
 
   address handler = get_signal_handler(&sa);
 
@@ -1377,7 +1363,7 @@ void PosixSignals::print_signal_handler(outputStream* st, int sig,
   } else if (handler == CAST_FROM_FN_PTR(address, SIG_IGN)) {
     st->print("SIG_IGN");
   } else {
-    st->print("[%s]", get_signal_handler_name(handler, buf, buflen));
+    print_signal_handler_name(st, handler, buf, O_BUFLEN);
   }
 
   st->print(", sa_mask[0]=");
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 35e9ae5624507..731c295a37c89 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -882,6 +882,60 @@ void os::abort(bool dump_core) {
 //---------------------------------------------------------------------------
 // Helper functions for fatal error handler
 
+bool os::print_function_and_library_name(outputStream* st,
+                                         address addr,
+                                         char* buf, int buflen,
+                                         bool shorten_paths,
+                                         bool demangle,
+                                         bool strip_arguments) {
+  // If no scratch buffer given, allocate one here on stack.
+  // (used during error handling; its a coin toss, really, if on-stack allocation
+  //  is worse than (raw) C-heap allocation in that case).
+  char* p = buf;
+  if (p == NULL) {
+    p = (char*)::alloca(O_BUFLEN);
+    buflen = O_BUFLEN;
+  }
+  int offset = 0;
+  const bool have_function_name = dll_address_to_function_name(addr, p, buflen,
+                                                               &offset, demangle);
+  if (have_function_name) {
+    // Print function name, optionally demangled
+    if (demangle && strip_arguments) {
+      char* args_start = strchr(p, '(');
+      if (args_start != NULL) {
+        *args_start = '\0';
+      }
+    }
+    // Print offset. Omit printing if offset is zero, which makes the output
+    // more readable if we print function pointers.
+    if (offset == 0) {
+      st->print("%s", p);
+    } else {
+      st->print("%s+%d", p, offset);
+    }
+  } else {
+    st->print(PTR_FORMAT, p2i(addr));
+  }
+  offset = 0;
+
+  const bool have_library_name = dll_address_to_library_name(addr, p, buflen, &offset);
+  if (have_library_name) {
+    // Cut path parts
+    if (shorten_paths) {
+      char* p2 = strrchr(p, os::file_separator()[0]);
+      if (p2 != NULL) {
+        p = p2 + 1;
+      }
+    }
+    st->print(" in %s", p);
+    if (!have_function_name) { // Omit offset if we already printed the function offset
+      st->print("+%d", offset);
+    }
+  }
+  return have_function_name || have_library_name;
+}
+
 void os::print_hex_dump(outputStream* st, address start, address end, int unitsize,
                         int bytes_per_line, address logical_start) {
   assert(unitsize == 1 || unitsize == 2 || unitsize == 4 || unitsize == 8, "just checking");
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 018dcb0043975..679e7bb72a1d2 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -589,6 +589,24 @@ class os: AllStatic {
   static bool dll_address_to_library_name(address addr, char* buf,
                                           int buflen, int* offset);
 
+  // Given an address, attempt to locate both the symbol and the library it
+  // resides in. If at least one of these steps was successful, prints information
+  // and returns true.
+  // - if no scratch buffer is given, stack is used
+  // - shorten_paths: path is omitted from library name
+  // - demangle: function name is demangled
+  // - strip_arguments: arguments are stripped (requires demangle=true)
+  // On success prints either one of:
+  // "<function name>+<offset> in <library>"
+  // "<function name>+<offset>"
+  // "<address> in <library>+<offset>"
+  static bool print_function_and_library_name(outputStream* st,
+                                              address addr,
+                                              char* buf = NULL, int buflen = 0,
+                                              bool shorten_paths = true,
+                                              bool demangle = true,
+                                              bool strip_arguments = false);
+
   // Find out whether the pc is in the static code for jvm.dll/libjvm.so.
   static bool address_is_in_vm(address addr);
 
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index ac8636af5fc72..2bf31998f7593 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -25,6 +25,7 @@
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/os.hpp"
+#include "runtime/thread.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
@@ -696,3 +697,101 @@ TEST_VM(os, pagesizes_test_print) {
   pss.print_on(&ss);
   ASSERT_EQ(strcmp(expected, buffer), 0);
 }
+
+TEST_VM(os, dll_address_to_function_and_library_name) {
+  char tmp[1024];
+  char output[1024];
+  stringStream st(output, sizeof(output));
+
+#define EXPECT_CONTAINS(haystack, needle) \
+  EXPECT_NE(::strstr(haystack, needle), (char*)NULL)
+#define EXPECT_DOES_NOT_CONTAIN(haystack, needle) \
+  EXPECT_EQ(::strstr(haystack, needle), (char*)NULL)
+// #define LOG(...) tty->print_cr(__VA_ARGS__); // enable if needed
+#define LOG(...)
+
+  // Invalid addresses
+  address addr = (address)(intptr_t)-1;
+  EXPECT_FALSE(os::print_function_and_library_name(&st, addr));
+  addr = NULL;
+  EXPECT_FALSE(os::print_function_and_library_name(&st, addr));
+
+  // Valid addresses
+  // Test with or without shorten-paths, demangle, and scratch buffer
+  for (int i = 0; i < 16; i++) {
+    const bool shorten_paths = (i & 1) != 0;
+    const bool demangle = (i & 2) != 0;
+    const bool strip_arguments = (i & 4) != 0;
+    const bool provide_scratch_buffer = (i & 8) != 0;
+    LOG("shorten_paths=%d, demangle=%d, strip_arguments=%d, provide_scratch_buffer=%d",
+        shorten_paths, demangle, strip_arguments, provide_scratch_buffer);
+
+    // Should show os::min_page_size in libjvm
+    addr = CAST_FROM_FN_PTR(address, Threads::create_vm);
+    st.reset();
+    EXPECT_TRUE(os::print_function_and_library_name(&st, addr,
+                                                    provide_scratch_buffer ? tmp : NULL,
+                                                    sizeof(tmp),
+                                                    shorten_paths, demangle,
+                                                    strip_arguments));
+    EXPECT_CONTAINS(output, "Threads");
+    EXPECT_CONTAINS(output, "create_vm");
+    EXPECT_CONTAINS(output, "jvm"); // "jvm.dll" or "libjvm.so" or similar
+#ifndef _WIN32 // Demangler gives us no arguments on Windows
+    if (demangle) {
+      if (strip_arguments) {
+        EXPECT_DOES_NOT_CONTAIN(output, "(");
+      } else {
+        EXPECT_CONTAINS(output, "(");
+      }
+    }
+#endif // _WIN32
+    LOG("%s", output);
+
+    // Test truncation on scratch buffer
+    if (provide_scratch_buffer) {
+      st.reset();
+      tmp[10] = 'X';
+      EXPECT_TRUE(os::print_function_and_library_name(&st, addr, tmp, 10,
+                                                      shorten_paths, demangle));
+      EXPECT_EQ(tmp[10], 'X');
+      LOG("%s", output);
+    }
+
+    // Pointer (probably) outside function, should show at least the library name
+    addr -= 10;
+    st.reset();
+    EXPECT_TRUE(os::print_function_and_library_name(&st, addr,
+                                                    provide_scratch_buffer ? tmp : NULL,
+                                                    sizeof(tmp),
+                                                    shorten_paths, demangle));
+    EXPECT_CONTAINS(output, "jvm"); // "jvm.dll" or "libjvm.so" or similar
+    LOG("%s", output);
+
+    // Pointer into system library
+#ifndef _WIN32
+    addr = CAST_FROM_FN_PTR(address, ::malloc);
+    st.reset();
+    EXPECT_TRUE(os::print_function_and_library_name(&st, addr,
+                                                    provide_scratch_buffer ? tmp : NULL,
+                                                    sizeof(tmp),
+                                                    shorten_paths, demangle));
+    EXPECT_CONTAINS(output, "malloc");
+    LINUX_ONLY(EXPECT_CONTAINS(output, "libc"));
+    MACOS_ONLY(EXPECT_CONTAINS(output, "libsystem"));
+    LOG("%s", output);
+#else
+    addr = CAST_FROM_FN_PTR(address, CreateFileA);
+    st.reset(); // this also zero-terminates start of output
+    EXPECT_TRUE(os::print_function_and_library_name(&st, addr,
+                                                    provide_scratch_buffer ? tmp : NULL,
+                                                    sizeof(tmp),
+                                                    shorten_paths, demangle));
+    for (char* p = output; *p; p++) {
+      *p = ::toupper(*p);
+    }
+    EXPECT_CONTAINS(output, "KERNEL32.DLL");
+    LOG("%s", output);
+#endif
+  }
+}

From a03e22bb14e0873a599320676fc9d2128a1e23cb Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 11 Jan 2021 09:42:48 +0000
Subject: [PATCH 105/129] 8253910: UseCompressedClassPointers depends on
 UseCompressedOops in vmError.cpp

Reviewed-by: rrich, dholmes
---
 src/hotspot/share/utilities/vmError.cpp | 30 ++++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 35df9948cf448..6152321b0a640 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -341,7 +341,7 @@ static void report_vm_version(outputStream* st, char* buf, int buflen) {
                 buf, jdk_debug_level, runtime_version);
 
    // This is the long version with some default settings added
-   st->print_cr("# Java VM: %s%s%s (%s%s, %s%s%s%s%s, %s, %s)",
+   st->print_cr("# Java VM: %s%s%s (%s%s, %s%s%s%s%s%s, %s, %s)",
                  VM_Version::vm_name(),
                 (*vendor_version != '\0') ? " " : "", vendor_version,
                  jdk_debug_level,
@@ -355,6 +355,7 @@ static void report_vm_version(outputStream* st, char* buf, int buflen) {
                  "", "",
 #endif
                  UseCompressedOops ? ", compressed oops" : "",
+                 UseCompressedClassPointers ? ", compressed class ptrs" : "",
                  GCConfig::hs_err_name(),
                  VM_Version::vm_platform_string()
                );
@@ -920,11 +921,15 @@ void VMError::report(outputStream* st, bool _verbose) {
 
      if (_verbose && UseCompressedOops) {
        CompressedOops::print_mode(st);
-       if (UseCompressedClassPointers) {
-         CDS_ONLY(MetaspaceShared::print_on(st);)
-         Metaspace::print_compressed_class_space(st);
-         CompressedKlassPointers::print_mode(st);
-       }
+       st->cr();
+     }
+
+  STEP("printing compressed klass pointers mode")
+
+     if (_verbose && UseCompressedClassPointers) {
+       CDS_ONLY(MetaspaceShared::print_on(st);)
+       Metaspace::print_compressed_class_space(st);
+       CompressedKlassPointers::print_mode(st);
        st->cr();
      }
 #endif
@@ -1131,11 +1136,14 @@ void VMError::print_vm_info(outputStream* st) {
   // STEP("printing compressed oops mode")
   if (UseCompressedOops) {
     CompressedOops::print_mode(st);
-    if (UseCompressedClassPointers) {
-      CDS_ONLY(MetaspaceShared::print_on(st);)
-      Metaspace::print_compressed_class_space(st);
-      CompressedKlassPointers::print_mode(st);
-    }
+    st->cr();
+  }
+
+  // STEP("printing compressed class ptrs mode")
+  if (UseCompressedClassPointers) {
+    CDS_ONLY(MetaspaceShared::print_on(st);)
+    Metaspace::print_compressed_class_space(st);
+    CompressedKlassPointers::print_mode(st);
     st->cr();
   }
 #endif

From 18a37f9453cd1a5740da47b93ce6122052ccd43b Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 11 Jan 2021 09:43:18 +0000
Subject: [PATCH 106/129] 8259368: Zero: UseCompressedClassPointers does not
 depend on UseCompressedOops

Reviewed-by: aph, zgu
---
 src/hotspot/cpu/zero/globalDefinitions_zero.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
index 1ac536f4cdf17..dcb1e6f70b9c0 100644
--- a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
+++ b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2009, 2015, Red Hat, Inc.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009, 2021, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,6 @@
 // 32-bit integer argument values are extended to 64 bits.
 const bool CCallingConventionRequiresIntsAsLongs = false;
 
-#define COMPRESSED_CLASS_POINTERS_DEPENDS_ON_COMPRESSED_OOPS true
+#define COMPRESSED_CLASS_POINTERS_DEPENDS_ON_COMPRESSED_OOPS false
 
 #endif // CPU_ZERO_GLOBALDEFINITIONS_ZERO_HPP

From 235488215bb1e71174abff34192ab222c2c7047a Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 11 Jan 2021 10:10:47 +0000
Subject: [PATCH 107/129] 8250768: javac should be adapted to changes in JEP 12

Reviewed-by: mcimadamore, erikj, jjg, ihse
---
 make/CompileInterimLangtools.gmk              |  10 +-
 make/Docs.gmk                                 |   1 -
 make/autoconf/spec.gmk.in                     |   3 +
 .../classes/build/tools/taglet/Preview.java   |  79 ---
 .../tools/symbolgenerator/CreateSymbols.java  |  18 +-
 make/modules/jdk.compiler/Gendata.gmk         |   5 +-
 make/modules/jdk.javadoc/Gendata.gmk          |   3 +-
 .../share/classes/java/lang/Class.java        |  20 +-
 .../internal/{ => javac}/PreviewFeature.java  |   8 +-
 src/java.base/share/classes/module-info.java  |   5 +-
 .../javax/lang/model/element/Modifier.java    |  24 +-
 .../javax/lang/model/element/TypeElement.java |  12 +-
 .../com/sun/source/tree/ClassTree.java        |  13 +-
 .../sun/tools/javac/api/JavacTaskPool.java    |   6 +-
 .../com/sun/tools/javac/code/Flags.java       |   6 +-
 .../com/sun/tools/javac/code/Preview.java     |  52 +-
 .../com/sun/tools/javac/code/Symtab.java      |   2 +-
 .../com/sun/tools/javac/comp/Annotate.java    |   4 +-
 .../com/sun/tools/javac/comp/Attr.java        |   4 +-
 .../com/sun/tools/javac/comp/Check.java       |  47 +-
 .../com/sun/tools/javac/comp/Modules.java     |   3 +-
 .../com/sun/tools/javac/comp/Resolve.java     |   6 +-
 .../com/sun/tools/javac/comp/TypeEnter.java   |   6 +-
 .../com/sun/tools/javac/jvm/ClassReader.java  |   6 +-
 .../com/sun/tools/javac/jvm/ClassWriter.java  |   4 +-
 .../tools/javac/resources/compiler.properties |  36 +-
 .../javac/util/MandatoryWarningHandler.java   |  22 +-
 .../com/sun/tools/javac/util/Names.java       |   6 +-
 .../javac/util/RawDiagnosticFormatter.java    |   8 +
 .../html/AbstractExecutableMemberWriter.java  |  19 +-
 .../formats/html/AbstractMemberWriter.java    |  16 +-
 .../formats/html/AllClassesIndexWriter.java   |  11 +-
 ...nnotationTypeRequiredMemberWriterImpl.java |  11 +-
 .../doclets/formats/html/ClassUseWriter.java  |   5 +-
 .../doclets/formats/html/ClassWriterImpl.java |  31 +-
 .../formats/html/ConstructorWriterImpl.java   |   7 +-
 .../doclets/formats/html/Contents.java        |  10 +-
 .../formats/html/DeprecatedListWriter.java    | 369 +-------------
 .../formats/html/EnumConstantWriterImpl.java  |  11 +-
 .../doclets/formats/html/FieldWriterImpl.java |  11 +-
 .../doclets/formats/html/HelpWriter.java      |  11 +-
 .../formats/html/HtmlConfiguration.java       |  14 +-
 .../doclets/formats/html/HtmlDoclet.java      |  12 +-
 .../formats/html/HtmlDocletWriter.java        | 242 ++++++++-
 .../doclets/formats/html/LinkFactoryImpl.java |  41 +-
 .../doclets/formats/html/LinkInfoImpl.java    |  31 +-
 .../formats/html/MethodWriterImpl.java        |   9 +-
 .../formats/html/ModuleIndexWriter.java       |   3 +-
 .../formats/html/ModuleWriterImpl.java        |   4 +-
 .../doclets/formats/html/Navigation.java      |  25 +-
 .../formats/html/NestedClassWriterImpl.java   |   6 +-
 .../formats/html/PackageWriterImpl.java       |   4 +-
 .../formats/html/PreviewListWriter.java       |  93 ++++
 .../formats/html/PropertyWriterImpl.java      |  10 +-
 .../doclets/formats/html/Signatures.java      |   7 +-
 .../formats/html/SubWriterHolderWriter.java   |   4 +-
 .../formats/html/SummaryListWriter.java       | 303 +++++++++++
 .../formats/html/markup/HtmlStyle.java        |  22 +-
 .../doclets/formats/html/markup/HtmlTree.java |  15 +-
 .../doclets/formats/html/markup/TagName.java  |   3 +-
 .../html/resources/standard.properties        |  22 +-
 .../AnnotationTypeRequiredMemberWriter.java   |  10 +-
 .../doclets/toolkit/ConstructorWriter.java    |  10 +-
 .../doclets/toolkit/EnumConstantWriter.java   |   8 +
 .../internal/doclets/toolkit/FieldWriter.java |  10 +-
 .../doclets/toolkit/MethodWriter.java         |   8 +
 .../doclets/toolkit/PropertyWriter.java       |  10 +-
 .../internal/doclets/toolkit/WorkArounds.java |  13 +-
 .../AnnotationTypeRequiredMemberBuilder.java  |  13 +-
 .../toolkit/builders/ConstructorBuilder.java  |  12 +-
 .../toolkit/builders/EnumConstantBuilder.java |  12 +-
 .../toolkit/builders/FieldBuilder.java        |  12 +-
 .../toolkit/builders/MethodBuilder.java       |  12 +-
 .../toolkit/builders/PropertyBuilder.java     |  11 +-
 .../toolkit/resources/doclets.properties      |  13 +-
 .../doclets/toolkit/resources/stylesheet.css  |  21 +-
 .../doclets/toolkit/util/Comparators.java     |  15 +-
 .../util/DeprecatedAPIListBuilder.java        | 164 +-----
 .../doclets/toolkit/util/DocLink.java         |   6 +-
 .../doclets/toolkit/util/DocPaths.java        |   5 +-
 .../toolkit/util/PreviewAPIListBuilder.java   |  48 ++
 .../toolkit/util/SummaryAPIListBuilder.java   | 225 +++++++++
 .../internal/doclets/toolkit/util/Utils.java  | 256 +++++++++-
 .../toolkit/util/links/LinkFactory.java       |   5 +-
 .../doclets/toolkit/util/links/LinkInfo.java  |   5 +
 .../javadoc/internal/tool/ElementsTable.java  |   3 +-
 .../share/classes/jdk/jshell/Snippet.java     |   8 -
 .../defineHiddenClass/PreviewHiddenClass.java |   4 +-
 test/jdk/java/lang/ref/CleanerTest.java       |   5 +-
 .../java/util/Arrays/TimSortStackSize2.java   |   3 +-
 .../modules/etc/JdkQualifiedExportTest.java   |   2 +-
 .../TestDeprecatedDocs.java                   |  36 +-
 .../testHtmlTableTags/TestHtmlTableTags.java  |  10 +-
 .../doclet/testModules/TestModules.java       |   5 +-
 .../doclet/testPreview/TestPreview.java       | 123 +++++
 .../doclet/testPreview/api/preview/Core.java  |  30 ++
 .../testPreview/api/preview/CoreRecord.java   |  30 ++
 .../api/preview/CoreRecordComponent.java      |  29 ++
 .../testPreview/api/preview/Reflective.java   |  30 ++
 .../doclet/testPreview/doc/element-list       |   2 +
 .../doc/java.base/preview/Core.html           |   0
 .../doc/java.base/preview/Reflective.html     |   0
 .../doclet/testPreview/m/module-info.java     |  25 +
 .../testPreview/m/pkg/DocAnnotation.java      |  35 ++
 .../testPreview/m/pkg/DocAnnotationUse1.java  |  28 ++
 .../testPreview/m/pkg/DocAnnotationUse2.java  |  28 ++
 .../testPreview/m/pkg/TestPreviewAPIUse.java  |  33 ++
 .../m/pkg/TestPreviewDeclaration.java         |  28 ++
 .../m/pkg/TestPreviewDeclarationUse.java      |  30 ++
 .../testRecordTypes/TestRecordTypes.java      |   6 +-
 .../testSealedTypes/TestSealedTypes.java      | 137 +++--
 .../doclet/testStylesheet/TestStylesheet.java |   4 +-
 .../jdk/javadoc/tool/CheckResourceKeys.java   |   5 +-
 .../tools/javac/diags/examples.not-yet.txt    |   1 +
 .../CantExtendSealedInAnotherModule.java      |   4 +-
 .../CantExtendSealedInAnotherPkg.java         |   4 +-
 .../javac/diags/examples/SealedTypes.java     |   3 +-
 .../tools/javac/enum/FauxEnum3-preview.out    |   4 +
 .../tools/javac/lib/combo/ComboTask.java      |   4 +
 .../options/BCPOrSystemNotSpecified.java      |   2 +-
 .../tools/javac/patterns/BreakAndLoops.java   |   1 -
 .../tools/javac/patterns/ConditionalTest.java |   3 +-
 .../javac/patterns/PatternMatchPosTest.out    |   2 +-
 .../javac/platform/PreviewAPIsWithRelease.out |   2 +-
 .../preview/DeclaredUsingPreview-class.out    |   5 +
 .../preview/DeclaredUsingPreview-source.out   |   7 +
 .../javac/preview/DeclaredUsingPreview.java   |  11 +
 .../DeclaredUsingPreviewDeclarations.java     |   5 +
 .../javac/preview/PreviewAutoSuppress.java    | 222 ++++++++
 .../tools/javac/preview/PreviewErrors.java    | 473 ++++++++++++++----
 .../processing/model/element/TestSealed.java  |  42 +-
 .../sealed/SealedDiffConfigurationsTest.java  |   4 +-
 .../tools/jdeps/listdeps/ListModuleDeps.java  |   2 +-
 133 files changed, 3107 insertions(+), 1078 deletions(-)
 delete mode 100644 make/jdk/src/classes/build/tools/taglet/Preview.java
 rename src/java.base/share/classes/jdk/internal/{ => javac}/PreviewFeature.java (95%)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Core.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecord.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecordComponent.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Reflective.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/doc/element-list
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/doc/java.base/preview/Core.html
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/doc/java.base/preview/Reflective.html
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/m/module-info.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotation.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse1.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse2.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewAPIUse.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclaration.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclarationUse.java
 create mode 100644 test/langtools/tools/javac/enum/FauxEnum3-preview.out
 create mode 100644 test/langtools/tools/javac/preview/DeclaredUsingPreview-class.out
 create mode 100644 test/langtools/tools/javac/preview/DeclaredUsingPreview-source.out
 create mode 100644 test/langtools/tools/javac/preview/DeclaredUsingPreview.java
 create mode 100644 test/langtools/tools/javac/preview/DeclaredUsingPreviewDeclarations.java
 create mode 100644 test/langtools/tools/javac/preview/PreviewAutoSuppress.java

diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk
index ff25e532f6e4a..e860169891f5b 100644
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,8 @@ TARGETS += $(patsubst %, $(BUILDTOOLS_OUTPUTDIR)/gensrc/%/module-info.java, \
     $(INTERIM_LANGTOOLS_MODULES))
 
 $(eval $(call SetupCopyFiles, COPY_PREVIEW_FEATURES, \
-    FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/PreviewFeature.java, \
-    DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/, \
+    FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/javac/, \
 ))
 
 TARGETS += $(COPY_PREVIEW_FEATURES)
@@ -81,8 +81,8 @@ define SetupInterimModule
           --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
           $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
           --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
-          --add-exports java.base/jdk.internal=java.compiler.interim \
-          --add-exports java.base/jdk.internal=jdk.compiler.interim, \
+          --add-exports java.base/jdk.internal.javac=java.compiler.interim \
+          --add-exports java.base/jdk.internal.javac=jdk.compiler.interim, \
   ))
 
   $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \
diff --git a/make/Docs.gmk b/make/Docs.gmk
index 4c0846360ca46..89cea6a7c3fea 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -89,7 +89,6 @@ JAVADOC_TAGS := \
     -tag see \
     -taglet build.tools.taglet.ExtLink \
     -taglet build.tools.taglet.Incubating \
-    -taglet build.tools.taglet.Preview \
     -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     $(CUSTOM_JAVADOC_TAGS) \
     #
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 7d859fd0d8e81..fd9f782c0df5d 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -658,6 +658,8 @@ INTERIM_LANGTOOLS_ADD_EXPORTS := \
     --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
     --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
     --add-exports java.base/sun.invoke.util=jdk.compiler.interim \
+    --add-exports java.base/jdk.internal.javac=java.compiler.interim \
+    --add-exports java.base/jdk.internal.javac=jdk.compiler.interim \
     #
 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
     $(INTERIM_LANGTOOLS_MODULES))))
@@ -665,6 +667,7 @@ INTERIM_LANGTOOLS_ARGS := \
     --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
     --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
     --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
+    --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
     $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
     #
 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
diff --git a/make/jdk/src/classes/build/tools/taglet/Preview.java b/make/jdk/src/classes/build/tools/taglet/Preview.java
deleted file mode 100644
index 2b4bf16b75cdb..0000000000000
--- a/make/jdk/src/classes/build/tools/taglet/Preview.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.taglet;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Predicate;
-import javax.lang.model.element.Element;
-import com.sun.source.doctree.DocTree;
-import com.sun.source.doctree.TextTree;
-import com.sun.source.doctree.UnknownInlineTagTree;
-import jdk.javadoc.doclet.Taglet;
-import static jdk.javadoc.doclet.Taglet.Location.*;
-
-/**
- * An block tag to insert a standard warning about a preview API.
- */
-public class Preview implements Taglet {
-
-    /** Returns the set of locations in which a taglet may be used. */
-    @Override
-    public Set<Location> getAllowedLocations() {
-        return EnumSet.of(MODULE, PACKAGE, TYPE, CONSTRUCTOR, METHOD, FIELD);
-    }
-
-    @Override
-    public boolean isInlineTag() {
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return "preview";
-    }
-
-    @Override
-    public String toString(List<? extends DocTree> tags, Element elem) {
-        UnknownInlineTagTree previewTag = (UnknownInlineTagTree) tags.get(0);
-        List<? extends DocTree> previewContent = previewTag.getContent();
-        String previewText = ((TextTree) previewContent.get(0)).getBody();
-        String[] summaryAndDetails = previewText.split("\n\r?\n\r?");
-        String summary = summaryAndDetails[0];
-        String details = summaryAndDetails.length > 1 ? summaryAndDetails[1] : summaryAndDetails[0];
-        StackTraceElement[] stackTrace = new Exception().getStackTrace();
-        Predicate<StackTraceElement> isSummary =
-                el -> el.getClassName().endsWith("HtmlDocletWriter") &&
-                      el.getMethodName().equals("addSummaryComment");
-        if (Arrays.stream(stackTrace).anyMatch(isSummary)) {
-            return "<div style=\"display:inline-block; font-weight:bold\">" + summary + "</div><br>";
-        }
-        return "<div style=\"border: 1px solid red; border-radius: 5px; padding: 5px; display:inline-block; font-size: larger\">" + details + "</div><br>";
-    }
-}
-
diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
index 99fb65d7130ae..fa6d9d836308c 100644
--- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
@@ -1112,20 +1112,32 @@ private Annotation[][] createParameterAnnotations(List<CPInfo> constantPool, Lis
 
     private Annotation createAnnotation(List<CPInfo> constantPool, AnnotationDescription desc) {
         String annotationType = desc.annotationType;
+        Map<String, Object> values = desc.values;
 
-        if (PREVIEW_FEATURE_ANNOTATION.equals(annotationType)) {
+        if (PREVIEW_FEATURE_ANNOTATION_NEW.equals(annotationType)) {
             //the non-public PreviewFeature annotation will not be available in ct.sym,
             //replace with purely synthetic javac-internal annotation:
             annotationType = PREVIEW_FEATURE_ANNOTATION_INTERNAL;
         }
 
+        if (PREVIEW_FEATURE_ANNOTATION_OLD.equals(annotationType)) {
+            //the non-public PreviewFeature annotation will not be available in ct.sym,
+            //replace with purely synthetic javac-internal annotation:
+            annotationType = PREVIEW_FEATURE_ANNOTATION_INTERNAL;
+            values = new HashMap<>(values);
+            Boolean essentialAPI = (Boolean) values.remove("essentialAPI");
+            values.put("reflective", essentialAPI != null && !essentialAPI);
+        }
+
         return new Annotation(null,
                               addString(constantPool, annotationType),
-                              createElementPairs(constantPool, desc.values));
+                              createElementPairs(constantPool, values));
     }
     //where:
-        private static final String PREVIEW_FEATURE_ANNOTATION =
+        private static final String PREVIEW_FEATURE_ANNOTATION_OLD =
                 "Ljdk/internal/PreviewFeature;";
+        private static final String PREVIEW_FEATURE_ANNOTATION_NEW =
+                "Ljdk/internal/javac/PreviewFeature;";
         private static final String PREVIEW_FEATURE_ANNOTATION_INTERNAL =
                 "Ljdk/internal/PreviewFeature+Annotation;";
 
diff --git a/make/modules/jdk.compiler/Gendata.gmk b/make/modules/jdk.compiler/Gendata.gmk
index 0da7147609da9..85815e5524b1e 100644
--- a/make/modules/jdk.compiler/Gendata.gmk
+++ b/make/modules/jdk.compiler/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ CT_MODULESOURCEPATH := $(call GetModuleSrcPath)
 CT_DATA_DESCRIPTION += $(TOPDIR)/make/data/symbols/symbols
 
 COMPILECREATESYMBOLS_ADD_EXPORTS := \
-    --add-exports java.base/jdk.internal=java.compiler.interim,jdk.compiler.interim \
+    --add-exports java.base/jdk.internal.javac=java.compiler.interim,jdk.compiler.interim \
     --add-exports jdk.compiler.interim/com.sun.tools.javac.api=ALL-UNNAMED \
     --add-exports jdk.compiler.interim/com.sun.tools.javac.code=ALL-UNNAMED \
     --add-exports jdk.compiler.interim/com.sun.tools.javac.util=ALL-UNNAMED \
@@ -60,7 +60,6 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         $(INTERIM_LANGTOOLS_ARGS) \
-        --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
         $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
 ))
 
diff --git a/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk
index 0ee146a1e2197..78432cd6a68a9 100644
--- a/make/modules/jdk.javadoc/Gendata.gmk
+++ b/make/modules/jdk.javadoc/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         $(INTERIM_LANGTOOLS_ARGS) \
-        --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
         $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
 ))
 
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index cf8c873357787..bc942cb370d13 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4387,13 +4387,6 @@ public Optional<ClassDesc> describeConstable() {
     public native boolean isHidden();
 
     /**
-     * {@preview Associated with sealed classes, a preview feature of the Java language.
-     *
-     *           This method is associated with <i>sealed classes</i>, a preview
-     *           feature of the Java language. Preview features
-     *           may be removed in a future release, or upgraded to permanent
-     *           features of the Java language.}
-     *
      * Returns an array containing {@code Class} objects representing the
      * direct subinterfaces or subclasses permitted to extend or
      * implement this class or interface if it is sealed.  The order of such elements
@@ -4429,7 +4422,7 @@ public Optional<ClassDesc> describeConstable() {
      * @jls 9.1 Interface Declarations
      * @since 15
      */
-    @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SEALED_CLASSES, essentialAPI=false)
+    @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.SEALED_CLASSES, reflective=true)
     @CallerSensitive
     public Class<?>[] getPermittedSubclasses() {
         Class<?>[] subClasses;
@@ -4469,13 +4462,6 @@ private boolean isDirectSubType(Class<?> c) {
     }
 
     /**
-     * {@preview Associated with sealed classes, a preview feature of the Java language.
-     *
-     *           This method is associated with <i>sealed classes</i>, a preview
-     *           feature of the Java language. Preview features
-     *           may be removed in a future release, or upgraded to permanent
-     *           features of the Java language.}
-     *
      * Returns {@code true} if and only if this {@code Class} object represents
      * a sealed class or interface. If this {@code Class} object represents a
      * primitive type, {@code void}, or an array type, this method returns
@@ -4489,7 +4475,7 @@ private boolean isDirectSubType(Class<?> c) {
      * @jls 9.1 Interface Declarations
      * @since 15
      */
-    @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SEALED_CLASSES, essentialAPI=false)
+    @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.SEALED_CLASSES, reflective=true)
     @SuppressWarnings("preview")
     public boolean isSealed() {
         if (isArray() || isPrimitive()) {
diff --git a/src/java.base/share/classes/jdk/internal/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
similarity index 95%
rename from src/java.base/share/classes/jdk/internal/PreviewFeature.java
rename to src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 4bf0838ec2af4..a23be734cec29 100644
--- a/src/java.base/share/classes/jdk/internal/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.internal;
+package jdk.internal.javac;
 
 import java.lang.annotation.*;
 
@@ -51,7 +51,7 @@
      */
     public Feature feature();
 
-    public boolean essentialAPI() default false;
+    public boolean reflective() default false;
 
     public enum Feature {
         // 8242284:
@@ -68,6 +68,10 @@ public enum Feature {
         // necessary for PreviewFeature in JDK 16 to declare the enum constant.
         RECORDS,
         SEALED_CLASSES,
+        /**
+         * A key for testing.
+         */
+        TEST,
         ;
     }
 }
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index fdfa8de10a84d..50fd8efe02aa8 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -138,10 +138,9 @@
         jdk.incubator.foreign;
     exports com.sun.security.ntlm to
         java.security.sasl;
-    exports jdk.internal to // for @HotSpotIntrinsicCandidate
+    exports jdk.internal.javac to
         java.compiler,
         jdk.compiler,
-        jdk.incubator.vector,
         jdk.jshell;
     exports jdk.internal.access to
         java.desktop,
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java b/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
index f8aef53bae30b..8ba4ab6a2be4b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,33 +66,19 @@ public enum Modifier {
     /** The modifier {@code static} */          STATIC,
 
     /**
-     * {@preview Associated with sealed classes, a preview feature of the Java language.
-     *
-     *           This enum constant is associated with <i>sealed classes</i>, a preview
-     *           feature of the Java language. Preview features
-     *           may be removed in a future release, or upgraded to permanent
-     *           features of the Java language.}
-     *
      * The modifier {@code sealed}
      * @since 15
      */
-    @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SEALED_CLASSES,
-                                             essentialAPI=false)
+    @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.SEALED_CLASSES,
+                                             reflective=true)
     SEALED,
 
     /**
-     * {@preview Associated with sealed classes, a preview feature of the Java language.
-     *
-     *           This enum constant is associated with <i>sealed classes</i>, a preview
-     *           feature of the Java language. Preview features
-     *           may be removed in a future release, or upgraded to permanent
-     *           features of the Java language.}
-     *
      * The modifier {@code non-sealed}
      * @since 15
      */
-    @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SEALED_CLASSES,
-            essentialAPI=false)
+    @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.SEALED_CLASSES,
+            reflective=true)
     NON_SEALED {
         public String toString() {
             return "non-sealed";
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java b/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
index aed3e95b9385a..ac0783095220c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -199,12 +199,6 @@ default List<? extends RecordComponentElement> getRecordComponents() {
     }
 
     /**
-     * {@preview Associated with sealed classes, a preview feature of the Java language.
-     *
-     *           This method is associated with <i>sealed classes</i>, a preview
-     *           feature of the Java language. Preview features
-     *           may be removed in a future release, or upgraded to permanent
-     *           features of the Java language.}
      * Returns the permitted classes of this class or interface
      * element in declaration order.
      *
@@ -215,8 +209,8 @@ default List<? extends RecordComponentElement> getRecordComponents() {
      *
      * @since 15
      */
-    @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SEALED_CLASSES,
-                                 essentialAPI=false)
+    @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.SEALED_CLASSES,
+                                 reflective=true)
     default List<? extends TypeMirror> getPermittedSubclasses() {
         return List.of();
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
index 73adca1516979..463bdf2749827 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,13 +87,6 @@ public interface ClassTree extends StatementTree {
     List<? extends Tree> getImplementsClause();
 
     /**
-     * {@preview Associated with sealed classes, a preview feature of the Java language.
-     *
-     *           This method is associated with <i>sealed classes</i>, a preview
-     *           feature of the Java language. Preview features
-     *           may be removed in a future release, or upgraded to permanent
-     *           features of the Java language.}
-     *
      * Returns the subclasses permitted by this type declaration.
      *
      * @implSpec this implementation returns an empty list
@@ -102,8 +95,8 @@ public interface ClassTree extends StatementTree {
      *
      * @since 15
      */
-    @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SEALED_CLASSES,
-                                             essentialAPI=false)
+    @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.SEALED_CLASSES,
+                                       reflective=true)
     default List<? extends Tree> getPermitsClause() {
         return List.of();
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java
index f7ba8cfe73107..411eb6aec14a8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
+import javax.tools.StandardLocation;
 
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.CompilationUnitTree;
@@ -251,6 +252,9 @@ static class ReusableContext extends Context implements TaskListener {
         }
 
         void clear() {
+            //when patching modules (esp. java.base), it may be impossible to
+            //clear the symbols read from the patch path:
+            polluted |= get(JavaFileManager.class).hasLocation(StandardLocation.PATCH_MODULE_PATH);
             drop(Arguments.argsKey);
             drop(DiagnosticListener.class);
             drop(Log.outKey);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
index b87a1e4129824..76b7044b13c32 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -337,7 +337,7 @@ public static EnumSet<Flag> asFlagSet(long flags) {
     /**
      * Flag to indicate the API element in question is for a preview API.
      */
-    public static final long PREVIEW_ESSENTIAL_API = 1L<<58; //any Symbol kind
+    public static final long PREVIEW_REFLECTIVE = 1L<<58; //any Symbol kind
 
     /**
      * Flag to indicate the given variable is a match binding variable.
@@ -509,7 +509,7 @@ public enum Flag {
         ANONCONSTR_BASED(Flags.ANONCONSTR_BASED),
         NAME_FILLED(Flags.NAME_FILLED),
         PREVIEW_API(Flags.PREVIEW_API),
-        PREVIEW_ESSENTIAL_API(Flags.PREVIEW_ESSENTIAL_API),
+        PREVIEW_REFLECTIVE(Flags.PREVIEW_REFLECTIVE),
         MATCH_BINDING(Flags.MATCH_BINDING),
         MATCH_BINDING_TO_OUTER(Flags.MATCH_BINDING_TO_OUTER),
         RECORD(Flags.RECORD),
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
index 24a83c6a9536e..4cf32630daa83 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,13 @@
 
 import javax.tools.JavaFileObject;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
+import static com.sun.tools.javac.code.Flags.RECORD;
+import static com.sun.tools.javac.code.Flags.SEALED;
+import static com.sun.tools.javac.code.Flags.NON_SEALED;
 import static com.sun.tools.javac.main.Option.PREVIEW;
 
 /**
@@ -70,6 +75,7 @@ public class Preview {
     /** a mapping from classfile numbers to Java SE versions */
     private final Map<Integer, Source> majorVersionToSource;
 
+    private final Set<JavaFileObject> sourcesWithPreviewFeatures = new HashSet<>();
 
     private final Lint lint;
     private final Log log;
@@ -90,8 +96,9 @@ public static Preview instance(Context context) {
         enabled = options.isSet(PREVIEW);
         log = Log.instance(context);
         lint = Lint.instance(context);
+        Source source = Source.instance(context);
         this.previewHandler =
-                new MandatoryWarningHandler(log, lint.isEnabled(LintCategory.PREVIEW), true, "preview", LintCategory.PREVIEW);
+                new MandatoryWarningHandler(log, source, lint.isEnabled(LintCategory.PREVIEW), true, "preview", LintCategory.PREVIEW);
         forcePreview = options.isSet("forcePreview");
         majorVersionToSource = initMajorVersionToSourceMap();
     }
@@ -128,6 +135,7 @@ public void warnPreview(DiagnosticPosition pos, Feature feature) {
         Assert.check(isEnabled());
         Assert.check(isPreview(feature));
         if (!lint.isSuppressed(LintCategory.PREVIEW)) {
+            sourcesWithPreviewFeatures.add(log.currentSourceFile());
             previewHandler.report(pos, feature.isPlural() ?
                     Warnings.PreviewFeatureUsePlural(feature.nameFragment()) :
                     Warnings.PreviewFeatureUse(feature.nameFragment()));
@@ -141,16 +149,25 @@ public void warnPreview(DiagnosticPosition pos, Feature feature) {
      */
     public void warnPreview(JavaFileObject classfile, int majorVersion) {
         Assert.check(isEnabled());
-        if (!lint.isSuppressed(LintCategory.PREVIEW)) {
-            previewHandler.report(null,
+        if (lint.isEnabled(LintCategory.PREVIEW)) {
+            sourcesWithPreviewFeatures.add(log.currentSourceFile());
+            log.mandatoryWarning(LintCategory.PREVIEW, null,
                     Warnings.PreviewFeatureUseClassfile(classfile, majorVersionToSource.get(majorVersion).name));
         }
     }
 
+    public void markUsesPreview(DiagnosticPosition pos) {
+        sourcesWithPreviewFeatures.add(log.currentSourceFile());
+    }
+
     public void reportPreviewWarning(DiagnosticPosition pos, Warning warnKey) {
         previewHandler.report(pos, warnKey);
     }
 
+    public boolean usesPreview(JavaFileObject file) {
+        return sourcesWithPreviewFeatures.contains(file);
+    }
+
     /**
      * Are preview features enabled?
      * @return true, if preview features are enabled.
@@ -165,12 +182,14 @@ public boolean isEnabled() {
      * @return true, if given feature is a preview feature.
      */
     public boolean isPreview(Feature feature) {
-        if (feature == Feature.SEALED_CLASSES)
-            return true;
-        //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
-        //When real preview features will be added, this method can be implemented to return 'true'
-        //for those selected features, and 'false' for all the others.
-        return forcePreview;
+        return switch (feature) {
+            case SEALED_CLASSES -> true;
+
+            //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
+            //When real preview features will be added, this method can be implemented to return 'true'
+            //for those selected features, and 'false' for all the others.
+            default -> forcePreview;
+        };
     }
 
     /**
@@ -197,6 +216,19 @@ public Error disabledError(JavaFileObject classfile, int majorVersion) {
         return Errors.PreviewFeatureDisabledClassfile(classfile, majorVersionToSource.get(majorVersion).name);
     }
 
+    /**
+     * Check whether the given symbol has been declared using
+     * a preview language feature.
+     *
+     * @param sym Symbol to check
+     * @return true iff sym has been declared using a preview language feature
+     */
+    public boolean declaredUsingPreviewFeature(Symbol sym) {
+        return ((sym.flags() & RECORD) != 0 && isPreview(Feature.RECORDS)) ||
+               ((sym.flags() & SEALED) != 0 && isPreview(Feature.SEALED_CLASSES)) ||
+               ((sym.flags() & NON_SEALED) != 0 && isPreview(Feature.SEALED_CLASSES));
+    }
+
     /**
      * Report any deferred diagnostics.
      */
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
index d5eb6aa45eab3..99ecbe8775dee 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -581,7 +581,7 @@ public <R, P> R accept(ElementVisitor<R, P> v, P p) {
         lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory");
         stringConcatFactory = enterClass("java.lang.invoke.StringConcatFactory");
         functionalInterfaceType = enterClass("java.lang.FunctionalInterface");
-        previewFeatureType = enterClass("jdk.internal.PreviewFeature");
+        previewFeatureType = enterClass("jdk.internal.javac.PreviewFeature");
         previewFeatureInternalType = enterSyntheticAnnotation("jdk.internal.PreviewFeature+Annotation");
         typeDescriptorType = enterClass("java.lang.invoke.TypeDescriptor");
         recordType = enterClass("java.lang.Record");
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
index e3d54f4a10049..eb1945d32c7f7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -373,8 +373,8 @@ private <T extends Attribute.Compound> void annotateNow(Symbol toAnnotate,
             if (!c.type.isErroneous()
                     && types.isSameType(c.type, syms.previewFeatureType)) {
                 toAnnotate.flags_field |= Flags.PREVIEW_API;
-                if (isAttributeTrue(c.member(names.essentialAPI))) {
-                    toAnnotate.flags_field |= Flags.PREVIEW_ESSENTIAL_API;
+                if (isAttributeTrue(c.member(names.reflective))) {
+                    toAnnotate.flags_field |= Flags.PREVIEW_REFLECTIVE;
                 }
             }
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 52ed9ff998c58..e56eb9f2c8d62 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4482,7 +4482,7 @@ else if (ownOuter.hasTag(CLASS) && site != ownOuter) {
                 chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym);
                 chk.checkSunAPI(tree.pos(), sym);
                 chk.checkProfile(tree.pos(), sym);
-                chk.checkPreview(tree.pos(), sym);
+                chk.checkPreview(tree.pos(), env.info.scope.owner, sym);
             }
 
             // If symbol is a variable, check that its type and
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index cd56fa0d73a92..f3d9d69aeb4aa 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,13 +148,13 @@ protected Check(Context context) {
         boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED);
         boolean enforceMandatoryWarnings = true;
 
-        deprecationHandler = new MandatoryWarningHandler(log, verboseDeprecated,
+        deprecationHandler = new MandatoryWarningHandler(log, null, verboseDeprecated,
                 enforceMandatoryWarnings, "deprecated", LintCategory.DEPRECATION);
-        removalHandler = new MandatoryWarningHandler(log, verboseRemoval,
+        removalHandler = new MandatoryWarningHandler(log, null, verboseRemoval,
                 enforceMandatoryWarnings, "removal", LintCategory.REMOVAL);
-        uncheckedHandler = new MandatoryWarningHandler(log, verboseUnchecked,
+        uncheckedHandler = new MandatoryWarningHandler(log, null, verboseUnchecked,
                 enforceMandatoryWarnings, "unchecked", LintCategory.UNCHECKED);
-        sunApiHandler = new MandatoryWarningHandler(log, false,
+        sunApiHandler = new MandatoryWarningHandler(log, null, false,
                 enforceMandatoryWarnings, "sunapi", null);
 
         deferredLintHandler = DeferredLintHandler.instance(context);
@@ -239,21 +239,22 @@ void warnDeprecated(DiagnosticPosition pos, Symbol sym) {
         }
     }
 
-    /** Warn about deprecated symbol.
+    /** Log a preview warning.
      *  @param pos        Position to be used for error reporting.
-     *  @param sym        The deprecated symbol.
+     *  @param msg        A Warning describing the problem.
      */
-    void warnPreview(DiagnosticPosition pos, Symbol sym) {
-        warnPreview(pos, Warnings.IsPreview(sym));
+    public void warnPreviewAPI(DiagnosticPosition pos, Warning warnKey) {
+        if (!lint.isSuppressed(LintCategory.PREVIEW))
+            preview.reportPreviewWarning(pos, warnKey);
     }
 
     /** Log a preview warning.
      *  @param pos        Position to be used for error reporting.
      *  @param msg        A Warning describing the problem.
      */
-    public void warnPreview(DiagnosticPosition pos, Warning warnKey) {
+    public void warnDeclaredUsingPreview(DiagnosticPosition pos, Symbol sym) {
         if (!lint.isSuppressed(LintCategory.PREVIEW))
-            preview.reportPreviewWarning(pos, warnKey);
+            preview.reportPreviewWarning(pos, Warnings.DeclaredUsingPreview(kindName(sym), sym));
     }
 
     /** Warn about unchecked operation.
@@ -3545,12 +3546,26 @@ void checkProfile(final DiagnosticPosition pos, final Symbol s) {
         }
     }
 
-    void checkPreview(DiagnosticPosition pos, Symbol s) {
-        if ((s.flags() & PREVIEW_API) != 0) {
-            if ((s.flags() & PREVIEW_ESSENTIAL_API) != 0 && !preview.isEnabled()) {
-                log.error(pos, Errors.IsPreview(s));
+    void checkPreview(DiagnosticPosition pos, Symbol other, Symbol s) {
+        if ((s.flags() & PREVIEW_API) != 0 && s.packge().modle != other.packge().modle) {
+            if ((s.flags() & PREVIEW_REFLECTIVE) == 0) {
+                if (!preview.isEnabled()) {
+                    log.error(pos, Errors.IsPreview(s));
+                } else {
+                    preview.markUsesPreview(pos);
+                    deferredLintHandler.report(() -> warnPreviewAPI(pos, Warnings.IsPreview(s)));
+                }
             } else {
-                deferredLintHandler.report(() -> warnPreview(pos, s));
+                    deferredLintHandler.report(() -> warnPreviewAPI(pos, Warnings.IsPreviewReflective(s)));
+            }
+        }
+        if (preview.declaredUsingPreviewFeature(s)) {
+            if (preview.isEnabled()) {
+                //for preview disabled do presumably so not need to do anything?
+                //If "s" is compiled from source, then there was an error for it already;
+                //if "s" is from classfile, there already was an error for the classfile.
+                preview.markUsesPreview(pos);
+                deferredLintHandler.report(() -> warnDeclaredUsingPreview(pos, s));
             }
         }
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
index b5980f699e587..e88f46c297ea8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1138,6 +1138,7 @@ public void visitProvides(JCProvides tree) {
         public void visitRequires(JCRequires tree) {
             if (tree.directive != null && allModules().contains(tree.directive.module)) {
                 chk.checkDeprecated(tree.moduleName.pos(), msym, tree.directive.module);
+                chk.checkPreview(tree.moduleName.pos(), msym, tree.directive.module);
                 chk.checkModuleRequires(tree.moduleName.pos(), tree.directive);
                 msym.directives = msym.directives.prepend(tree.directive);
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 5d9a6bb23e35a..4e98268f20da7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2896,7 +2896,7 @@ Symbol findConstructor(DiagnosticPosition pos, Env<AttrContext> env,
                                     typeargtypes, allowBoxing,
                                     useVarargs);
         chk.checkDeprecated(pos, env.info.scope.owner, sym);
-        chk.checkPreview(pos, sym);
+        chk.checkPreview(pos, env.info.scope.owner, sym);
         return sym;
     }
 
@@ -2961,7 +2961,7 @@ private Symbol findDiamond(DiagnosticPosition pos,
                                boolean useVarargs) {
         Symbol sym = findDiamond(env, site, argtypes, typeargtypes, allowBoxing, useVarargs);
         chk.checkDeprecated(pos, env.info.scope.owner, sym);
-        chk.checkPreview(pos, sym);
+        chk.checkPreview(pos, env.info.scope.owner, sym);
         return sym;
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index c1da78f43c193..fde8aaa116bb2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,6 +114,7 @@ public class TypeEnter implements Completer {
     private final Lint lint;
     private final TypeEnvs typeEnvs;
     private final Dependencies dependencies;
+    private final Preview preview;
 
     public static TypeEnter instance(Context context) {
         TypeEnter instance = context.get(typeEnterKey);
@@ -141,6 +142,7 @@ protected TypeEnter(Context context) {
         lint = Lint.instance(context);
         typeEnvs = TypeEnvs.instance(context);
         dependencies = Dependencies.instance(context);
+        preview = Preview.instance(context);
         Source source = Source.instance(context);
         allowTypeAnnos = Feature.TYPE_ANNOTATIONS.allowedInSource(source);
         allowDeprecationOnImport = Feature.DEPRECATION_ON_IMPORT.allowedInSource(source);
@@ -1462,7 +1464,7 @@ private void handleDeprecatedAnnotations(List<JCAnnotation> annotations, Symbol
                 setFlagIfAttributeTrue(a, sym, names.forRemoval, DEPRECATED_REMOVAL);
             } else if (a.annotationType.type == syms.previewFeatureType) {
                 sym.flags_field |= Flags.PREVIEW_API;
-                setFlagIfAttributeTrue(a, sym, names.essentialAPI, PREVIEW_ESSENTIAL_API);
+                setFlagIfAttributeTrue(a, sym, names.reflective, Flags.PREVIEW_REFLECTIVE);
             }
         }
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index bb3fd28b93045..8ef6a4a6a98ef 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1439,7 +1439,7 @@ else if (proxy.type.tsym.flatName() == syms.profileType.tsym.flatName()) {
                 }
             } else if (proxy.type.tsym.flatName() == syms.previewFeatureInternalType.tsym.flatName()) {
                 sym.flags_field |= PREVIEW_API;
-                setFlagIfAttributeTrue(proxy, sym, names.essentialAPI, PREVIEW_ESSENTIAL_API);
+                setFlagIfAttributeTrue(proxy, sym, names.reflective, PREVIEW_REFLECTIVE);
             } else {
                 if (proxy.type.tsym == syms.annotationTargetType.tsym) {
                     target = proxy;
@@ -1450,7 +1450,7 @@ else if (proxy.type.tsym.flatName() == syms.profileType.tsym.flatName()) {
                     setFlagIfAttributeTrue(proxy, sym, names.forRemoval, DEPRECATED_REMOVAL);
                 }  else if (proxy.type.tsym == syms.previewFeatureType.tsym) {
                     sym.flags_field |= PREVIEW_API;
-                    setFlagIfAttributeTrue(proxy, sym, names.essentialAPI, PREVIEW_ESSENTIAL_API);
+                    setFlagIfAttributeTrue(proxy, sym, names.reflective, PREVIEW_REFLECTIVE);
                 }
                 proxies.append(proxy);
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index c4dd360812da5..3eb788975cb60 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1632,7 +1632,7 @@ public void writeClassFile(OutputStream out, ClassSymbol c)
         acount += writeExtraAttributes(c);
 
         poolbuf.appendInt(JAVA_MAGIC);
-        if (preview.isEnabled()) {
+        if (preview.isEnabled() && preview.usesPreview(c.sourcefile)) {
             poolbuf.appendChar(ClassFile.PREVIEW_MINOR_VERSION);
         } else {
             poolbuf.appendChar(target.minorVersion);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 27909bae1bc6c..850dd03b5fb71 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -1632,24 +1632,26 @@ compiler.note.unchecked.filename.additional=\
 compiler.note.unchecked.plural.additional=\
     Some input files additionally use unchecked or unsafe operations.
 
-# 0: file name
+# 0: file name, 1: source
 compiler.note.preview.filename=\
-    {0} uses preview language features.
+    {0} uses preview features of Java SE {1}.
 
+# 0: source
 compiler.note.preview.plural=\
-    Some input files use preview language features.
+    Some input files use preview features of Java SE {0}.
 
 # The following string may appear after one of the above deprecation
 # messages.
 compiler.note.preview.recompile=\
     Recompile with -Xlint:preview for details.
 
-# 0: file name
+# 0: file name, 1: source
 compiler.note.preview.filename.additional=\
-    {0} has additional uses of preview language features.
+    {0} has additional uses of preview features of Java SE {1}.
 
+# 0: source
 compiler.note.preview.plural.additional=\
-    Some input files additionally use preview language features.
+    Some input files additionally use preview features of Java SE {0}.
 
 # Notes related to annotation processing
 
@@ -1783,11 +1785,16 @@ compiler.warn.has.been.deprecated.for.removal=\
 
 # 0: symbol
 compiler.warn.is.preview=\
-    {0} is an API that is part of a preview feature
+    {0} is a preview API and may be removed in a future release.
 
 # 0: symbol
 compiler.err.is.preview=\
-    {0} is an API that is part of a preview feature
+    {0} is a preview API and is disabled by default.\n\
+    (use --enable-preview to enable preview APIs)
+
+# 0: symbol
+compiler.warn.is.preview.reflective=\
+    {0} is a reflective preview API and may be removed in a future release.
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=\
@@ -2863,8 +2870,8 @@ compiler.err.preview.feature.disabled.plural=\
 
 # 0: file object (classfile), 1: string (expected version)
 compiler.err.preview.feature.disabled.classfile=\
-   classfile for {0} uses preview features of Java SE {1}.\n\
-   (use --enable-preview to allow loading of classfiles which contain preview features)
+   class file for {0} uses preview features of Java SE {1}.\n\
+   (use --enable-preview to allow loading of class files which contain preview features)
 
 # 0: message segment (feature)
 compiler.warn.preview.feature.use=\
@@ -2876,7 +2883,7 @@ compiler.warn.preview.feature.use.plural=\
 
 # 0: file object (classfile), 1: string (expected version)
 compiler.warn.preview.feature.use.classfile=\
-   classfile for {0} uses preview features of Java SE {1}.
+   class file for {0} uses preview features of Java SE {1}.
 
 
 compiler.misc.feature.modules=\
@@ -3741,6 +3748,9 @@ compiler.err.preview.not.latest=\
 compiler.err.preview.without.source.or.release=\
     --enable-preview must be used with either -source or --release
 
+# 0: kind name, 1: symbol
+compiler.warn.declared.using.preview=\
+    {0} {1} is declared using a preview feature, which may be removed in a future release.
+
 compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\
     attempt to synchronize on an instance of a value-based class
-
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
index 51b2d24ef3a9b..9fe9590ef35b1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
@@ -31,6 +31,7 @@
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.code.Lint.LintCategory;
+import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.JCDiagnostic.Note;
 import com.sun.tools.javac.util.JCDiagnostic.Warning;
@@ -111,10 +112,11 @@ private enum DeferredDiagnosticKind {
      *                the messages that may be generated.
      * @param lc      An associated lint category for the warnings, or null if none.
      */
-    public MandatoryWarningHandler(Log log, boolean verbose,
+    public MandatoryWarningHandler(Log log, Source source, boolean verbose,
                                    boolean enforceMandatory, String prefix,
                                    LintCategory lc) {
         this.log = log;
+        this.source = source;
         this.verbose = verbose;
         this.prefix = prefix;
         this.enforceMandatory = enforceMandatory;
@@ -173,10 +175,19 @@ public void report(DiagnosticPosition pos, Warning warnKey) {
      */
     public void reportDeferredDiagnostic() {
         if (deferredDiagnosticKind != null) {
-            if (deferredDiagnosticArg == null)
-                logMandatoryNote(deferredDiagnosticSource, deferredDiagnosticKind.getKey(prefix));
-            else
-                logMandatoryNote(deferredDiagnosticSource, deferredDiagnosticKind.getKey(prefix), deferredDiagnosticArg);
+            if (deferredDiagnosticArg == null) {
+                if (source != null) {
+                    logMandatoryNote(deferredDiagnosticSource, deferredDiagnosticKind.getKey(prefix), source);
+                } else {
+                    logMandatoryNote(deferredDiagnosticSource, deferredDiagnosticKind.getKey(prefix));
+                }
+            } else {
+                if (source != null) {
+                    logMandatoryNote(deferredDiagnosticSource, deferredDiagnosticKind.getKey(prefix), deferredDiagnosticArg, source);
+                } else {
+                    logMandatoryNote(deferredDiagnosticSource, deferredDiagnosticKind.getKey(prefix), deferredDiagnosticArg);
+                }
+            }
 
             if (!verbose)
                 logMandatoryNote(deferredDiagnosticSource, prefix + ".recompile");
@@ -187,6 +198,7 @@ public void reportDeferredDiagnostic() {
      * The log to which to report warnings.
      */
     private final Log log;
+    private final Source source;
 
     /**
      * Whether or not to report individual warnings, or simply to report a
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
index 90e9c685ad779..26e0b7577aaab 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ public static Names instance(Context context) {
     public final Name error;
     public final Name finalize;
     public final Name forRemoval;
-    public final Name essentialAPI;
+    public final Name reflective;
     public final Name getClass;
     public final Name hasNext;
     public final Name hashCode;
@@ -259,7 +259,7 @@ public Names(Context context) {
         error = fromString("<error>");
         finalize = fromString("finalize");
         forRemoval = fromString("forRemoval");
-        essentialAPI = fromString("essentialAPI");
+        reflective = fromString("reflective");
         getClass = fromString("getClass");
         hasNext = fromString("hasNext");
         hashCode = fromString("hashCode");
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
index 2305f8f42563b..de78b434982f3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
@@ -28,10 +28,12 @@
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Locale;
+import java.util.Set;
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.*;
 import com.sun.tools.javac.api.Formattable;
+import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.file.PathFileObject;
 import com.sun.tools.javac.tree.JCTree.*;
 
@@ -160,11 +162,17 @@ protected String formatArgument(JCDiagnostic diag, Object arg, Locale l) {
             s = ((PathFileObject) arg).getShortName();
         } else if (arg instanceof Tag) {
             s = "compiler.misc.tree.tag." + StringUtils.toLowerCase(((Tag) arg).name());
+        } else if (arg instanceof Source && arg == Source.DEFAULT &&
+                CODES_NEEDING_SOURCE_NORMALIZATION.contains(diag.getCode())) {
+            s = "DEFAULT";
         } else {
             s = super.formatArgument(diag, arg, null);
         }
         return (arg instanceof JCDiagnostic) ? "(" + s + ")" : s;
     }
+    //where:
+        private static final Set<String> CODES_NEEDING_SOURCE_NORMALIZATION = Set.of(
+                "compiler.note.preview.filename", "compiler.note.preview.plural");
 
     @Override
     protected String localize(Locale l, String key, Object... args) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
index 2a12b872895c1..3d3cecc254d3f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,7 @@
 
 import static jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl.Kind.EXECUTABLE_MEMBER_PARAM;
 import static jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl.Kind.MEMBER;
+import static jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl.Kind.MEMBER_DEPRECATED_PREVIEW;
 import static jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl.Kind.MEMBER_TYPE_PARAMS;
 import static jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl.Kind.RECEIVER_TYPE;
 import static jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl.Kind.THROWS_TYPE;
@@ -84,20 +85,20 @@ protected Content getTypeParameters(ExecutableElement member) {
     }
 
     @Override
-    protected Content getDeprecatedLink(Element member) {
-        Content deprecatedLinkContent = new ContentBuilder();
-        deprecatedLinkContent.add(utils.getFullyQualifiedName(member));
+    protected Content getSummaryLink(Element member) {
+        Content content = new ContentBuilder();
+        content.add(utils.getFullyQualifiedName(member));
         if (!utils.isConstructor(member)) {
-            deprecatedLinkContent.add(".");
-            deprecatedLinkContent.add(member.getSimpleName());
+            content.add(".");
+            content.add(member.getSimpleName());
         }
         String signature = utils.flatSignature((ExecutableElement) member, typeElement);
         if (signature.length() > 2) {
-            deprecatedLinkContent.add(Entity.ZERO_WIDTH_SPACE);
+            content.add(Entity.ZERO_WIDTH_SPACE);
         }
-        deprecatedLinkContent.add(signature);
+        content.add(signature);
 
-        return writer.getDocLink(MEMBER, utils.getEnclosingTypeElement(member), member, deprecatedLinkContent);
+        return writer.getDocLink(MEMBER_DEPRECATED_PREVIEW, utils.getEnclosingTypeElement(member), member, content);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index 1c9d12ec62068..38dacf35f802c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -172,13 +172,13 @@ protected abstract void addInheritedSummaryLink(TypeElement typeElement,
             Element member, Content linksTree);
 
     /**
-     * Returns the deprecated link.
+     * Returns a link for summary (deprecated, preview) pages.
      *
      * @param member the member being linked to
      *
      * @return a content tree representing the link
      */
-    protected abstract Content getDeprecatedLink(Element member);
+    protected abstract Content getSummaryLink(Element member);
 
     /**
      * Adds the modifier and type for the member in the member summary.
@@ -271,6 +271,16 @@ protected void addComment(Element member, Content htmlTree) {
         }
     }
 
+    /**
+     * Add the preview information for the given member.
+     *
+     * @param member the member being documented.
+     * @param contentTree the content tree to which the preview information will be added.
+     */
+    protected void addPreviewInfo(Element member, Content contentTree) {
+        writer.addPreviewInfo(member, contentTree);
+    }
+
     protected String name(Element member) {
         return utils.getSimpleName(member);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
index 9dd6ffb723d6b..0e566b2b6ca92 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import javax.lang.model.element.TypeElement;
 
+import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.DeprecatedTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
@@ -44,6 +46,7 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils.ElementFlag;
 
 /**
  * Generate the file with list of all the classes in this run.
@@ -154,7 +157,11 @@ protected void addTableRow(Table table, TypeElement klass) {
         Content classLink = getLink(new LinkInfoImpl(
                 configuration, LinkInfoImpl.Kind.INDEX, klass));
         ContentBuilder description = new ContentBuilder();
-        if (utils.isDeprecated(klass)) {
+        Set<ElementFlag> flags = utils.elementFlags(klass);
+        if (flags.contains(ElementFlag.PREVIEW)) {
+            description.add(contents.previewPhrase);
+            addSummaryComment(klass, description);
+        } else if (flags.contains(ElementFlag.DEPRECATED)) {
             description.add(getDeprecatedPhrase(klass));
             List<? extends DeprecatedTree> tags = utils.getDeprecatedTrees(klass);
             if (!tags.isEmpty()) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
index 77adf9044965d..25eb53fddaf3d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,11 @@ public void addDeprecated(Element member, Content annotationDocTree) {
         addDeprecatedInfo(member, annotationDocTree);
     }
 
+    @Override
+    public void addPreview(Element member, Content contentTree) {
+        addPreviewInfo(member, contentTree);
+    }
+
     @Override
     public void addComments(Element member, Content annotationDocTree) {
         addComment(member, annotationDocTree);
@@ -201,9 +206,9 @@ protected void addSummaryType(Element member, Content tdSummaryType) {
     }
 
     @Override
-    protected Content getDeprecatedLink(Element member) {
+    protected Content getSummaryLink(Element member) {
         String name = utils.getFullyQualifiedName(member) + "." + member.getSimpleName();
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member, name);
+        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER_DEPRECATED_PREVIEW, member, name);
     }
 
     protected Comment selectComment(Comment c1, Comment c2) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index c59fed2e0bd14..038bc3f752be0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -440,7 +440,8 @@ protected Navigation getNavBar(PageMode pageMode, Element element) {
                 contents.moduleLabel);
         Content classLinkContent = getLink(new LinkInfoImpl(
                 configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement)
-                .label(resources.getText("doclet.Class")));
+                .label(resources.getText("doclet.Class"))
+                .skipPreview(true));
         return super.getNavBar(pageMode, element)
                 .setNavLinkModule(mdleLinkContent)
                 .setNavLinkClass(classLinkContent);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
index 2b1f04891e156..2ef98c2eb01ee 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@
 
 import com.sun.source.doctree.DeprecatedTree;
 import com.sun.source.doctree.DocTree;
+import javax.lang.model.element.ElementKind;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
@@ -86,6 +87,9 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
                      "java.lang.constant.ConstantDesc",
                      "java.io.Serializable");
 
+    private static final Set<String> previewModifiers
+            = Set.of("sealed", "non-sealed");
+
     protected final TypeElement typeElement;
 
     protected final ClassTree classtree;
@@ -188,15 +192,34 @@ protected TypeElement getCurrentPageElement() {
 
     @Override @SuppressWarnings("preview")
     public void addClassSignature(String modifiers, Content classInfoTree) {
+        ContentBuilder mods = new ContentBuilder();
+        String sep = null;
+        for (String modifiersPart : modifiers.split(" ")) {
+            if (sep != null) {
+                mods.add(sep);
+            }
+            if (previewModifiers.contains(modifiersPart)) {
+                mods.add(modifiersPart);
+                mods.add(HtmlTree.SUP(links.createLink(getPreviewSectionAnchor(typeElement),
+                                                       contents.previewMark)));
+            } else {
+                mods.add(modifiersPart);
+            }
+            sep = " ";
+        }
+        if (modifiers.endsWith(" ")) {
+            mods.add(" ");
+        }
         classInfoTree.add(new HtmlTree(TagName.HR));
         classInfoTree.add(new Signatures.TypeSignature(typeElement, this)
-                .setModifiers(new StringContent(modifiers))
+                .setModifiers(mods)
                 .toContent());
     }
 
 
     @Override
     public void addClassDescription(Content classInfoTree) {
+        addPreviewInfo(classInfoTree);
         if (!options.noComment()) {
             // generate documentation for the class.
             if (!utils.getFullBody(typeElement).isEmpty()) {
@@ -205,6 +228,10 @@ public void addClassDescription(Content classInfoTree) {
         }
     }
 
+    private void addPreviewInfo(Content classInfoTree) {
+        addPreviewInfo(typeElement, classInfoTree);
+    }
+
     @Override
     public void addClassTagInfo(Content classInfoTree) {
         if (!options.noComment()) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
index 5fa47833428f1..af0f6466d8a69 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -142,6 +142,11 @@ public void addDeprecated(ExecutableElement constructor, Content constructorDocT
         addDeprecatedInfo(constructor, constructorDocTree);
     }
 
+    @Override
+    public void addPreview(ExecutableElement constructor, Content constructorDocTree) {
+        addPreviewInfo(constructor, constructorDocTree);
+    }
+
     @Override
     public void addComments(ExecutableElement constructor, Content constructorDocTree) {
         addComment(constructor, constructorDocTree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
index eabfd4233114e..dc61bf801b066 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,6 +151,10 @@ public class Contents {
     public final Content package_;
     public final Content packagesLabel;
     public final Content parameters;
+    public final Content previewAPI;
+    public final Content previewLabel;
+    public final Content previewMark;
+    public final Content previewPhrase;
     public final Content properties;
     public final Content propertyLabel;
     public final Content propertyDetailsLabel;
@@ -294,6 +298,10 @@ public class Contents {
         package_ = getContent("doclet.package");
         packagesLabel = getContent("doclet.Packages");
         parameters = getContent("doclet.Parameters");
+        previewAPI = getContent("doclet.Preview_API");
+        previewLabel = getContent("doclet.Preview_Label");
+        previewMark = getContent("doclet.Preview_Mark");
+        previewPhrase = getContent("doclet.Preview");
         properties = getContent("doclet.Properties");
         propertyLabel = getContent("doclet.Property");
         propertyDetailsLabel = getContent("doclet.Property_Detail");
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
index 2486f1757d122..943472a263578 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,31 +26,16 @@
 package jdk.javadoc.internal.doclets.formats.html;
 
 import com.sun.source.doctree.DeprecatedTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Table;
-import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
-
-import java.util.EnumMap;
 import java.util.List;
-import java.util.SortedSet;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
-
-import com.sun.source.doctree.DocTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder;
-import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder.DeprElementKind;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
 
 /**
  * Generate File to list all the deprecated classes and class members with the
@@ -63,157 +48,7 @@
  *
  * @see java.util.List
  */
-public class DeprecatedListWriter extends SubWriterHolderWriter {
-
-    private String getAnchorName(DeprElementKind kind) {
-        switch (kind) {
-            case REMOVAL:
-                return "forRemoval";
-            case MODULE:
-                return "module";
-            case PACKAGE:
-                return "package";
-            case INTERFACE:
-                return "interface";
-            case CLASS:
-                return "class";
-            case ENUM:
-                return "enum.class";
-            case EXCEPTION:
-                return "exception";
-            case ERROR:
-                return "error";
-            case ANNOTATION_TYPE:
-                return "annotation.interface";
-            case FIELD:
-                return "field";
-            case METHOD:
-                return "method";
-            case CONSTRUCTOR:
-                return "constructor";
-            case ENUM_CONSTANT:
-                return "enum.constant";
-            case ANNOTATION_TYPE_MEMBER:
-                return "annotation.interface.member";
-            case RECORD_CLASS:
-                return "record.class";
-            default:
-                throw new AssertionError("unknown kind: " + kind);
-        }
-    }
-
-    private String getHeadingKey(DeprElementKind kind) {
-        switch (kind) {
-            case REMOVAL:
-                return "doclet.For_Removal";
-            case MODULE:
-                return "doclet.Modules";
-            case PACKAGE:
-                return "doclet.Packages";
-            case INTERFACE:
-                return "doclet.Interfaces";
-            case CLASS:
-                return "doclet.Classes";
-            case ENUM:
-                return "doclet.Enums";
-            case EXCEPTION:
-                return "doclet.Exceptions";
-            case ERROR:
-                return "doclet.Errors";
-            case ANNOTATION_TYPE:
-                return "doclet.Annotation_Types";
-            case RECORD_CLASS:
-                return "doclet.RecordClasses";
-            case FIELD:
-                return "doclet.Fields";
-            case METHOD:
-                return "doclet.Methods";
-            case CONSTRUCTOR:
-                return "doclet.Constructors";
-            case ENUM_CONSTANT:
-                return "doclet.Enum_Constants";
-            case ANNOTATION_TYPE_MEMBER:
-                return "doclet.Annotation_Type_Members";
-            default:
-                throw new AssertionError("unknown kind: " + kind);
-        }
-    }
-
-    private String getSummaryKey(DeprElementKind kind) {
-        switch (kind) {
-            case REMOVAL:
-                return "doclet.for_removal";
-            case MODULE:
-                return "doclet.modules";
-            case PACKAGE:
-                return "doclet.packages";
-            case INTERFACE:
-                return "doclet.interfaces";
-            case CLASS:
-                return "doclet.classes";
-            case ENUM:
-                return "doclet.enums";
-            case EXCEPTION:
-                return "doclet.exceptions";
-            case ERROR:
-                return "doclet.errors";
-            case ANNOTATION_TYPE:
-                return "doclet.annotation_types";
-            case RECORD_CLASS:
-                return "doclet.record_classes";
-            case FIELD:
-                return "doclet.fields";
-            case METHOD:
-                return "doclet.methods";
-            case CONSTRUCTOR:
-                return "doclet.constructors";
-            case ENUM_CONSTANT:
-                return "doclet.enum_constants";
-            case ANNOTATION_TYPE_MEMBER:
-                return "doclet.annotation_type_members";
-            default:
-                throw new AssertionError("unknown kind: " + kind);
-        }
-    }
-
-    private String getHeaderKey(DeprElementKind kind) {
-        switch (kind) {
-            case REMOVAL:
-                return "doclet.Element";
-            case MODULE:
-                return "doclet.Module";
-            case PACKAGE:
-                return "doclet.Package";
-            case INTERFACE:
-                return "doclet.Interface";
-            case CLASS:
-                return "doclet.Class";
-            case ENUM:
-                return "doclet.Enum";
-            case EXCEPTION:
-                return "doclet.Exceptions";
-            case ERROR:
-                return "doclet.Errors";
-            case ANNOTATION_TYPE:
-                return "doclet.AnnotationType";
-            case RECORD_CLASS:
-                return "doclet.RecordClass";
-            case FIELD:
-                return "doclet.Field";
-            case METHOD:
-                return "doclet.Method";
-            case CONSTRUCTOR:
-                return "doclet.Constructor";
-            case ENUM_CONSTANT:
-                return "doclet.Enum_Constant";
-            case ANNOTATION_TYPE_MEMBER:
-                return "doclet.Annotation_Type_Member";
-            default:
-                throw new AssertionError("unknown kind: " + kind);
-        }
-    }
-
-    private EnumMap<DeprElementKind, AbstractMemberWriter> writerMap;
+public class DeprecatedListWriter extends SummaryListWriter<DeprecatedAPIListBuilder> {
 
     /**
      * Constructor.
@@ -223,42 +58,8 @@ private String getHeaderKey(DeprElementKind kind) {
      */
 
     public DeprecatedListWriter(HtmlConfiguration configuration, DocPath filename) {
-        super(configuration, filename);
-        NestedClassWriterImpl classW = new NestedClassWriterImpl(this);
-        writerMap = new EnumMap<>(DeprElementKind.class);
-        for (DeprElementKind kind : DeprElementKind.values()) {
-            switch (kind) {
-                case REMOVAL:
-                case MODULE:
-                case PACKAGE:
-                case INTERFACE:
-                case CLASS:
-                case ENUM:
-                case EXCEPTION:
-                case ERROR:
-                case ANNOTATION_TYPE:
-                case RECORD_CLASS:
-                    writerMap.put(kind, classW);
-                    break;
-                case FIELD:
-                    writerMap.put(kind, new FieldWriterImpl(this));
-                    break;
-                case METHOD:
-                    writerMap.put(kind, new MethodWriterImpl(this));
-                    break;
-                case CONSTRUCTOR:
-                    writerMap.put(kind, new ConstructorWriterImpl(this));
-                    break;
-                case ENUM_CONSTANT:
-                    writerMap.put(kind, new EnumConstantWriterImpl(this));
-                    break;
-                case ANNOTATION_TYPE_MEMBER:
-                    writerMap.put(kind, new AnnotationTypeOptionalMemberWriterImpl(this, null));
-                    break;
-                default:
-                   throw new AssertionError("unknown kind: " + kind);
-            }
-        }
+        super(configuration, filename, PageMode.DEPRECATED, "deprecated elements",
+              configuration.contents.deprecatedAPI, "doclet.Window_Deprecated_List");
     }
 
     /**
@@ -273,162 +74,30 @@ public static void generate(HtmlConfiguration configuration) throws DocFileIOExc
         if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.DEPRECATED)) {
             DocPath filename = DocPaths.DEPRECATED_LIST;
             DeprecatedListWriter depr = new DeprecatedListWriter(configuration, filename);
-            depr.generateDeprecatedListFile(configuration.deprecatedAPIListBuilder);
-        }
-    }
-
-    /**
-     * Generate the deprecated API list.
-     *
-     * @param deprAPI list of deprecated API built already.
-     * @throws DocFileIOException if there is a problem writing the deprecated list
-     */
-    protected void generateDeprecatedListFile(DeprecatedAPIListBuilder deprAPI)
-            throws DocFileIOException {
-        HtmlTree body = getHeader();
-        bodyContents.addMainContent(getContentsList(deprAPI));
-        Content content = new ContentBuilder();
-        for (DeprElementKind kind : DeprElementKind.values()) {
-            if (deprAPI.hasDocumentation(kind)) {
-                TableHeader memberTableHeader = new TableHeader(
-                        contents.getContent(getHeaderKey(kind)), contents.descriptionLabel);
-                addDeprecatedAPI(deprAPI.getSet(kind), getAnchorName(kind),
-                            getHeadingKey(kind), memberTableHeader, content);
-            }
-        }
-        bodyContents.addMainContent(content);
-        bodyContents.setFooter(getFooter());
-        String description = "deprecated elements";
-        body.add(bodyContents);
-        printHtmlDocument(null, description, body);
-
-        if (!deprAPI.isEmpty() && configuration.mainIndex != null) {
-            configuration.mainIndex.add(IndexItem.of(IndexItem.Category.TAGS,
-                    resources.getText("doclet.Deprecated_API"), path));
+            depr.generateSummaryListFile(configuration.deprecatedAPIListBuilder);
         }
     }
 
-    /**
-     * Add the index link.
-     *
-     * @param builder the deprecated list builder
-     * @param kind the kind of list being documented
-     * @param contentTree the content tree to which the index link will be added
-     */
-    private void addIndexLink(DeprecatedAPIListBuilder builder,
-            DeprElementKind kind, Content contentTree) {
-        if (builder.hasDocumentation(kind)) {
-            Content li = HtmlTree.LI(links.createLink(getAnchorName(kind),
-                    contents.getContent(getHeadingKey(kind))));
-            contentTree.add(li);
-        }
+    @Override
+    protected void addExtraSection(DeprecatedAPIListBuilder list, Content content) {
+        addSummaryAPI(list.getForRemoval(), "forRemoval",
+                    "doclet.For_Removal", "doclet.Element", content);
     }
 
-    /**
-     * Get the contents list.
-     *
-     * @param deprapi the deprecated list builder
-     * @return a content tree for the contents list
-     */
-    public Content getContentsList(DeprecatedAPIListBuilder deprapi) {
-        Content headContent = contents.deprecatedAPI;
-        Content heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        Content headingContent = contents.contentsHeading;
-        div.add(HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
-                headingContent));
-        Content ul = new HtmlTree(TagName.UL);
-        for (DeprElementKind kind : DeprElementKind.values()) {
-            addIndexLink(deprapi, kind, ul);
+    @Override
+    protected void addExtraIndexLink(DeprecatedAPIListBuilder list, Content target) {
+        if (!list.getForRemoval().isEmpty()) {
+            addIndexLink("forRemoval", "doclet.For_Removal", target);
         }
-        div.add(ul);
-        return div;
     }
 
-    /**
-     * Get the header for the deprecated API Listing.
-     *
-     * @return a content tree for the header
-     */
-    public HtmlTree getHeader() {
-        String title = resources.getText("doclet.Window_Deprecated_List");
-        HtmlTree bodyTree = getBody(getWindowTitle(title));
-        bodyContents.setHeader(getHeader(PageMode.DEPRECATED));
-        return bodyTree;
-    }
-
-    /**
-     * Add deprecated information to the documentation tree
-     *
-     * @param deprList list of deprecated API elements
-     * @param id the id attribute of the table
-     * @param headingKey the caption for the deprecated table
-     * @param tableHeader table headers for the deprecated table
-     * @param contentTree the content tree to which the deprecated table will be added
-     */
-    protected void addDeprecatedAPI(SortedSet<Element> deprList, String id, String headingKey,
-            TableHeader tableHeader, Content contentTree) {
-        if (deprList.size() > 0) {
-            Content caption = contents.getContent(headingKey);
-            Table table = new Table(HtmlStyle.summaryTable)
-                    .setCaption(caption)
-                    .setHeader(tableHeader)
-                    .setId(id)
-                    .setColumnStyles(HtmlStyle.colDeprecatedItemName, HtmlStyle.colLast);
-            for (Element e : deprList) {
-                Content link;
-                switch (e.getKind()) {
-                    case MODULE:
-                        ModuleElement m = (ModuleElement) e;
-                        link = getModuleLink(m, new StringContent(m.getQualifiedName()));
-                        break;
-                    case PACKAGE:
-                        PackageElement pkg = (PackageElement) e;
-                        link = getPackageLink(pkg, getPackageName(pkg));
-                        break;
-                    default:
-                        link = getDeprecatedLink(e);
-                }
-                Content desc = new ContentBuilder();
-                List<? extends DeprecatedTree> tags = utils.getDeprecatedTrees(e);
-                if (!tags.isEmpty()) {
-                    addInlineDeprecatedComment(e, tags.get(0), desc);
-                } else {
-                    desc.add(HtmlTree.EMPTY);
-                }
-                table.addRow(link, desc);
-            }
-            // note: singleton list
-            contentTree.add(HtmlTree.UL(HtmlStyle.blockList, HtmlTree.LI(table)));
+    protected void addComments(Element e, Content desc) {
+        List<? extends DeprecatedTree> tags = utils.getDeprecatedTrees(e);
+        if (!tags.isEmpty()) {
+            addInlineDeprecatedComment(e, tags.get(0), desc);
+        } else {
+            desc.add(HtmlTree.EMPTY);
         }
     }
 
-    protected Content getDeprecatedLink(Element e) {
-        AbstractMemberWriter writer;
-        switch (e.getKind()) {
-            case INTERFACE:
-            case CLASS:
-            case ENUM:
-            case ANNOTATION_TYPE:
-            case RECORD:
-                writer = new NestedClassWriterImpl(this);
-                break;
-            case FIELD:
-                writer = new FieldWriterImpl(this);
-                break;
-            case METHOD:
-                writer = new MethodWriterImpl(this);
-                break;
-            case CONSTRUCTOR:
-                writer = new ConstructorWriterImpl(this);
-                break;
-            case ENUM_CONSTANT:
-                writer = new EnumConstantWriterImpl(this);
-                break;
-            default:
-                writer = new AnnotationTypeOptionalMemberWriterImpl(this, null);
-        }
-        return writer.getDeprecatedLink(e);
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
index 914b07041213f..0c8f32ee08dae 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,11 @@ public void addDeprecated(VariableElement enumConstant, Content enumConstantsTre
         addDeprecatedInfo(enumConstant, enumConstantsTree);
     }
 
+    @Override
+    public void addPreview(VariableElement enumConstant, Content enumConstantsTree) {
+        addPreviewInfo(enumConstant, enumConstantsTree);
+    }
+
     @Override
     public void addComments(VariableElement enumConstant, Content enumConstantsTree) {
         addComment(enumConstant, enumConstantsTree);
@@ -172,9 +177,9 @@ protected void addSummaryType(Element member, Content tdSummaryType) {
     }
 
     @Override
-    protected Content getDeprecatedLink(Element member) {
+    protected Content getSummaryLink(Element member) {
         String name = utils.getFullyQualifiedName(member) + "." + member.getSimpleName();
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member, name);
+        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER_DEPRECATED_PREVIEW, member, name);
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
index 805fb512faecb..2fe6e8ec325a6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,11 @@ public void addDeprecated(VariableElement field, Content fieldTree) {
         addDeprecatedInfo(field, fieldTree);
     }
 
+    @Override
+    public void addPreview(VariableElement field, Content fieldTree) {
+        addPreviewInfo(field, fieldTree);
+    }
+
     @Override
     public void addComments(VariableElement field, Content fieldTree) {
         if (!utils.getFullBody(field).isEmpty()) {
@@ -199,9 +204,9 @@ protected void addSummaryType(Element member, Content tdSummaryType) {
     }
 
     @Override
-    protected Content getDeprecatedLink(Element member) {
+    protected Content getSummaryLink(Element member) {
         String name = utils.getFullyQualifiedName(member) + "." + member.getSimpleName();
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member, name);
+        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER_DEPRECATED_PREVIEW, member, name);
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
index 6e8400e24f60f..ddab4e374a767 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -232,6 +232,15 @@ protected void addHelpFileContents(Content contentTree) {
             contentTree.add(section);
         }
 
+        // Preview
+        if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.PREVIEW)) {
+            section = newHelpSection(contents.previewAPI);
+            Content previewBody = getContent("doclet.help.preview.body",
+                    links.createLink(DocPaths.PREVIEW_LIST, contents.previewAPI));
+            section.add(HtmlTree.P(previewBody));
+            contentTree.add(section);
+        }
+
         // Index
         if (options.createIndex()) {
             DocPath dp = options.splitIndex()
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
index 985c36aa26b37..21ad94f70ca34 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.doclets.toolkit.util.PreviewAPIListBuilder;
 
 /**
  * Configure the output based on the command-line options.
@@ -120,7 +121,14 @@ public class HtmlConfiguration extends BaseConfiguration {
      */
     protected DeprecatedAPIListBuilder deprecatedAPIListBuilder;
 
-    private Contents contents;
+    /**
+     * The collection of preview items, if any, to be displayed on the preview-list page,
+     * or null if the page should not be generated.
+     * The page will not be generated if there are no preview elements being documented.
+     */
+    protected PreviewAPIListBuilder previewAPIListBuilder;
+
+    public Contents contents;
 
     protected final Messages messages;
 
@@ -136,7 +144,7 @@ public class HtmlConfiguration extends BaseConfiguration {
     // Note: this should (eventually) be merged with Navigation.PageMode,
     // which performs a somewhat similar role
     public enum ConditionalPage {
-        CONSTANT_VALUES, DEPRECATED, SERIALIZED_FORM, SYSTEM_PROPERTIES
+        CONSTANT_VALUES, DEPRECATED, PREVIEW, SERIALIZED_FORM, SYSTEM_PROPERTIES
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index 9ad40d5b51ddc..403ba2f687987 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
+import jdk.javadoc.internal.doclets.toolkit.util.PreviewAPIListBuilder;
 
 /**
  * The class with "start" method, calls individual Writers.
@@ -175,6 +176,11 @@ public void generateClassFiles(ClassTree classTree) throws DocletException {
                 configuration.conditionalPages.add(HtmlConfiguration.ConditionalPage.DEPRECATED);
             }
         }
+        PreviewAPIListBuilder builder = new PreviewAPIListBuilder(configuration);
+        if (!builder.isEmpty()) {
+            configuration.previewAPIListBuilder = builder;
+            configuration.conditionalPages.add(HtmlConfiguration.ConditionalPage.PREVIEW);
+        }
 
         super.generateClassFiles(classTree);
     }
@@ -223,6 +229,10 @@ protected void generateOtherFiles(ClassTree classtree)
             DeprecatedListWriter.generate(configuration);
         }
 
+        if (configuration.conditionalPages.contains((HtmlConfiguration.ConditionalPage.PREVIEW))) {
+            PreviewListWriter.generate(configuration);
+        }
+
         if (options.createOverview()) {
             if (configuration.showModules) {
                 ModuleIndexWriter.generate(configuration);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 72139a95cd36b..b4eb2066f9183 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
@@ -105,8 +107,11 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
-import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils.DeclarationPreviewLanguageFeatures;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils.ElementFlag;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils.PreviewSummary;
 
 import static com.sun.source.doctree.DocTree.Kind.CODE;
 import static com.sun.source.doctree.DocTree.Kind.COMMENT;
@@ -648,16 +653,35 @@ public Content getPackageLink(PackageElement packageElement, Content label) {
                 }
             }
         }
+        Set<ElementFlag> flags;
+        if (packageElement != null) {
+            flags = utils.elementFlags(packageElement);
+        } else {
+            flags = EnumSet.noneOf(ElementFlag.class);
+        }
+        DocLink targetLink = null;
         if (included || packageElement == null) {
-            return links.createLink(pathString(packageElement, DocPaths.PACKAGE_SUMMARY),
-                    label);
+            targetLink = new DocLink(pathString(packageElement, DocPaths.PACKAGE_SUMMARY));
         } else {
-            DocLink crossPkgLink = getCrossPackageLink(packageElement);
-            if (crossPkgLink != null) {
-                return links.createLink(crossPkgLink, label);
-            } else {
-                return label;
+            targetLink = getCrossPackageLink(packageElement);
+        }
+        if (targetLink != null) {
+            if (flags.contains(ElementFlag.PREVIEW)) {
+                return new ContentBuilder(
+                    links.createLink(targetLink, label),
+                    HtmlTree.SUP(links.createLink(targetLink.withFragment(getPreviewSectionAnchor(packageElement)),
+                                                  contents.previewMark))
+                );
             }
+            return links.createLink(targetLink, label);
+        } else {
+            if (flags.contains(ElementFlag.PREVIEW)) {
+                return new ContentBuilder(
+                    label,
+                    HtmlTree.SUP(contents.previewMark)
+                );
+            }
+            return label;
         }
     }
 
@@ -669,10 +693,28 @@ public Content getPackageLink(PackageElement packageElement, Content label) {
      * @return a content for the module link
      */
     public Content getModuleLink(ModuleElement mdle, Content label) {
+        Set<ElementFlag> flags = mdle != null ? utils.elementFlags(mdle)
+                                              : EnumSet.noneOf(ElementFlag.class);
         boolean included = utils.isIncluded(mdle);
-        return (included)
-                ? links.createLink(pathToRoot.resolve(docPaths.moduleSummary(mdle)), label, "", "")
-                : label;
+        if (included) {
+            DocLink targetLink = new DocLink(pathToRoot.resolve(docPaths.moduleSummary(mdle)));
+            Content link = links.createLink(targetLink, label, "", "");
+            if (flags.contains(ElementFlag.PREVIEW) && label != contents.moduleLabel) {
+                link = new ContentBuilder(
+                        link,
+                        HtmlTree.SUP(links.createLink(targetLink.withFragment(getPreviewSectionAnchor(mdle)),
+                                                      contents.previewMark))
+                );
+            }
+            return link;
+        }
+        if (flags.contains(ElementFlag.PREVIEW)) {
+            return new ContentBuilder(
+                label,
+                HtmlTree.SUP(contents.previewMark)
+            );
+        }
+        return label;
     }
 
     public Content interfaceName(TypeElement typeElement, boolean qual) {
@@ -969,6 +1011,7 @@ public Content getDocLink(LinkInfoImpl.Kind context, TypeElement typeElement, El
             return getLink(new LinkInfoImpl(configuration, context, typeElement)
                 .label(label)
                 .where(links.getAnchor(ee, isProperty))
+                .targetMember(element)
                 .strong(strong));
         }
 
@@ -976,6 +1019,7 @@ public Content getDocLink(LinkInfoImpl.Kind context, TypeElement typeElement, El
             return getLink(new LinkInfoImpl(configuration, context, typeElement)
                 .label(label)
                 .where(links.getName(element.getSimpleName().toString()))
+                .targetMember(element)
                 .strong(strong));
         }
 
@@ -1001,10 +1045,11 @@ public Content getDocLink(LinkInfoImpl.Kind context, TypeElement typeElement, El
             ExecutableElement emd = (ExecutableElement) element;
             return getLink(new LinkInfoImpl(configuration, context, typeElement)
                 .label(label)
-                .where(links.getAnchor(emd)));
+                .where(links.getAnchor(emd))
+                .targetMember(element));
         } else if (utils.isVariableElement(element) || utils.isTypeElement(element)) {
             return getLink(new LinkInfoImpl(configuration, context, typeElement)
-                .label(label).where(links.getName(element.getSimpleName().toString())));
+                .label(label).where(links.getName(element.getSimpleName().toString())).targetMember(element));
         } else {
             return label;
         }
@@ -1198,6 +1243,17 @@ public void addSummaryComment(Element element, Content htmltree) {
         addSummaryComment(element, utils.getFirstSentenceTrees(element), htmltree);
     }
 
+    /**
+     * Adds the preview content.
+     *
+     * @param element the Element for which the summary will be generated
+     * @param firstSentenceTags the first sentence tags for the doc
+     * @param htmltree the documentation tree to which the summary will be added
+     */
+    public void addPreviewComment(Element element, List<? extends DocTree> firstSentenceTags, Content htmltree) {
+        addCommentTags(element, firstSentenceTags, false, true, true, htmltree);
+    }
+
     /**
      * Adds the summary content.
      *
@@ -1261,8 +1317,7 @@ private void addCommentTags(Element element, DocTree holderTag, List<? extends D
         if (depr) {
             div = HtmlTree.DIV(HtmlStyle.deprecationComment, result);
             htmltree.add(div);
-        }
-        else {
+        } else {
             div = HtmlTree.DIV(HtmlStyle.block, result);
             htmltree.add(div);
         }
@@ -2120,4 +2175,159 @@ private List<DocPath> getStylesheets(Element element) throws DocFileIOException
     Content getVerticalSeparator() {
         return HtmlTree.SPAN(HtmlStyle.verticalSeparator, new FixedStringContent("|"));
     }
+
+    public void addPreviewSummary(Element forWhat, Content target) {
+        if (utils.isPreviewAPI(forWhat)) {
+            Content div = HtmlTree.DIV(HtmlStyle.block);
+            div.add(HtmlTree.SPAN(HtmlStyle.previewLabel, contents.previewPhrase));
+            target.add(div);
+        }
+    }
+
+    public void addPreviewInfo(Element forWhat, Content target) {
+        if (utils.isPreviewAPI(forWhat)) {
+            //in Java platform:
+            HtmlTree previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
+            previewDiv.setId(getPreviewSectionAnchor(forWhat));
+            String name = (switch (forWhat.getKind()) {
+                case PACKAGE, MODULE ->
+                        ((QualifiedNameable) forWhat).getQualifiedName();
+                case CONSTRUCTOR ->
+                        ((TypeElement) forWhat.getEnclosingElement()).getSimpleName();
+                default -> forWhat.getSimpleName();
+            }).toString();
+            Content nameCode = HtmlTree.CODE(new StringContent(name));
+            boolean isReflectivePreview = utils.isReflectivePreviewAPI(forWhat);
+            String leadingNoteKey =
+                    !isReflectivePreview ? "doclet.PreviewPlatformLeadingNote"
+                                         : "doclet.ReflectivePreviewPlatformLeadingNote";
+            Content leadingNote =
+                    contents.getContent(leadingNoteKey, nameCode);
+            previewDiv.add(HtmlTree.SPAN(HtmlStyle.previewLabel,
+                                         leadingNote));
+            if (!isReflectivePreview) {
+                Content note1 = contents.getContent("doclet.PreviewTrailingNote1", nameCode);
+                previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note1));
+            }
+            Content note2 = contents.getContent("doclet.PreviewTrailingNote2", nameCode);
+            previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note2));
+            target.add(previewDiv);
+        } else if (forWhat.getKind().isClass() || forWhat.getKind().isInterface()) {
+            //in custom code:
+            List<Content> previewNotes = getPreviewNotes((TypeElement) forWhat);
+            if (!previewNotes.isEmpty()) {
+                Name name = forWhat.getSimpleName();
+                Content nameCode = HtmlTree.CODE(new StringContent(name));
+                HtmlTree previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
+                previewDiv.setId(getPreviewSectionAnchor(forWhat));
+                Content leadingNote = contents.getContent("doclet.PreviewLeadingNote", nameCode);
+                previewDiv.add(HtmlTree.SPAN(HtmlStyle.previewLabel,
+                                             leadingNote));
+                HtmlTree ul = new HtmlTree(TagName.UL);
+                ul.setStyle(HtmlStyle.previewComment);
+                for (Content note : previewNotes) {
+                    ul.add(HtmlTree.LI(note));
+                }
+                previewDiv.add(ul);
+                Content note1 =
+                        contents.getContent("doclet.PreviewTrailingNote1",
+                                            nameCode);
+                previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note1));
+                Content note2 =
+                        contents.getContent("doclet.PreviewTrailingNote2",
+                                            name);
+                previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note2));
+                target.add(previewDiv);
+            }
+        }
+    }
+
+    @SuppressWarnings("preview")
+    private List<Content> getPreviewNotes(TypeElement el) {
+        String className = el.getSimpleName().toString();
+        List<Content> result = new ArrayList<>();
+        PreviewSummary previewAPITypes = utils.declaredUsingPreviewAPIs(el);
+        Set<TypeElement> previewAPI = new HashSet<>(previewAPITypes.previewAPI);
+        Set<TypeElement> reflectivePreviewAPI = new HashSet<>(previewAPITypes.reflectivePreviewAPI);
+        Set<TypeElement> declaredUsingPreviewFeature = new HashSet<>(previewAPITypes.declaredUsingPreviewFeature);
+        Set<DeclarationPreviewLanguageFeatures> previewLanguageFeatures = new HashSet<>();
+        for (Element enclosed : el.getEnclosedElements()) {
+            if (!utils.isIncluded(enclosed)) {
+                continue;
+            }
+            if (!enclosed.getKind().isClass() && !enclosed.getKind().isInterface()) {
+                PreviewSummary memberAPITypes = utils.declaredUsingPreviewAPIs(enclosed);
+                declaredUsingPreviewFeature.addAll(memberAPITypes.declaredUsingPreviewFeature);
+                previewAPI.addAll(memberAPITypes.previewAPI);
+                reflectivePreviewAPI.addAll(memberAPITypes.reflectivePreviewAPI);
+                previewLanguageFeatures.addAll(utils.previewLanguageFeaturesUsed(enclosed));
+            } else if (!utils.previewLanguageFeaturesUsed(enclosed).isEmpty()) {
+                declaredUsingPreviewFeature.add((TypeElement) enclosed);
+            }
+        }
+        previewLanguageFeatures.addAll(utils.previewLanguageFeaturesUsed(el));
+        if (!previewLanguageFeatures.isEmpty()) {
+            if (previewLanguageFeatures.contains(DeclarationPreviewLanguageFeatures.SEALED_PERMITS)) {
+                previewLanguageFeatures.remove(DeclarationPreviewLanguageFeatures.SEALED);
+            }
+            for (DeclarationPreviewLanguageFeatures feature : previewLanguageFeatures) {
+                String featureDisplayName =
+                        resources.getText("doclet.Declared_Using_Preview." + feature.name());
+                result.add(withPreviewFeatures("doclet.Declared_Using_Preview", className,
+                                               featureDisplayName, feature.features));
+            }
+        }
+        if (!declaredUsingPreviewFeature.isEmpty()) {
+            result.add(withLinks("doclet.UsesDeclaredUsingPreview", className, declaredUsingPreviewFeature));
+        }
+        if (!previewAPI.isEmpty()) {
+            result.add(withLinks("doclet.PreviewAPI", className, previewAPI));
+        }
+        if (!reflectivePreviewAPI.isEmpty()) {
+            result.add(withLinks("doclet.ReflectivePreviewAPI", className, reflectivePreviewAPI));
+        }
+        return result;
+    }
+
+    private Content withPreviewFeatures(String key, String className, String featureName, List<String> features) {
+        String[] sep = new String[] {""};
+        ContentBuilder featureCodes = new ContentBuilder();
+        features.stream()
+                .forEach(c -> {
+                    featureCodes.add(sep[0]);
+                    featureCodes.add(HtmlTree.CODE(new ContentBuilder().add(c)));
+                    sep[0] = ", ";
+                });
+        return contents.getContent(key,
+                                   HtmlTree.CODE(new StringContent(className)),
+                                   new HtmlTree(TagName.EM).add(featureName),
+                                   featureCodes);
+    }
+
+    private Content withLinks(String key, String className, Set<TypeElement> elements) {
+        String[] sep = new String[] {""};
+        ContentBuilder links = new ContentBuilder();
+        elements.stream()
+                .sorted((te1, te2) -> te1.getSimpleName().toString().compareTo(te2.getSimpleName().toString()))
+                .distinct()
+                .map(te -> getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS, te).label(HtmlTree.CODE(new StringContent(te.getSimpleName()))).skipPreview(true)))
+                .forEach(c -> {
+                    links.add(sep[0]);
+                    links.add(c);
+                    sep[0] = ", ";
+                });
+        return contents.getContent(key,
+                                   HtmlTree.CODE(new StringContent(className)),
+                                   links);
+    }
+
+    public String getPreviewSectionAnchor(Element el) {
+        return "preview-" + switch (el.getKind()) {
+            case CONSTRUCTOR, METHOD ->
+                links.getAnchor((ExecutableElement) el);
+            case PACKAGE -> getPackageAnchorName((PackageElement) el);
+            default -> utils.getFullyQualifiedName(el, false);
+        };
+    }
+
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java
index 5772c252d5850..73bb866b4ead2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,9 @@
 package jdk.javadoc.internal.doclets.formats.html;
 
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -36,12 +38,15 @@
 
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils.ElementFlag;
 import jdk.javadoc.internal.doclets.toolkit.util.links.LinkFactory;
 import jdk.javadoc.internal.doclets.toolkit.util.links.LinkInfo;
 
@@ -78,12 +83,27 @@ protected Content getClassLink(LinkInfo linkInfo) {
         // Create a tool tip if we are linking to a class or interface.  Don't
         // create one if we are linking to a member.
         String title = "";
-        if (classLinkInfo.where == null || classLinkInfo.where.length() == 0) {
+        boolean hasWhere = classLinkInfo.where != null && classLinkInfo.where.length() != 0;
+        if (!hasWhere) {
             boolean isTypeLink = classLinkInfo.type != null &&
                      utils.isTypeVariable(utils.getComponentType(classLinkInfo.type));
             title = getClassToolTip(typeElement, isTypeLink);
         }
         Content label = classLinkInfo.getClassLinkLabel(configuration);
+        Set<ElementFlag> flags;
+        Element target;
+        boolean showPreview = !classLinkInfo.skipPreview;
+        if (!hasWhere && showPreview) {
+            flags = utils.elementFlags(typeElement);
+            target = typeElement;
+        } else if ((classLinkInfo.context == LinkInfoImpl.Kind.SEE_TAG || classLinkInfo.context == LinkInfoImpl.Kind.MEMBER_DEPRECATED_PREVIEW) &&
+                   classLinkInfo.targetMember != null && showPreview) {
+            flags = utils.elementFlags(classLinkInfo.targetMember);
+            target = classLinkInfo.targetMember;
+        } else {
+            flags = EnumSet.noneOf(ElementFlag.class);
+            target = null;
+        }
 
         Content link = new ContentBuilder();
         if (utils.isIncluded(typeElement)) {
@@ -97,6 +117,11 @@ protected Content getClassLink(LinkInfo linkInfo) {
                                 classLinkInfo.isStrong,
                                 title,
                                 classLinkInfo.target));
+                        if (flags.contains(ElementFlag.PREVIEW)) {
+                            link.add(HtmlTree.SUP(m_writer.links.createLink(
+                                    filename.fragment(m_writer.getPreviewSectionAnchor(target)),
+                                    m_writer.contents.previewMark)));
+                        }
                         if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
                             link.add(getTypeParameterLinks(linkInfo));
                         }
@@ -109,6 +134,13 @@ protected Content getClassLink(LinkInfo linkInfo) {
                 label, classLinkInfo.isStrong, true);
             if (crossLink != null) {
                 link.add(crossLink);
+                if (flags.contains(ElementFlag.PREVIEW)) {
+                    link.add(HtmlTree.SUP(m_writer.getCrossClassLink(
+                        typeElement,
+                        m_writer.getPreviewSectionAnchor(target),
+                        m_writer.contents.previewMark,
+                        false, false)));
+                }
                 if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
                     link.add(getTypeParameterLinks(linkInfo));
                 }
@@ -117,6 +149,9 @@ protected Content getClassLink(LinkInfo linkInfo) {
         }
         // Can't link so just write label.
         link.add(label);
+        if (flags.contains(ElementFlag.PREVIEW)) {
+            link.add(HtmlTree.SUP(m_writer.contents.previewMark));
+        }
         if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
             link.add(getTypeParameterLinks(linkInfo));
         }
@@ -171,7 +206,7 @@ protected Content getTypeParameterLinks(LinkInfo linkInfo, boolean isClassLabel)
      */
     protected Content getTypeParameterLink(LinkInfo linkInfo, TypeMirror typeParam) {
         LinkInfoImpl typeLinkInfo = new LinkInfoImpl(m_writer.configuration,
-                ((LinkInfoImpl) linkInfo).getContext(), typeParam);
+                ((LinkInfoImpl) linkInfo).getContext(), typeParam).skipPreview(true);
         typeLinkInfo.excludeTypeBounds = linkInfo.excludeTypeBounds;
         typeLinkInfo.excludeTypeParameterLinks = linkInfo.excludeTypeParameterLinks;
         typeLinkInfo.linkToSelf = linkInfo.linkToSelf;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java
index 8e886f9b88c7a..e3661bfcdb709 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
+import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
@@ -57,6 +58,11 @@ public enum Kind {
          */
         MEMBER,
 
+        /**
+         * Indicate that the link appears in member documentation on the Deprecated or Preview page.
+         */
+        MEMBER_DEPRECATED_PREVIEW,
+
         /**
          * Indicate that the link appears in class use documentation.
          */
@@ -235,6 +241,11 @@ public enum Kind {
      */
     public String where = "";
 
+    /**
+     * The member this link points to (if any).
+     */
+    public Element targetMember;
+
     /**
      * The value of the target.
      */
@@ -335,7 +346,23 @@ public LinkInfoImpl varargs(boolean varargs) {
     public LinkInfoImpl where(String where) {
         this.where = where;
         return this;
-     }
+    }
+
+    /**
+     * Set the member this link points to (if any).
+     */
+    public LinkInfoImpl targetMember(Element el) {
+        this.targetMember = el;
+        return this;
+    }
+
+    /**
+     * Set whether or not the preview flags should be skipped for this link.
+     */
+    public LinkInfoImpl skipPreview(boolean skipPreview) {
+        this.skipPreview = skipPreview;
+        return this;
+    }
 
     public Kind getContext() {
         return context;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
index 7c06e46e1afbb..001863e1b377a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,14 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
+import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
@@ -136,6 +138,11 @@ public void addDeprecated(ExecutableElement method, Content methodDocTree) {
         addDeprecatedInfo(method, methodDocTree);
     }
 
+    @Override
+    public void addPreview(ExecutableElement method, Content methodDocTree) {
+        addPreviewInfo(method, methodDocTree);
+    }
+
     @Override
     public void addComments(TypeMirror holderType, ExecutableElement method, Content methodDocTree) {
         TypeElement holder = utils.asTypeElement(holderType);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
index 5d04ba3212ab8..a2cad03d4a4c4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,7 @@ protected void addIndex(Content main) {
                     if (!(options.noDeprecated() && utils.isDeprecated(mdle))) {
                         Content moduleLinkContent = getModuleLink(mdle, new StringContent(mdle.getQualifiedName().toString()));
                         Content summaryContent = new ContentBuilder();
+                        addPreviewSummary(mdle, summaryContent);
                         addSummaryComment(mdle, summaryContent);
                         table.addRow(mdle, moduleLinkContent, summaryContent);
                     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
index 6581b73f70227..1b7013ba1214e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -617,6 +617,7 @@ public void addPackageSummary(HtmlTree li) {
                 row.add(getPackageExportOpensTo(entry.openedTo));
             }
             Content summary = new ContentBuilder();
+            addPreviewSummary(pkg, summary);
             addSummaryComment(pkg, summary);
             row.add(summary);
 
@@ -811,6 +812,7 @@ public void addDeprecationInfo(Content div) {
 
     @Override
     public void addModuleDescription(Content moduleContentTree) {
+        addPreviewInfo(mdle, moduleContentTree);
         if (!utils.getFullBody(mdle).isEmpty()) {
             HtmlTree tree = HtmlTree.SECTION(HtmlStyle.moduleDescription);
             tree.setId(SectionName.MODULE_DESCRIPTION.getName());
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
index 05c6399c29500..ec731b181f0ee 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,6 +97,7 @@ public enum PageMode {
         MODULE,
         OVERVIEW,
         PACKAGE,
+        PREVIEW,
         SERIALIZED_FORM,
         SYSTEM_PROPERTIES,
         TREE,
@@ -185,6 +186,7 @@ private void addMainNavLinks(Content tree) {
                 addPageLabel(tree, contents.useLabel, options.classUse());
                 addTreeLink(tree);
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
@@ -196,6 +198,7 @@ private void addMainNavLinks(Content tree) {
                 addPageLabel(tree, contents.useLabel, options.classUse());
                 addTreeLink(tree);
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
@@ -213,6 +216,7 @@ private void addMainNavLinks(Content tree) {
                             contents.treeLabel, "", ""));
                 }
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
@@ -230,6 +234,7 @@ private void addMainNavLinks(Content tree) {
                             contents.treeLabel, "", ""));
                 }
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
@@ -252,6 +257,7 @@ private void addMainNavLinks(Content tree) {
                             : links.createLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), contents.treeLabel));
                 }
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
@@ -268,12 +274,14 @@ private void addMainNavLinks(Content tree) {
                 addPageLabel(tree, contents.useLabel, options.classUse());
                 addActivePageLink(tree, contents.treeLabel, options.createTree());
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
             case DEPRECATED:
             case INDEX:
             case HELP:
+            case PREVIEW:
                 addOverviewLink(tree);
                 addModuleLink(tree);
                 addPackageLink(tree);
@@ -286,6 +294,12 @@ private void addMainNavLinks(Content tree) {
                 } else {
                     addDeprecatedLink(tree);
                 }
+                if (documentedPage == PageMode.PREVIEW) {
+                    addActivePageLink(tree, contents.previewLabel,
+                            configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.PREVIEW));
+                } else {
+                    addPreviewLink(tree);
+                }
                 if (documentedPage == PageMode.INDEX) {
                     addActivePageLink(tree, contents.indexLabel, options.createIndex());
                 } else {
@@ -309,6 +323,7 @@ private void addMainNavLinks(Content tree) {
                 addPageLabel(tree, contents.useLabel, options.classUse());
                 addTreeLink(tree);
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
@@ -320,6 +335,7 @@ private void addMainNavLinks(Content tree) {
                 addPageLabel(tree, contents.useLabel, options.classUse());
                 addTreeLink(tree);
                 addDeprecatedLink(tree);
+                addPreviewLink(tree);
                 addIndexLink(tree);
                 addHelpLink(tree);
                 break;
@@ -842,6 +858,13 @@ private void addDeprecatedLink(Content tree) {
         }
     }
 
+    private void addPreviewLink(Content tree) {
+        if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.PREVIEW)) {
+            tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.PREVIEW_LIST),
+                    contents.previewLabel, "", "")));
+        }
+    }
+
     private void addIndexLink(Content tree) {
         if (options.createIndex()) {
             tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
index 41c7b286e0746..4beed2ee89408 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,7 +145,7 @@ protected void addSummaryType(Element member, Content tdSummaryType) {
     }
 
     @Override
-    protected Content getDeprecatedLink(Element member) {
-        return writer.getQualifiedClassLink(LinkInfoImpl.Kind.MEMBER, member);
+    protected Content getSummaryLink(Element member) {
+        return writer.getQualifiedClassLink(LinkInfoImpl.Kind.MEMBER_DEPRECATED_PREVIEW, member);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
index 38dd65270bd31..e0c114eb127e5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -218,6 +218,7 @@ public void addClassesSummary(SortedSet<TypeElement> classes, String label,
                 Content classLink = getLink(new LinkInfoImpl(
                         configuration, LinkInfoImpl.Kind.PACKAGE, klass));
                 ContentBuilder description = new ContentBuilder();
+                addPreviewSummary(klass, description);
                 if (utils.isDeprecated(klass)) {
                     description.add(getDeprecatedPhrase(klass));
                     List<? extends DeprecatedTree> tags = utils.getDeprecatedTrees(klass);
@@ -235,6 +236,7 @@ public void addClassesSummary(SortedSet<TypeElement> classes, String label,
 
     @Override
     public void addPackageDescription(Content packageContentTree) {
+        addPreviewInfo(packageElement, packageContentTree);
         if (!utils.getBody(packageElement).isEmpty()) {
             HtmlTree tree = sectionTree;
             tree.setId(SectionName.PACKAGE_DESCRIPTION.getName());
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java
new file mode 100644
index 0000000000000..667e9266b6811
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.formats.html;
+
+import java.util.List;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.doclets.toolkit.util.PreviewAPIListBuilder;
+
+/**
+ * Generate File to list all the preview elements with the
+ * appropriate links.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ *
+ * @see java.util.List
+ */
+public class PreviewListWriter extends SummaryListWriter<PreviewAPIListBuilder> {
+
+    /**
+     * Constructor.
+     *
+     * @param configuration the configuration for this doclet
+     * @param filename the file to be generated
+     */
+
+    public PreviewListWriter(HtmlConfiguration configuration, DocPath filename) {
+        super(configuration, filename, PageMode.PREVIEW, "preview elements",
+              configuration.contents.previewAPI, "doclet.Window_Preview_List");
+    }
+
+    /**
+     * Get list of all the preview elements.
+     * Then instantiate PreviewListWriter and generate File.
+     *
+     * @param configuration the current configuration of the doclet.
+     * @throws DocFileIOException if there is a problem writing the preview list
+     */
+    public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
+        if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.PREVIEW)) {
+            DocPath filename = DocPaths.PREVIEW_LIST;
+            PreviewListWriter depr = new PreviewListWriter(configuration, filename);
+            depr.generateSummaryListFile(
+                   new PreviewAPIListBuilder(configuration));
+        }
+    }
+
+    @Override
+    protected void addComments(Element e, Content desc) {
+        List<? extends DocTree> tags = utils.getFirstSentenceTrees(e);
+        if (!tags.isEmpty()) {
+            addPreviewComment(e, tags, desc);
+        } else {
+            desc.add(HtmlTree.EMPTY);
+        }
+    }
+
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
index 5a56a3185515f..0d0106a484a27 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,10 @@ public Content getSignature(ExecutableElement property) {
     public void addDeprecated(ExecutableElement property, Content propertyDocTree) {
     }
 
+    @Override
+    public void addPreview(ExecutableElement property, Content propertyDocTree) {
+    }
+
     @Override
     public void addComments(ExecutableElement property, Content propertyDocTree) {
         TypeElement holder = (TypeElement)property.getEnclosingElement();
@@ -215,8 +219,8 @@ protected void addSummaryType(Element member, Content tdSummaryType) {
     }
 
     @Override
-    protected Content getDeprecatedLink(Element member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member,
+    protected Content getSummaryLink(Element member) {
+        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER_DEPRECATED_PREVIEW, member,
                 utils.getFullyQualifiedName(member));
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
index 6b404c96888f5..fc928550f062b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
@@ -156,7 +156,12 @@ public Content toContent() {
                 for (TypeMirror type : linkablePermits) {
                     if (isFirst) {
                         content.add(DocletConstants.NL);
-                        permitsSpan.add("permits ");
+                        permitsSpan.add("permits");
+                        Content link =
+                                classWriter.links.createLink(classWriter.getPreviewSectionAnchor(typeElement),
+                                                             classWriter.contents.previewMark);
+                        permitsSpan.add(HtmlTree.SUP(link));
+                        permitsSpan.add(" ");
                         isFirst = false;
                     } else {
                         permitsSpan.add(", ");
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
index 593005a09a02a..de136060babe6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 
@@ -109,6 +110,7 @@ protected void addIndexComment(Element member, Content contentTree) {
      */
     protected void addIndexComment(Element member, List<? extends DocTree> firstSentenceTags,
             Content tdSummary) {
+        addPreviewSummary(member, tdSummary);
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(member);
         Content div;
         if (utils.isDeprecated(member)) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
new file mode 100644
index 0000000000000..5c6ee8be672a8
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.formats.html;
+
+import java.util.SortedSet;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.PackageElement;
+
+import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
+import jdk.javadoc.internal.doclets.formats.html.markup.Table;
+import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
+import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
+import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.doclets.toolkit.util.SummaryAPIListBuilder;
+import jdk.javadoc.internal.doclets.toolkit.util.SummaryAPIListBuilder.SummaryElementKind;
+
+/**
+ * Generate File to list all the summary elements with the
+ * appropriate links.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ *
+ * @see java.util.List
+ */
+public abstract class SummaryListWriter<L extends SummaryAPIListBuilder> extends SubWriterHolderWriter {
+
+    private String getAnchorName(SummaryElementKind kind) {
+        return switch (kind) {
+            case MODULE -> "module";
+            case PACKAGE -> "package";
+            case INTERFACE -> "interface";
+            case CLASS -> "class";
+            case ENUM -> "enum.class";
+            case EXCEPTION -> "exception";
+            case ERROR -> "error";
+            case ANNOTATION_TYPE -> "annotation.interface";
+            case FIELD -> "field";
+            case METHOD -> "method";
+            case CONSTRUCTOR -> "constructor";
+            case ENUM_CONSTANT -> "enum.constant";
+            case ANNOTATION_TYPE_MEMBER -> "annotation.interface.member";
+            case RECORD_CLASS -> "record.class";
+        };
+    }
+
+    private String getHeadingKey(SummaryElementKind kind) {
+        return switch (kind) {
+            case MODULE -> "doclet.Modules";
+            case PACKAGE -> "doclet.Packages";
+            case INTERFACE -> "doclet.Interfaces";
+            case CLASS -> "doclet.Classes";
+            case ENUM -> "doclet.Enums";
+            case EXCEPTION -> "doclet.Exceptions";
+            case ERROR -> "doclet.Errors";
+            case ANNOTATION_TYPE -> "doclet.Annotation_Types";
+            case FIELD -> "doclet.Fields";
+            case METHOD -> "doclet.Methods";
+            case CONSTRUCTOR -> "doclet.Constructors";
+            case ENUM_CONSTANT -> "doclet.Enum_Constants";
+            case ANNOTATION_TYPE_MEMBER -> "doclet.Annotation_Type_Members";
+            case RECORD_CLASS -> "doclet.RecordClasses";
+        };
+    }
+
+    private String getHeaderKey(SummaryElementKind kind) {
+        return switch (kind) {
+            case MODULE -> "doclet.Module";
+            case PACKAGE -> "doclet.Package";
+            case INTERFACE -> "doclet.Interface";
+            case CLASS -> "doclet.Class";
+            case ENUM -> "doclet.Enum";
+            case EXCEPTION -> "doclet.Exceptions";
+            case ERROR -> "doclet.Errors";
+            case ANNOTATION_TYPE -> "doclet.AnnotationType";
+            case FIELD -> "doclet.Field";
+            case METHOD -> "doclet.Method";
+            case CONSTRUCTOR -> "doclet.Constructor";
+            case ENUM_CONSTANT -> "doclet.Enum_Constant";
+            case ANNOTATION_TYPE_MEMBER -> "doclet.Annotation_Type_Member";
+            case RECORD_CLASS -> "doclet.RecordClass";
+        };
+    }
+
+    private final PageMode pageMode;
+    private final String description;
+    private final Content headContent;
+    private final String titleKey;
+
+    /**
+     * Constructor.
+     *
+     * @param configuration the configuration for this doclet
+     * @param filename the file to be generated
+     * @param pageMode page mode to use
+     * @param description page description
+     * @param headContent page heading content
+     * @param titleKey page title resource key
+     */
+
+    public SummaryListWriter(HtmlConfiguration configuration, DocPath filename,
+                             PageMode pageMode, String description,
+                             Content headContent, String titleKey) {
+        super(configuration, filename);
+        this.pageMode = pageMode;
+        this.description = description;
+        this.headContent = headContent;
+        this.titleKey = titleKey;
+    }
+
+    /**
+     * Generate the API summary.
+     *
+     * @param summaryapi list of API summary built already.
+     * @throws DocFileIOException if there is a problem writing the summary list
+     */
+    protected void generateSummaryListFile(L summaryapi)
+            throws DocFileIOException {
+        HtmlTree body = getHeader();
+        bodyContents.addMainContent(getContentsList(summaryapi));
+        Content content = new ContentBuilder();
+        addExtraSection(summaryapi, content);
+        for (SummaryElementKind kind : SummaryElementKind.values()) {
+            if (summaryapi.hasDocumentation(kind)) {
+                addSummaryAPI(summaryapi.getSet(kind), getAnchorName(kind),
+                            getHeadingKey(kind), getHeaderKey(kind), content);
+            }
+        }
+        bodyContents.addMainContent(content);
+        bodyContents.setFooter(getFooter());
+        body.add(bodyContents);
+        printHtmlDocument(null, description, body);
+    }
+
+    /**
+     * Add the index link.
+     *
+     * @param builder the summary list builder
+     * @param kind the kind of list being documented
+     * @param contentTree the content tree to which the index link will be added
+     */
+    protected void addIndexLink(String anchorName, String headingKey,
+                                Content contentTree) {
+        Content li = HtmlTree.LI(links.createLink(anchorName,
+                contents.getContent(headingKey)));
+        contentTree.add(li);
+    }
+
+    /**
+     * Get the contents list.
+     *
+     * @param apisummary the summary list builder
+     * @return a content tree for the contents list
+     */
+    public Content getContentsList(L apisummary) {
+        Content heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+                HtmlStyle.title, headContent);
+        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
+        Content headingContent = contents.contentsHeading;
+        div.add(HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
+                headingContent));
+        Content ul = new HtmlTree(TagName.UL);
+        addExtraIndexLink(apisummary, ul);
+        for (SummaryElementKind kind : SummaryElementKind.values()) {
+            if (apisummary.hasDocumentation(kind)) {
+                addIndexLink(getAnchorName(kind), getHeadingKey(kind), ul);
+            }
+        }
+        div.add(ul);
+        return div;
+    }
+
+    /**
+     * Get the header for the API Summary Listing.
+     *
+     * @return a content tree for the header
+     */
+    public HtmlTree getHeader() {
+        String title = resources.getText(titleKey);
+        HtmlTree bodyTree = getBody(getWindowTitle(title));
+        bodyContents.setHeader(getHeader(pageMode));
+        return bodyTree;
+    }
+
+    /**
+     * Add summary information to the documentation tree
+     *
+     * @param apiList list of API summary elements
+     * @param id the id attribute of the table
+     * @param headingKey the caption for the summary table
+     * @param headerKey table header key for the summary table
+     * @param contentTree the content tree to which the summary table will be added
+     */
+    protected void addSummaryAPI(SortedSet<Element> apiList, String id,
+                                 String headingKey, String headerKey,
+                                 Content contentTree) {
+        if (apiList.size() > 0) {
+            TableHeader tableHeader = new TableHeader(
+                    contents.getContent(headerKey), contents.descriptionLabel);
+
+            Content caption = contents.getContent(headingKey);
+            Table table = new Table(HtmlStyle.summaryTable)
+                    .setCaption(caption)
+                    .setHeader(tableHeader)
+                    .setId(id)
+                    .setColumnStyles(HtmlStyle.colSummaryItemName, HtmlStyle.colLast);
+            for (Element e : apiList) {
+                Content link;
+                switch (e.getKind()) {
+                    case MODULE:
+                        ModuleElement m = (ModuleElement) e;
+                        link = getModuleLink(m, new StringContent(m.getQualifiedName()));
+                        break;
+                    case PACKAGE:
+                        PackageElement pkg = (PackageElement) e;
+                        link = getPackageLink(pkg, getPackageName(pkg));
+                        break;
+                    default:
+                        link = getSummaryLink(e);
+                }
+                Content desc = new ContentBuilder();
+                addComments(e, desc);
+                table.addRow(link, desc);
+            }
+            // note: singleton list
+            contentTree.add(HtmlTree.UL(HtmlStyle.blockList, HtmlTree.LI(table)));
+        }
+    }
+
+    /**
+     * Add summary text for the given element.
+     *
+     * @param e the element for which the summary text should be added
+     * @param desc the target to which the text should be added
+     */
+    protected abstract void addComments(Element e, Content desc);
+
+    protected Content getSummaryLink(Element e) {
+        AbstractMemberWriter writer = switch (e.getKind()) {
+            case INTERFACE, CLASS, ENUM,
+                 ANNOTATION_TYPE, RECORD -> new NestedClassWriterImpl(this);
+            case FIELD -> new FieldWriterImpl(this);
+            case METHOD -> new MethodWriterImpl(this);
+            case CONSTRUCTOR -> new ConstructorWriterImpl(this);
+            case ENUM_CONSTANT -> new EnumConstantWriterImpl(this);
+            case RECORD_COMPONENT ->
+                throw new AssertionError("Record components are not supported by SummaryListWriter!");
+            default -> new AnnotationTypeOptionalMemberWriterImpl(this, null);
+        };
+        return writer.getSummaryLink(e);
+    }
+
+    /**
+     * Add an extra optional section to the content.
+     *
+     * @param list the element list
+     * @param target the target content to which the section should be added
+     */
+    protected void addExtraSection(L list, Content target) {
+    }
+
+    /**
+     * Add an extra optional index link.
+     *
+     * @param list the element list
+     * @param target the target content to which the link should be added
+     */
+    protected void addExtraIndexLink(L list, Content target) {
+    }
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
index 8802355c8a89d..02c9aee9f0dcb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,6 +78,9 @@ public enum HtmlStyle {
     packageHierarchyLabel,
     packageUses,
     permitsNote,
+    previewBlock,
+    previewComment,
+    previewLabel,
     searchTagLink,
     searchTagResult,
     serializedPackageContainer,
@@ -418,12 +421,6 @@ public enum HtmlStyle {
      */
     colConstructorName,
 
-    /**
-     * The class of the cells in a table column used to display the name
-     * of a deprecated item.
-     */
-    colDeprecatedItemName,
-
     /**
      * The class of the first column of cells in a table.
      * This is typically the "type and modifiers" column, where the type is
@@ -438,6 +435,12 @@ public enum HtmlStyle {
      */
     colLast,
 
+    /**
+     * The class of the cells in a table column used to display the name
+     * of a summary item.
+     */
+    colSummaryItemName,
+
     /**
      * The class of the second column of cells in a table.
      * This is typically the column that defines the name of a field or the
@@ -690,6 +693,11 @@ public enum HtmlStyle {
      */
     packageUsePage,
 
+    /**
+     * The class of the {@code body} element for the page listing any deprecated items.
+     */
+    previewListPage,
+
     /**
      * The class of the {@code body} element for the serialized-forms page.
      */
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
index 2899f5b2f2e12..919f668830dd2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -783,6 +783,17 @@ public static HtmlTree SPAN(String id, HtmlStyle style, Content body) {
                 .add(body);
     }
 
+    /**
+     * Creates an HTML {@code SUP} element with the given content.
+     *
+     * @param body  the content
+     * @return the element
+     */
+    public static HtmlTree SUP(Content body) {
+        return new HtmlTree(TagName.SUP)
+                .add(body);
+    }
+
     /**
      * Creates an HTML {@code TD} element with the given style and some content.
      *
@@ -929,7 +940,7 @@ public boolean isValid() {
     public boolean isInline() {
         switch (tagName) {
             case A: case BUTTON: case BR: case CODE: case EM: case I: case IMG:
-            case LABEL: case SMALL: case SPAN: case STRONG: case SUB:
+            case LABEL: case SMALL: case SPAN: case STRONG: case SUB: case SUP:
                 return true;
             default:
                 return false;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
index b3d688efa7ffb..a60166cde5382 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,6 +83,7 @@ public enum TagName {
     SPAN,
     STRONG,
     SUB,
+    SUP,
     TABLE,
     TBODY,
     THEAD,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
index 3a8844685f5f6..2f6ef2dc5ffe1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@ doclet.Navigation=Navigation
 doclet.New_Page=NewPage
 doclet.navDeprecated=Deprecated
 doclet.Window_Deprecated_List=Deprecated List
+doclet.Window_Preview_List=Preview List
 doclet.Overrides=Overrides:
 doclet.in_class=in class
 doclet.Element_in=Element in {0}
@@ -96,17 +97,18 @@ doclet.see.class_or_package_not_found=Tag {0}: reference not found: {1}
 doclet.see.class_or_package_not_accessible=Tag {0}: reference not accessible: {1}
 doclet.tag.invalid_usage=invalid usage of tag {0}
 doclet.Deprecated_API=Deprecated API
+doclet.Preview_API=Preview API
+doclet.Preview_Label=Preview
+doclet.Preview_Mark=PREVIEW
 doclet.For_Removal=For Removal
 doclet.Annotation_Types=Annotation Types
 doclet.Annotation_Interfaces=Annotation Interfaces
 doclet.Annotation_Type_Members=Annotation Type Elements
 doclet.Annotation_Interface_Members=Annotation Interface Elements
-doclet.for_removal=for removal
 doclet.annotation_types=annotation types
 doclet.annotation_interfaces=annotation interfaces
 doclet.annotation_type_members=annotation type elements
 doclet.annotation_interface_members=annotation interface elements
-doclet.record_classes=record classes
 doclet.Generated_Docs_Untitled=Generated Documentation (Untitled)
 doclet.Other_Packages=Other Packages
 doclet.Description=Description
@@ -200,6 +202,9 @@ doclet.help.deprecated.body=\
     The {0} page lists all of the API that have been deprecated. A deprecated API is not \
     recommended for use, generally due to shortcomings, and a replacement API is usually given. \
     Deprecated APIs may be removed in future implementations.
+doclet.help.preview.body=\
+    The {0} page lists all of the Preview APIs. \
+    Preview APIs may be removed in future implementations.
 doclet.help.index.head=\
     Index
 doclet.help.index.body=\
@@ -286,6 +291,17 @@ doclet.navClassUse=Use
 doclet.Error_in_grouplist=Bad -group option: {0} {1}
 doclet.Groupname_already_used=In -group option, group name already used: {0}
 doclet.Same_element_name_used=Element name or pattern used twice: {0}
+doclet.PreviewLeadingNote={0} relies on preview features of the Java platform:
+doclet.Declared_Using_Preview={0} is declared using {1}, a preview feature of the Java language ({2}).
+doclet.PreviewAPI={0} refers to one or more preview APIs:  {1}.
+doclet.ReflectivePreviewAPI={0} refers to one or more reflective preview APIs:  {1}.
+doclet.UsesDeclaredUsingPreview={0} refers to one or more types which are declared using a preview feature of the Java language: {1}.
+doclet.PreviewTrailingNote1=Programs can only use {0} when preview features are enabled.
+doclet.PreviewTrailingNote2=Preview features may be removed in a future release, or upgraded to permanent features of the Java platform.
+doclet.Declared_Using_Preview.SEALED=Sealed Classes
+doclet.Declared_Using_Preview.SEALED_PERMITS=Sealed Classes
+doclet.PreviewPlatformLeadingNote={0} is a preview API of the Java platform.
+doclet.ReflectivePreviewPlatformLeadingNote={0} is a reflective preview API of the Java platform.
 
 # option specifiers
 doclet.usage.add-stylesheet.parameters=\
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java
index 4ea1a2b4f35f2..4d1d0e32841df 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,6 +92,14 @@ public interface AnnotationTypeRequiredMemberWriter extends MemberWriter {
      */
     void addDeprecated(Element member, Content annotationDocTree);
 
+    /**
+     * Add the preview output for the given member.
+     *
+     * @param member the member being documented
+     * @param annotationDocTree content tree to which the preview information will be added
+     */
+    void addPreview(Element member, Content contentTree);
+
     /**
      * Add the comments for the given member.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java
index ec79ba242ab4e..dd12824670c96 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,6 +70,14 @@ public interface ConstructorWriter extends MemberWriter {
      */
     void addDeprecated(ExecutableElement constructor, Content constructorDocTree);
 
+    /**
+     * Add the preview output for the given member.
+     *
+     * @param member the member being documented
+     * @param annotationDocTree content tree to which the preview information will be added
+     */
+    void addPreview(ExecutableElement member, Content contentTree);
+
     /**
      * Add the comments for the given constructor.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java
index 91c90bb225ab1..835be5e4d3a0e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java
@@ -75,6 +75,14 @@ Content getEnumConstantsTreeHeader(VariableElement enumConstant,
      */
     void addDeprecated(VariableElement enumConstant, Content enumConstantsTree);
 
+    /**
+     * Add the preview output for the given member.
+     *
+     * @param member the member being documented
+     * @param annotationDocTree content tree to which the preview information will be added
+     */
+    void addPreview(VariableElement member, Content contentTree);
+
     /**
      * Add the comments for the given enum constant.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java
index e0d0d68f88829..0364d97a6e31d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,14 @@ public interface FieldWriter extends MemberWriter {
      */
     void addDeprecated(VariableElement field, Content fieldDocTree);
 
+    /**
+     * Adds the preview output for the given member.
+     *
+     * @param member the member being documented
+     * @param annotationDocTree content tree to which the preview information will be added
+     */
+    void addPreview(VariableElement member, Content contentTree);
+
     /**
      * Add the comments for the given field.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java
index c4d81ad790e4b..b4efc8a777b51 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java
@@ -71,6 +71,14 @@ public interface MethodWriter extends MemberWriter {
      */
     void addDeprecated(ExecutableElement method, Content methodDocTree);
 
+    /**
+     * Adds the preview output for the given member.
+     *
+     * @param member the member being documented
+     * @param annotationDocTree content tree to which the preview information will be added
+     */
+    void addPreview(ExecutableElement member, Content contentTree);
+
     /**
      * Add the comments for the given method.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
index edb8c5d19ba78..05ae66b0dc443 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,6 +70,14 @@ public interface PropertyWriter extends MemberWriter {
      */
     void addDeprecated(ExecutableElement property, Content propertyDocTree);
 
+    /**
+     * Add the preview output for the given member.
+     *
+     * @param member the member being documented
+     * @param annotationDocTree content tree to which the preview information will be added
+     */
+    void addPreview(ExecutableElement member, Content contentTree);
+
     /**
      * Add the comments for the given property.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
index 62ab25ffbb0e2..33ed2e9798ac7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -513,4 +513,15 @@ public PackageElement getAbbreviatedPackageElement(PackageElement pkg) {
                 ? utils.elementUtils.getPackageElement(parsedPackageName)
                 : ((JavacElements) utils.elementUtils).getPackageElement(encl, parsedPackageName);
     }
+
+    public boolean isPreviewAPI(Element el) {
+        Symbol sym = (Symbol) el;
+        return (sym.flags() & Flags.PREVIEW_API) != 0;
+    }
+
+    public boolean isReflectivePreviewAPI(Element el) {
+        Symbol sym = (Symbol) el;
+        return (sym.flags() & Flags.PREVIEW_REFLECTIVE) != 0;
+    }
+
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
index 23511da68bae0..6fb8775e37308 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
+import jdk.javadoc.internal.doclets.formats.html.AbstractMemberWriter;
 
 import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeRequiredMemberWriter;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
@@ -152,6 +153,7 @@ protected void buildAnnotationTypeMember(Content detailsList)
     protected void buildAnnotationTypeMemberChildren(Content annotationDocTree) {
         buildSignature(annotationDocTree);
         buildDeprecationInfo(annotationDocTree);
+        buildPreviewInfo(annotationDocTree);
         buildMemberComments(annotationDocTree);
         buildTagInfo(annotationDocTree);
     }
@@ -174,6 +176,15 @@ protected void buildDeprecationInfo(Content annotationDocTree) {
         writer.addDeprecated(currentMember, annotationDocTree);
     }
 
+    /**
+     * Build the preview information.
+     *
+     * @param annotationDocTree the content tree to which the documentation will be added
+     */
+    protected void buildPreviewInfo(Content annotationDocTree) {
+        writer.addPreview(currentMember, annotationDocTree);
+    }
+
     /**
      * Build the comments for the member.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
index 3c25d089ce316..002dd588912fa 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,6 +132,7 @@ protected void buildConstructorDoc(Content detailsList) throws DocletException {
 
                 buildSignature(constructorDocTree);
                 buildDeprecationInfo(constructorDocTree);
+                buildPreviewInfo(constructorDocTree);
                 buildConstructorComments(constructorDocTree);
                 buildTagInfo(constructorDocTree);
 
@@ -160,6 +161,15 @@ protected void buildDeprecationInfo(Content constructorDocTree) {
         writer.addDeprecated(currentConstructor, constructorDocTree);
     }
 
+    /**
+     * Build the preview information.
+     *
+     * @param constructorDocTree the content tree to which the documentation will be added
+     */
+    protected void buildPreviewInfo(Content constructorDocTree) {
+        writer.addPreview(currentConstructor, constructorDocTree);
+    }
+
     /**
      * Build the comments for the constructor.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
index 5046d9b1a0378..20972c8764493 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,6 +125,7 @@ protected void buildEnumConstant(Content detailsList) throws DocletException {
 
                 buildSignature(enumConstantsTree);
                 buildDeprecationInfo(enumConstantsTree);
+                buildPreviewInfo(enumConstantsTree);
                 buildEnumConstantComments(enumConstantsTree);
                 buildTagInfo(enumConstantsTree);
 
@@ -154,6 +155,15 @@ protected void buildDeprecationInfo(Content enumConstantsTree) {
         writer.addDeprecated(currentElement, enumConstantsTree);
     }
 
+    /**
+     * Build the preview information.
+     *
+     * @param enumConstantsTree the content tree to which the documentation will be added
+     */
+    protected void buildPreviewInfo(Content enumConstantsTree) {
+        writer.addPreview(currentElement, enumConstantsTree);
+    }
+
     /**
      * Build the comments for the enum constant.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
index a79b398bf00af..f98cc7a7fc5fd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,6 +125,7 @@ protected void buildFieldDoc(Content detailsList) throws DocletException {
 
                 buildSignature(fieldDocTree);
                 buildDeprecationInfo(fieldDocTree);
+                buildPreviewInfo(fieldDocTree);
                 buildFieldComments(fieldDocTree);
                 buildTagInfo(fieldDocTree);
 
@@ -153,6 +154,15 @@ protected void buildDeprecationInfo(Content fieldDocTree) {
         writer.addDeprecated(currentElement, fieldDocTree);
     }
 
+    /**
+     * Build the preview information.
+     *
+     * @param fieldDocTree the content tree to which the documentation will be added
+     */
+    protected void buildPreviewInfo(Content fieldDocTree) {
+        writer.addPreview(currentElement, fieldDocTree);
+    }
+
     /**
      * Build the comments for the field.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
index 18a723dc41d1f..a751de2ae11b6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,6 +123,7 @@ protected void buildMethodDoc(Content detailsList) throws DocletException {
 
                 buildSignature(methodDocTree);
                 buildDeprecationInfo(methodDocTree);
+                buildPreviewInfo(methodDocTree);
                 buildMethodComments(methodDocTree);
                 buildTagInfo(methodDocTree);
 
@@ -151,6 +152,15 @@ protected void buildDeprecationInfo(Content methodDocTree) {
         writer.addDeprecated(currentMethod, methodDocTree);
     }
 
+    /**
+     * Build the preview information.
+     *
+     * @param methodDocTree the content tree to which the documentation will be added
+     */
+    protected void buildPreviewInfo(Content methodDocTree) {
+        writer.addPreview(currentMethod, methodDocTree);
+    }
+
     /**
      * Build the comments for the method.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
index a40dc81c7bff1..4a31f1d9c00a9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,6 +152,15 @@ protected void buildDeprecationInfo(Content propertyDocTree) {
         writer.addDeprecated(currentProperty, propertyDocTree);
     }
 
+    /**
+     * Build the preview information.
+     *
+     * @param propertyDocTree the content tree to which the documentation will be added
+     */
+    protected void buildPreviewInfo(Content propertyDocTree) {
+        writer.addPreview(currentProperty, propertyDocTree);
+    }
+
     /**
      * Build the comments for the property.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index b106aa8864606..24ec216fd061a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -151,8 +151,6 @@ doclet.AnnotationInterfaces=Annotation Interfaces
 doclet.Exceptions=Exceptions
 doclet.Errors=Errors
 doclet.Classes=Classes
-doclet.packages=packages
-doclet.modules=modules
 doclet.All_Classes=All Classes
 doclet.All_Superinterfaces=All Superinterfaces:
 doclet.All_Implemented_Interfaces=All Implemented Interfaces:
@@ -171,17 +169,13 @@ doclet.enumclass=enum class
 doclet.enums=enums
 doclet.enumclasses=enum classes
 doclet.interface=interface
-doclet.interfaces=interfaces
 doclet.class=class
-doclet.classes=classes
 doclet.RecordClass=Record Class
 doclet.recordclass=record class
 doclet.Error=Error
 doclet.error=error
-doclet.errors=errors
 doclet.Exception=Exception
 doclet.exception=exception
-doclet.exceptions=exceptions
 doclet.ExportedTo=Exported To Modules
 doclet.OpenedTo=Opened To Modules
 doclet.Package_private=(package private)
@@ -216,12 +210,10 @@ doclet.value_tag_invalid_constant=@value tag (which references {0}) can only be
 doclet.value_tag_invalid_use=@value tag cannot be used here.
 doclet.dest_dir_create=Creating destination directory: "{0}"
 doclet.in={0} in {1}
-doclet.fields=fields
 doclet.Fields=Fields
+doclet.Preview=Preview.
 doclet.Properties=Properties
-doclet.constructors=constructors
 doclet.Constructors=Constructors
-doclet.methods=methods
 doclet.Methods=Methods
 doclet.All_Methods=All Methods
 doclet.Static_Methods=Static Methods
@@ -232,7 +224,6 @@ doclet.Default_Methods=Default Methods
 doclet.Deprecated_Methods=Deprecated Methods
 doclet.Annotation_Type_Optional_Members=Optional Elements
 doclet.Annotation_Type_Required_Members=Required Elements
-doclet.enum_constants=enum constants
 doclet.Enum_Constants=Enum Constants
 doclet.Nested_Classes=Nested Classes
 doclet.Modifier=Modifier
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
index 932e56cde9a54..8a2a2ef76b3ab 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
@@ -431,7 +431,7 @@ div.table-tabs > button.table-tab {
     text-align:left;
     padding: 8px 3px 3px 7px;
 }
-.col-first, .col-second, .col-last, .col-constructor-name, .col-deprecated-item-name {
+.col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name {
     vertical-align:top;
     padding-right:0;
     padding-top:8px;
@@ -444,7 +444,7 @@ div.table-tabs > button.table-tab {
 .col-first, .col-first {
     font-size:13px;
 }
-.col-second, .col-second, .col-last, .col-constructor-name, .col-deprecated-item-name, .col-last {
+.col-second, .col-second, .col-last, .col-constructor-name, .col-summary-item-name, .col-last {
     font-size:13px;
 }
 .col-first, .col-second, .col-constructor-name {
@@ -459,7 +459,7 @@ div.table-tabs > button.table-tab {
 .col-first a:link, .col-first a:visited,
 .col-second a:link, .col-second a:visited,
 .col-constructor-name a:link, .col-constructor-name a:visited,
-.col-deprecated-item-name a:link, .col-deprecated-item-name a:visited,
+.col-summary-item-name a:link, .col-summary-item-name a:visited,
 .constant-values-container a:link, .constant-values-container a:visited,
 .all-classes-container a:link, .all-classes-container a:visited,
 .all-packages-container a:link, .all-packages-container a:visited {
@@ -534,10 +534,10 @@ h1.hidden {
 }
 .deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link,
 .module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type,
-.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link {
+.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label {
     font-weight:bold;
 }
-.deprecation-comment, .help-footnote, .interface-name {
+.deprecation-comment, .help-footnote, .interface-name, .preview-comment {
     font-style:italic;
 }
 .deprecation-block {
@@ -551,6 +551,17 @@ h1.hidden {
     margin-right:10px;
     display:inline-block;
 }
+.preview-block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    border-style:solid;
+    border-width:thin;
+    border-radius:10px;
+    padding:10px;
+    margin-bottom:10px;
+    margin-right:10px;
+    display:inline-block;
+}
 div.block div.deprecation-comment, div.block div.block span.emphasized-phrase,
 div.block div.block span.interface-name {
     font-style:normal;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Comparators.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Comparators.java
index 8c8d14e40db53..b5b716fc8dd41 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Comparators.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Comparators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,17 +124,18 @@ public int compare(Element pkg1, Element pkg2) {
         return packageComparator;
     }
 
-    private Comparator<Element> deprecatedComparator = null;
+    private Comparator<Element> summaryComparator = null;
 
     /**
-     * Returns a Comparator for deprecated items listed on deprecated list page, by comparing the
+     * Returns a Comparator for items listed on summary list pages
+     * (like deprecated or preview summary pages), by comparing the
      * fully qualified names, and if those are equal the names of the enclosing modules.
      *
      * @return a Comparator
      */
-    public Comparator<Element> makeDeprecatedComparator() {
-        if (deprecatedComparator == null) {
-            deprecatedComparator = new ElementComparator() {
+    public Comparator<Element> makeSummaryComparator() {
+        if (summaryComparator == null) {
+            summaryComparator = new ElementComparator() {
                 @Override
                 public int compare(Element e1, Element e2) {
                     int result = compareFullyQualifiedNames(e1, e2);
@@ -150,7 +151,7 @@ public int compare(Element e1, Element e2) {
                 }
             };
         }
-        return deprecatedComparator;
+        return summaryComparator;
     }
 
     private Comparator<SerialFieldTree> serialFieldTreeComparator = null;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
index 12e819f24ba46..d96cca5fe806e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,6 @@
 import java.util.*;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
 
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
 
@@ -42,31 +39,8 @@
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
-public class DeprecatedAPIListBuilder {
-    /**
-     * List of deprecated type Lists.
-     */
-    private final Map<DeprElementKind, SortedSet<Element>> deprecatedMap;
-    private final BaseConfiguration configuration;
-    private final Utils utils;
-
-    public enum DeprElementKind {
-        REMOVAL,
-        MODULE,
-        PACKAGE,
-        INTERFACE,
-        CLASS,
-        ENUM,
-        EXCEPTION,              // no ElementKind mapping
-        ERROR,                  // no ElementKind mapping
-        RECORD_CLASS,
-        ANNOTATION_TYPE,
-        FIELD,
-        METHOD,
-        CONSTRUCTOR,
-        ENUM_CONSTANT,
-        ANNOTATION_TYPE_MEMBER // no ElementKind mapping
-    };
+public class DeprecatedAPIListBuilder extends SummaryAPIListBuilder {
+    private SortedSet<Element> forRemoval;
 
     /**
      * Constructor.
@@ -74,135 +48,21 @@ public enum DeprElementKind {
      * @param configuration the current configuration of the doclet
      */
     public DeprecatedAPIListBuilder(BaseConfiguration configuration) {
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        deprecatedMap = new EnumMap<>(DeprElementKind.class);
-        for (DeprElementKind kind : DeprElementKind.values()) {
-            deprecatedMap.put(kind,
-                    new TreeSet<>(utils.comparators.makeDeprecatedComparator()));
-        }
-        buildDeprecatedAPIInfo();
-    }
-
-    public boolean isEmpty() {
-        return deprecatedMap.values().stream().allMatch(Set::isEmpty);
+        super(configuration, configuration.utils::isDeprecated);
     }
 
-    /**
-     * Build the sorted list of all the deprecated APIs in this run.
-     * Build separate lists for deprecated modules, packages, classes, constructors,
-     * methods and fields.
-     */
-    private void buildDeprecatedAPIInfo() {
-        SortedSet<Element> rset = deprecatedMap.get(DeprElementKind.REMOVAL);
-        SortedSet<ModuleElement> modules = configuration.modules;
-        SortedSet<Element> mset = deprecatedMap.get(DeprElementKind.MODULE);
-        for (Element me : modules) {
-            if (utils.isDeprecatedForRemoval(me)) {
-                rset.add(me);
-            }
-            if (utils.isDeprecated(me)) {
-                mset.add(me);
-            }
-        }
-        SortedSet<PackageElement> packages = configuration.packages;
-        SortedSet<Element> pset = deprecatedMap.get(DeprElementKind.PACKAGE);
-        for (Element pe : packages) {
-            if (utils.isDeprecatedForRemoval(pe)) {
-                rset.add(pe);
-            }
-            if (utils.isDeprecated(pe)) {
-                pset.add(pe);
-            }
-        }
-        for (Element e : configuration.getIncludedTypeElements()) {
-            TypeElement te = (TypeElement)e;
-            SortedSet<Element> eset;
-            if (utils.isDeprecatedForRemoval(e)) {
-                rset.add(e);
-            }
-            if (utils.isDeprecated(e)) {
-                switch (e.getKind()) {
-                    case ANNOTATION_TYPE:
-                        eset = deprecatedMap.get(DeprElementKind.ANNOTATION_TYPE);
-                        eset.add(e);
-                        break;
-                    case CLASS:
-                        if (utils.isError(te)) {
-                            eset = deprecatedMap.get(DeprElementKind.ERROR);
-                        } else if (utils.isException(te)) {
-                            eset = deprecatedMap.get(DeprElementKind.EXCEPTION);
-                        } else {
-                            eset = deprecatedMap.get(DeprElementKind.CLASS);
-                        }
-                        eset.add(e);
-                        break;
-                    case INTERFACE:
-                        eset = deprecatedMap.get(DeprElementKind.INTERFACE);
-                        eset.add(e);
-                        break;
-                    case ENUM:
-                        eset = deprecatedMap.get(DeprElementKind.ENUM);
-                        eset.add(e);
-                        break;
-                    case RECORD:
-                        eset = deprecatedMap.get(DeprElementKind.RECORD_CLASS);
-                        eset.add(e);
-                        break;
-                }
-            }
-            composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.FIELD),
-                    utils.getFields(te));
-            composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.METHOD),
-                    utils.getMethods(te));
-            composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.CONSTRUCTOR),
-                    utils.getConstructors(te));
-            if (utils.isEnum(e)) {
-                composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.ENUM_CONSTANT),
-                        utils.getEnumConstants(te));
-            }
-            if (utils.isAnnotationType(e)) {
-                composeDeprecatedList(rset, deprecatedMap.get(DeprElementKind.ANNOTATION_TYPE_MEMBER),
-                        utils.getAnnotationMembers(te));
-
-            }
+    public SortedSet<Element> getForRemoval() {
+        if (forRemoval == null) {
+            forRemoval = createSummarySet();
         }
+        return forRemoval;
     }
 
-    /**
-     * Add the members into a single list of deprecated members.
-     *
-     * @param rset set of elements deprecated for removal.
-     * @param sset set of deprecated elements.
-     * @param members members to be added in the list.
-     */
-    private void composeDeprecatedList(SortedSet<Element> rset, SortedSet<Element> sset, List<? extends Element> members) {
-        for (Element member : members) {
-            if (utils.isDeprecatedForRemoval(member)) {
-                rset.add(member);
-            }
-            if (utils.isDeprecated(member)) {
-                sset.add(member);
-            }
+    @Override
+    protected void handleElement(Element e) {
+        if (utils.isDeprecatedForRemoval(e)) {
+            getForRemoval().add(e);
         }
     }
 
-    /**
-     * Return the list of deprecated elements of a given type.
-     *
-     * @param kind the DeprElementKind
-     * @return
-     */
-    public SortedSet<Element> getSet(DeprElementKind kind) {
-        return deprecatedMap.get(kind);
-    }
-
-    /**
-     * Return true if the list of a given type has size greater than 0.
-     *
-     * @param kind the type of list being checked.
-     */
-    public boolean hasDocumentation(DeprElementKind kind) {
-        return !deprecatedMap.get(kind).isEmpty();
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java
index 9e69c325a862e..2e5a2c251bd18 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocLink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,6 +102,10 @@ public DocLink relativizeAgainst(DocPath base) {
         return new DocLink(newPath, fragment);
     }
 
+    public DocLink withFragment(String fragment) {
+        return new DocLink(path, fragment);
+    }
+
     // return true if the path begins <letters>://
     private boolean isAbsoluteURL(DocPath path) {
         String s = path.getPath();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
index aacf381cf8a59..6d057f7f1cecd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,6 +139,9 @@ public static DocPath indexN(int n) {
     /** The name of the file for the package usage info. */
     public static final DocPath PACKAGE_USE = DocPath.create("package-use.html");
 
+    /** The name of the fie for preview elements. */
+    public static final DocPath PREVIEW_LIST = DocPath.create("preview-list.html");
+
     /** The name of the file for all system properties. */
     public static final DocPath SYSTEM_PROPERTIES = DocPath.create("system-properties.html");
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java
new file mode 100644
index 0000000000000..6ca4c01ca30e7
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.toolkit.util;
+
+import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+
+/**
+ * Build list of all the preview packages, classes, constructors, fields and methods.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class PreviewAPIListBuilder extends SummaryAPIListBuilder {
+
+    /**
+     * Constructor.
+     *
+     * @param configuration the current configuration of the doclet
+     */
+    public PreviewAPIListBuilder(BaseConfiguration configuration) {
+        super(configuration, e -> configuration.utils.isPreviewAPI(e));
+    }
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java
new file mode 100644
index 0000000000000..4cab29bb164e6
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.toolkit.util;
+
+import java.util.*;
+import java.util.function.Predicate;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.RecordComponentElement;
+import javax.lang.model.element.TypeElement;
+
+import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+
+/**
+ * Build list of all the summary packages, classes, constructors, fields and methods.
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class SummaryAPIListBuilder {
+    /**
+     * List of summary type Lists.
+     */
+    private final Map<SummaryElementKind, SortedSet<Element>> summaryMap;
+    private final BaseConfiguration configuration;
+    protected final Utils utils;
+    private final Predicate<Element> belongsToSummary;
+    public enum SummaryElementKind {
+        MODULE,
+        PACKAGE,
+        INTERFACE,
+        CLASS,
+        ENUM,
+        EXCEPTION,              // no ElementKind mapping
+        ERROR,                  // no ElementKind mapping
+        RECORD_CLASS,
+        ANNOTATION_TYPE,
+        FIELD,
+        METHOD,
+        CONSTRUCTOR,
+        ENUM_CONSTANT,
+        ANNOTATION_TYPE_MEMBER // no ElementKind mapping
+    };
+    /**
+     * Constructor.
+     *
+     * @param configuration the current configuration of the doclet
+     */
+    public SummaryAPIListBuilder(BaseConfiguration configuration,
+                                 Predicate<Element> belongsToSummary) {
+        this.configuration = configuration;
+        this.utils = configuration.utils;
+        this.belongsToSummary = belongsToSummary;
+        summaryMap = new EnumMap<>(SummaryElementKind.class);
+        for (SummaryElementKind kind : SummaryElementKind.values()) {
+            summaryMap.put(kind, createSummarySet());
+        }
+        buildSummaryAPIInfo();
+    }
+
+    public boolean isEmpty() {
+        return summaryMap.values().stream().allMatch(Set::isEmpty);
+    }
+
+    /**
+     * Build the sorted list of all the summary APIs in this run.
+     * Build separate lists for summary modules, packages, classes, constructors,
+     * methods and fields.
+     */
+    private void buildSummaryAPIInfo() {
+        SortedSet<ModuleElement> modules = configuration.modules;
+        SortedSet<Element> mset = summaryMap.get(SummaryElementKind.MODULE);
+        for (Element me : modules) {
+            if (belongsToSummary.test(me)) {
+                mset.add(me);
+            }
+            handleElement(me);
+        }
+        SortedSet<PackageElement> packages = configuration.packages;
+        SortedSet<Element> pset = summaryMap.get(SummaryElementKind.PACKAGE);
+        for (Element pe : packages) {
+            if (belongsToSummary.test(pe)) {
+                pset.add(pe);
+            }
+            handleElement(pe);
+        }
+        for (Element e : configuration.getIncludedTypeElements()) {
+            TypeElement te = (TypeElement)e;
+            SortedSet<Element> eset;
+            if (belongsToSummary.test(e)) {
+                switch (e.getKind()) {
+                    case ANNOTATION_TYPE -> {
+                        eset = summaryMap.get(SummaryElementKind.ANNOTATION_TYPE);
+                        eset.add(e);
+                    }
+                    case CLASS -> {
+                        if (utils.isError(te)) {
+                            eset = summaryMap.get(SummaryElementKind.ERROR);
+                        } else if (utils.isException(te)) {
+                            eset = summaryMap.get(SummaryElementKind.EXCEPTION);
+                        } else {
+                            eset = summaryMap.get(SummaryElementKind.CLASS);
+                        }
+                        eset.add(e);
+                    }
+                    case INTERFACE -> {
+                        eset = summaryMap.get(SummaryElementKind.INTERFACE);
+                        eset.add(e);
+                    }
+                    case ENUM -> {
+                        eset = summaryMap.get(SummaryElementKind.ENUM);
+                        eset.add(e);
+                    }
+                    case RECORD -> {
+                        eset = summaryMap.get(SummaryElementKind.RECORD_CLASS);
+                        eset.add(e);
+                    }
+                }
+            }
+            handleElement(te);
+            composeSummaryList(summaryMap.get(SummaryElementKind.FIELD),
+                    utils.getFields(te));
+            composeSummaryList(summaryMap.get(SummaryElementKind.METHOD),
+                    utils.getMethods(te));
+            composeSummaryList(summaryMap.get(SummaryElementKind.CONSTRUCTOR),
+                    utils.getConstructors(te));
+            if (utils.isEnum(e)) {
+                composeSummaryList(summaryMap.get(SummaryElementKind.ENUM_CONSTANT),
+                        utils.getEnumConstants(te));
+            }
+            if (utils.isRecord(te)) {
+                for (RecordComponentElement component : te.getRecordComponents()) {
+                    if (belongsToSummary.test(component)) {
+                        throw new AssertionError("record components not supported in summary builders: " +
+                                                 "component: " + component.getSimpleName() +
+                                                 " of record: " + te.getQualifiedName());
+                    }
+                }
+            }
+            if (utils.isAnnotationType(e)) {
+                composeSummaryList(summaryMap.get(SummaryElementKind.ANNOTATION_TYPE_MEMBER),
+                        utils.getAnnotationMembers(te));
+
+            }
+        }
+    }
+
+    /**
+     * Add the members into a single list of summary members.
+     *
+     * @param rset set of elements summary for removal.
+     * @param sset set of summary elements.
+     * @param members members to be added in the list.
+     */
+    private void composeSummaryList(SortedSet<Element> sset, List<? extends Element> members) {
+        for (Element member : members) {
+            if (belongsToSummary.test(member)) {
+                sset.add(member);
+            }
+            handleElement(member);
+        }
+    }
+
+    /**
+     * Return the list of summary elements of a given type.
+     *
+     * @param kind the SummaryElementKind
+     * @return
+     */
+    public SortedSet<Element> getSet(SummaryElementKind kind) {
+        return summaryMap.get(kind);
+    }
+
+    /**
+     * Return true if the list of a given type has size greater than 0.
+     *
+     * @param kind the type of list being checked.
+     */
+    public boolean hasDocumentation(SummaryElementKind kind) {
+        return !summaryMap.get(kind).isEmpty();
+    }
+
+    /**
+     * Additional extra processing of an analyzed element.
+     *
+     * @param e element to process
+     */
+    protected void handleElement(Element e) {}
+
+    /**
+     * Create a summary set of elements.
+     *
+     * @return a summary set
+     */
+    protected final SortedSet<Element> createSummarySet() {
+        return new TreeSet<>(utils.comparators.makeSummaryComparator());
+    }
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
index 7bf29be9df0e4..54d20413c836f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import javax.lang.model.AnnotatedConstruct;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
@@ -82,6 +83,7 @@
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.ElementKindVisitor14;
 import javax.lang.model.util.Elements;
+import javax.lang.model.util.SimpleAnnotationValueVisitor14;
 import javax.lang.model.util.SimpleElementVisitor14;
 import javax.lang.model.util.SimpleTypeVisitor9;
 import javax.lang.model.util.TypeKindVisitor9;
@@ -2960,4 +2962,256 @@ public String toString() {
             return first + ":" + second;
         }
     }
+
+    /**
+     * Return the set of preview language features used to declare the given element.
+     *
+     * @param e the Element to check.
+     * @return the set of preview language features used to declare the given element
+     */
+    @SuppressWarnings("preview")
+    public Set<DeclarationPreviewLanguageFeatures> previewLanguageFeaturesUsed(Element e) {
+        Set<DeclarationPreviewLanguageFeatures> result = new HashSet<>();
+
+        if ((e.getKind().isClass() || e.getKind().isInterface()) &&
+            e.getModifiers().contains(Modifier.SEALED)) {
+            List<? extends TypeMirror> permits = ((TypeElement) e).getPermittedSubclasses();
+            boolean hasLinkablePermits = permits.stream()
+                                                .anyMatch(t -> isLinkable(asTypeElement(t)));
+            if (hasLinkablePermits) {
+                result.add(DeclarationPreviewLanguageFeatures.SEALED_PERMITS);
+            } else {
+                result.add(DeclarationPreviewLanguageFeatures.SEALED);
+            }
+        }
+
+        return result;
+    }
+
+    public enum DeclarationPreviewLanguageFeatures {
+
+        SEALED(List.of("sealed")),
+        SEALED_PERMITS(List.of("sealed", "permits"));
+        public final List<String> features;
+
+        private DeclarationPreviewLanguageFeatures(List<String> features) {
+            this.features = features;
+        }
+
+    }
+
+    @SuppressWarnings("preview")
+    public PreviewSummary declaredUsingPreviewAPIs(Element el) {
+        List<TypeElement> usedInDeclaration = new ArrayList<>();
+        usedInDeclaration.addAll(annotations2Classes(el));
+        switch (el.getKind()) {
+            case ANNOTATION_TYPE, CLASS, ENUM, INTERFACE, RECORD -> {
+                TypeElement te = (TypeElement) el;
+                for (TypeParameterElement tpe : te.getTypeParameters()) {
+                    usedInDeclaration.addAll(types2Classes(tpe.getBounds()));
+                }
+                usedInDeclaration.addAll(types2Classes(List.of(te.getSuperclass())));
+                usedInDeclaration.addAll(types2Classes(te.getInterfaces()));
+                usedInDeclaration.addAll(types2Classes(te.getPermittedSubclasses()));
+                usedInDeclaration.addAll(types2Classes(te.getRecordComponents().stream().map(c -> c.asType()).collect(Collectors.toList()))); //TODO: annotations on record components???
+            }
+            case CONSTRUCTOR, METHOD -> {
+                ExecutableElement ee = (ExecutableElement) el;
+                for (TypeParameterElement tpe : ee.getTypeParameters()) {
+                    usedInDeclaration.addAll(types2Classes(tpe.getBounds()));
+                }
+                usedInDeclaration.addAll(types2Classes(List.of(ee.getReturnType())));
+                usedInDeclaration.addAll(types2Classes(List.of(ee.getReceiverType())));
+                usedInDeclaration.addAll(types2Classes(ee.getThrownTypes()));
+                usedInDeclaration.addAll(types2Classes(ee.getParameters().stream().map(p -> p.asType()).collect(Collectors.toList())));
+                usedInDeclaration.addAll(annotationValue2Classes(ee.getDefaultValue()));
+            }
+            case FIELD, ENUM_CONSTANT, RECORD_COMPONENT -> {
+                VariableElement ve = (VariableElement) el;
+                usedInDeclaration.addAll(types2Classes(List.of(ve.asType())));
+            }
+            case MODULE, PACKAGE -> {
+            }
+            default -> throw new IllegalArgumentException("Unexpected: " + el.getKind());
+        }
+
+        Set<TypeElement> previewAPI = new HashSet<>();
+        Set<TypeElement> reflectivePreviewAPI = new HashSet<>();
+        Set<TypeElement> declaredUsingPreviewFeature = new HashSet<>();
+
+        for (TypeElement type : usedInDeclaration) {
+            if (!isIncluded(type) && !configuration.extern.isExternal(type)) {
+                continue;
+            }
+            if (isPreviewAPI(type)) {
+                if (isReflectivePreviewAPI(type)) {
+                    reflectivePreviewAPI.add(type);
+                } else {
+                    previewAPI.add(type);
+                }
+            }
+            if (!previewLanguageFeaturesUsed(type).isEmpty()) {
+                declaredUsingPreviewFeature.add(type);
+            }
+        }
+
+        return new PreviewSummary(previewAPI, reflectivePreviewAPI, declaredUsingPreviewFeature);
+    }
+
+    private Collection<TypeElement> types2Classes(List<? extends TypeMirror> types) {
+        List<TypeElement> result = new ArrayList<>();
+        List<TypeMirror> todo = new ArrayList<>(types);
+
+        while (!todo.isEmpty()) {
+            TypeMirror type = todo.remove(todo.size() - 1);
+
+            result.addAll(annotations2Classes(type));
+
+            if (type.getKind() == DECLARED) {
+                DeclaredType dt = (DeclaredType) type;
+                result.add((TypeElement) dt.asElement());
+                todo.addAll(dt.getTypeArguments());
+            }
+        }
+
+        return result;
+    }
+
+    private Collection<TypeElement> annotations2Classes(AnnotatedConstruct annotated) {
+        List<TypeElement> result = new ArrayList<>();
+
+        for (AnnotationMirror am : annotated.getAnnotationMirrors()) {
+            result.addAll(annotation2Classes(am));
+        }
+
+        return result;
+    }
+
+    private Collection<TypeElement> annotation2Classes(AnnotationMirror am) {
+        List<TypeElement> result = new ArrayList<>();
+
+        result.addAll(types2Classes(List.of(am.getAnnotationType())));
+        am.getElementValues()
+          .values()
+          .stream()
+          .flatMap(av -> annotationValue2Classes(av).stream())
+          .forEach(result::add);
+
+        return result;
+    }
+
+    private Collection<TypeElement> annotationValue2Classes(AnnotationValue value) {
+        if (value == null) {
+            return List.of();
+        }
+
+        List<TypeElement> result = new ArrayList<>();
+
+        value.accept(new SimpleAnnotationValueVisitor14<>() {
+            @Override
+            public Object visitArray(List<? extends AnnotationValue> vals, Object p) {
+                vals.stream()
+                    .forEach(v -> v.accept(this, null));
+                return super.visitArray(vals, p);
+            }
+            @Override
+            public Object visitAnnotation(AnnotationMirror a, Object p) {
+                result.addAll(annotation2Classes(a));
+                return super.visitAnnotation(a, p);
+            }
+
+            @Override
+            public Object visitType(TypeMirror t, Object p) {
+                result.addAll(types2Classes(List.of(t)));
+                return super.visitType(t, p);
+            }
+
+        }, null);
+
+        return result;
+    }
+
+    public static final class PreviewSummary {
+        public final Set<TypeElement> previewAPI;
+        public final Set<TypeElement> reflectivePreviewAPI;
+        public final Set<TypeElement> declaredUsingPreviewFeature;
+
+        public PreviewSummary(Set<TypeElement> previewAPI, Set<TypeElement> reflectivePreviewAPI, Set<TypeElement> declaredUsingPreviewFeature) {
+            this.previewAPI = previewAPI;
+            this.reflectivePreviewAPI = reflectivePreviewAPI;
+            this.declaredUsingPreviewFeature = declaredUsingPreviewFeature;
+        }
+
+        @Override
+        public String toString() {
+            return "PreviewSummary{" + "previewAPI=" + previewAPI + ", reflectivePreviewAPI=" + reflectivePreviewAPI + ", declaredUsingPreviewFeature=" + declaredUsingPreviewFeature + '}';
+        }
+
+    }
+
+    /**
+     * Checks whether the given Element should be marked as a preview API.
+     *
+     * Note that if a type is marked as a preview, its members are not.
+     *
+     * @param el the element to check
+     * @return true if and only if the given element should be marked as a preview API
+     */
+    public boolean isPreviewAPI(Element el) {
+        boolean parentPreviewAPI = false;
+        Element enclosing = el.getEnclosingElement();
+        if (enclosing != null && (enclosing.getKind().isClass() || enclosing.getKind().isInterface())) {
+            parentPreviewAPI = configuration.workArounds.isPreviewAPI(el.getEnclosingElement());
+        }
+        boolean previewAPI = configuration.workArounds.isPreviewAPI(el);
+        return !parentPreviewAPI && previewAPI;
+    }
+
+    /**
+     * Checks whether the given Element should be marked as a reflective preview API.
+     *
+     * Note that if a type is marked as a preview, its members are not.
+     *
+     * @param el the element to check
+     * @return true if and only if the given element should be marked
+     *              as a reflective preview API
+     */
+    public boolean isReflectivePreviewAPI(Element el) {
+        return isPreviewAPI(el) && configuration.workArounds.isReflectivePreviewAPI(el);
+    }
+
+    /**
+     * Return all flags for the given Element.
+     *
+     * @param el the element to test
+     * @return the set of all the element's flags.
+     */
+    public Set<ElementFlag> elementFlags(Element el) {
+        Set<ElementFlag> flags = EnumSet.noneOf(ElementFlag.class);
+        PreviewSummary previewAPIs = declaredUsingPreviewAPIs(el);
+
+        if (isDeprecated(el)) {
+            flags.add(ElementFlag.DEPRECATED);
+        }
+
+        if (!previewLanguageFeaturesUsed(el).isEmpty() ||
+            configuration.workArounds.isPreviewAPI(el) ||
+            !previewAPIs.previewAPI.isEmpty() ||
+            !previewAPIs.reflectivePreviewAPI.isEmpty() ||
+            !previewAPIs.declaredUsingPreviewFeature.isEmpty())  {
+            flags.add(ElementFlag.PREVIEW);
+        }
+
+        return flags;
+    }
+
+    /**
+     * An element can have flags that place it into some sub-categories, like
+     * being a preview or a deprecated element.
+     */
+    public enum ElementFlag {
+        DEPRECATED,
+        PREVIEW;
+    }
+
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
index 261c2d538862c..d2de0fd28b3b4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.type.WildcardType;
 import javax.lang.model.util.SimpleTypeVisitor9;
+import jdk.javadoc.internal.doclets.formats.html.LinkInfoImpl;
 
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@@ -139,6 +140,7 @@ public Content visitTypeVariable(TypeVariable type, LinkInfo linkInfo) {
                         Content label = newContent();
                         label.add(utils.getTypeName(type, false));
                         linkInfo.label = label;
+                        linkInfo.skipPreview = true;
                         link.add(getClassLink(linkInfo));
                     } else {
                         // No need to link method type parameters.
@@ -204,6 +206,7 @@ private void setBoundsLinkInfo(LinkInfo linkInfo, TypeMirror bound) {
         linkInfo.typeElement = null;
         linkInfo.label = null;
         linkInfo.type = bound;
+        linkInfo.skipPreview = false;
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java
index d3ba8cd244d6d..37dee02f3b61b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java
@@ -110,6 +110,11 @@ public abstract class LinkInfo {
      */
     public boolean linkToSelf = true;
 
+    /**
+     * True iff the preview flags should be skipped for this link.
+     */
+    public boolean skipPreview;
+
     /**
      * Return an empty instance of a content object.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
index 9ba1826357099..5cdce91f9c61f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1285,6 +1285,7 @@ private ElementKind getAllowedKind(ElementKind kind) {
                 case CONSTRUCTOR: case ENUM_CONSTANT: case EXCEPTION_PARAMETER:
                 case FIELD: case INSTANCE_INIT: case LOCAL_VARIABLE: case PARAMETER:
                 case RESOURCE_VARIABLE: case STATIC_INIT: case TYPE_PARAMETER:
+                case RECORD_COMPONENT:
                     return ElementKind.METHOD;
                 default:
                     throw new AssertionError("unsupported kind: " + kind);
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
index bc08a6015449b..68cb02989ca42 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
@@ -236,20 +236,12 @@ public enum SubKind {
         ENUM_SUBKIND(Kind.TYPE_DECL),
 
         /**
-         * {@preview Associated with records, a preview feature of the Java language.
-         *
-         *           This enum constant is associated with <i>records</i>, a preview
-         *           feature of the Java language. Preview features
-         *           may be removed in a future release, or upgraded to permanent
-         *           features of the Java language.}
-         *
          * A record declaration.
          * A {@code SubKind} of {@link Kind#TYPE_DECL}.
          * @jls 8.10 Record Types
          * @since 14
          *
          */
-        @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.RECORDS)
         RECORD_SUBKIND(Kind.TYPE_DECL),
 
         /**
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
index 3464fea732651..fb458bb309c9c 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ public void previewNotEnabled() throws Exception {
         // compile a class with --enable-preview
         Path sourceFile = SRC_DIR.resolve("HiddenInterface.java");
         String[] options = new String[] {
-                "--enable-preview", "-source", String.valueOf(Runtime.version().feature()) };
+                "--enable-preview", "-source", String.valueOf(Runtime.version().feature()), "-XDforcePreview" };
         if (!CompilerUtils.compile(sourceFile, CLASSES_DIR, options)) {
             throw new RuntimeException("Compilation of the test failed: " + sourceFile);
         }
diff --git a/test/jdk/java/lang/ref/CleanerTest.java b/test/jdk/java/lang/ref/CleanerTest.java
index 1190d7928acc7..5d77459a47070 100644
--- a/test/jdk/java/lang/ref/CleanerTest.java
+++ b/test/jdk/java/lang/ref/CleanerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,7 @@
  *        jdk.test.lib.JDKToolLauncher
  *        jdk.test.lib.Platform
  *        jdk.test.lib.process.*
- * @modules java.base/jdk.internal
- *          java.base/jdk.internal.misc
+ * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.ref
  *          java.management
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/jdk/java/util/Arrays/TimSortStackSize2.java b/test/jdk/java/util/Arrays/TimSortStackSize2.java
index f0ad7318f912d..30f60fe9ccbff 100644
--- a/test/jdk/java/util/Arrays/TimSortStackSize2.java
+++ b/test/jdk/java/util/Arrays/TimSortStackSize2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary Test TimSort stack size on big arrays
  * @library /test/lib
  * @modules java.management
- *          java.base/jdk.internal
  * @requires (vm.debug == false)
  * @build TimSortStackSize2
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java b/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java
index 23722c0c09f48..4718e10e8629d 100644
--- a/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java
+++ b/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java
@@ -74,7 +74,7 @@ static void check(ModuleDescriptor md) {
                "jdk.internal.vm.ci/jdk.vm.ci.hotspot",
                "jdk.internal.vm.ci/jdk.vm.ci.meta",
                "jdk.internal.vm.ci/jdk.vm.ci.code",
-               "java.base/jdk.internal");
+               "java.base/jdk.internal.javac");
 
     static void checkExports(ModuleDescriptor md) {
         // build a map of upgradeable module to Exports that are qualified to it
diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
index d9c1e8d7f8b17..0e82da1378a8a 100644
--- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
+++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -291,7 +291,7 @@ public void test() {
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Enum Class</div>
                     <div class="table-header col-last">Description</div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/TestEnum.html" title="enum class in pkg">pkg.TestEnum</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/TestEnum.html" title="enum class in pkg">pkg.TestEnum</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">enum_test1 passes.</div>
                     </div>""",
@@ -301,7 +301,7 @@ public void test() {
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Exceptions</div>
                     <div class="table-header col-last">Description</div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/TestException.html" title="class in pkg">pkg.TestException</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/TestException.html" title="class in pkg">pkg.TestException</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">exception_test1 passes.</div>
                     </div>""",
@@ -311,25 +311,25 @@ public void test() {
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Field</div>
                     <div class="table-header col-last">Description</div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/DeprecatedClassByAnnotation.html#field">pkg.DeprecatedClassByAnnotation.field</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/DeprecatedClassByAnnotation.html#field">pkg.DeprecatedClassByAnnotation.field</a></div>
                     <div class="col-last even-row-color"></div>
-                    <div class="col-deprecated-item-name odd-row-color"><a href="pkg/TestAnnotationType.html#field">pkg.TestAnnotationType.field</a></div>
+                    <div class="col-summary-item-name odd-row-color"><a href="pkg/TestAnnotationType.html#field">pkg.TestAnnotationType.field</a></div>
                     <div class="col-last odd-row-color">
                     <div class="deprecation-comment">annotation_test4 passes.</div>
                     </div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/TestClass.html#field">pkg.TestClass.field</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#field">pkg.TestClass.field</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">class_test2 passes. This is the second sentence of deprecated description for a field.</div>
                     </div>
-                    <div class="col-deprecated-item-name odd-row-color"><a href="pkg/TestError.html#field">pkg.TestError.field</a></div>
+                    <div class="col-summary-item-name odd-row-color"><a href="pkg/TestError.html#field">pkg.TestError.field</a></div>
                     <div class="col-last odd-row-color">
                     <div class="deprecation-comment">error_test2 passes.</div>
                     </div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/TestException.html#field">pkg.TestException.field</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/TestException.html#field">pkg.TestException.field</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">exception_test2 passes.</div>
                     </div>
-                    <div class="col-deprecated-item-name odd-row-color"><a href="pkg/TestInterface.html#field">pkg.TestInterface.field</a></div>
+                    <div class="col-summary-item-name odd-row-color"><a href="pkg/TestInterface.html#field">pkg.TestInterface.field</a></div>
                     <div class="col-last odd-row-color">
                     <div class="deprecation-comment">interface_test2 passes.</div>
                     </div>
@@ -341,25 +341,25 @@ public void test() {
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Method</div>
                     <div class="table-header col-last">Description</div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/DeprecatedClassByAnnotation.html#method()">pkg.DeprecatedClassByAnnotation.method()</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/DeprecatedClassByAnnotation.html#method()">pkg.DeprecatedClassByAnnotation.method()</a></div>
                     <div class="col-last even-row-color"></div>
-                    <div class="col-deprecated-item-name odd-row-color"><a href="pkg/TestAnnotationType.html#optional()">pkg.TestAnnotationType.optional()</a></div>
+                    <div class="col-summary-item-name odd-row-color"><a href="pkg/TestAnnotationType.html#optional()">pkg.TestAnnotationType.optional()</a></div>
                     <div class="col-last odd-row-color">
                     <div class="deprecation-comment">annotation_test2 passes.</div>
                     </div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/TestAnnotationType.html#required()">pkg.TestAnnotationType.required()</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/TestAnnotationType.html#required()">pkg.TestAnnotationType.required()</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">annotation_test3 passes.</div>
                     </div>
-                    <div class="col-deprecated-item-name odd-row-color"><a href="pkg/TestClass.html#method()">pkg.TestClass.method()</a></div>
+                    <div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#method()">pkg.TestClass.method()</a></div>
                     <div class="col-last odd-row-color">
                     <div class="deprecation-comment">class_test5 passes. This is the second sentence of deprecated description for a method.</div>
                     </div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/TestClass.html#overloadedMethod(int)">pkg.TestClass.overloadedMethod&#8203;(int)</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#overloadedMethod(int)">pkg.TestClass.overloadedMethod&#8203;(int)</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">class_test7 passes. Overloaded method 2.</div>
                     </div>
-                    <div class="col-deprecated-item-name odd-row-color"><a href="pkg/TestClass.html#overloadedMethod(java.lang.String)">pkg.TestClass.overloadedMethod&#8203;(String)</a></div>
+                    <div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#overloadedMethod(java.lang.String)">pkg.TestClass.overloadedMethod&#8203;(String)</a></div>
                     <div class="col-last odd-row-color">
                     <div class="deprecation-comment">class_test6 passes. Overloaded method 1.</div>
                     </div>""",
@@ -369,13 +369,13 @@ public void test() {
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Constructor</div>
                     <div class="table-header col-last">Description</div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/DeprecatedClassByAnnotation.html#%3Cinit%3E()">pkg.DeprecatedClassByAnnotation()</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/DeprecatedClassByAnnotation.html#%3Cinit%3E()">pkg.DeprecatedClassByAnnotation()</a></div>
                     <div class="col-last even-row-color"></div>
-                    <div class="col-deprecated-item-name odd-row-color"><a href="pkg/TestClass.html#%3Cinit%3E()">pkg.TestClass()</a></div>
+                    <div class="col-summary-item-name odd-row-color"><a href="pkg/TestClass.html#%3Cinit%3E()">pkg.TestClass()</a></div>
                     <div class="col-last odd-row-color">
                     <div class="deprecation-comment">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>
                     </div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg/TestClass.html#%3Cinit%3E(java.lang.String)">pkg.TestClass&#8203;(String)</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg/TestClass.html#%3Cinit%3E(java.lang.String)">pkg.TestClass&#8203;(String)</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">class_test4 passes. Overloaded constructor.</div>
                     </div>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
index c6e5004bc13ac..714b7420448c2 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -672,12 +672,12 @@ void checkHtmlTableContents() {
         // Deprecated
         checkOutput("deprecated-list.html", true,
                 """
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg2/C2.html#dep_field">pkg2.C2.dep_field</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg2/C2.html#dep_field">pkg2.C2.dep_field</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">don't use this field anymore.</div>
                     </div>""",
                 """
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg1/C1.html#deprecatedMethod()">pkg1.C1.deprecatedMethod()</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg1/C1.html#deprecatedMethod()">pkg1.C1.deprecatedMethod()</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">don't use this anymore.</div>
                     </div>""");
@@ -803,10 +803,10 @@ void checkHtmlTableContentsNoComment() {
         // Deprecated
         checkOutput("deprecated-list.html", true,
                 """
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg2/C2.html#dep_field">pkg2.C2.dep_field</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg2/C2.html#dep_field">pkg2.C2.dep_field</a></div>
                     <div class="col-last even-row-color"></div>""",
                 """
-                    <div class="col-deprecated-item-name even-row-color"><a href="pkg1/C1.html#deprecatedMethod()">pkg1.C1.deprecatedMethod()</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="pkg1/C1.html#deprecatedMethod()">pkg1.C1.deprecatedMethod()</a></div>
                     <div class="col-last even-row-color"></div>""");
 
         // Constant values
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index 9b26f5c784327..9bc1a16353a7f 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -289,6 +289,7 @@ public void testSingleModuleMultiplePkg() {
                 "--show-module-contents=all",
                 "-Xdoclint:none",
                 "--module-source-path", testSrc,
+                "--add-modules", "moduleC",
                 "--module", "moduleB",
                 "testpkg2mdlB", "testpkgmdlB");
         checkExit(Exit.OK);
@@ -1091,7 +1092,7 @@ void checkModuleDeprecation(boolean found) {
                     <li><a href="#module">Modules</a></li>
                     </ul>""",
                 """
-                    <div class="col-deprecated-item-name even-row-color"><a href="moduleA/module-summary.html">moduleA</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="moduleA/module-summary.html">moduleA</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">This module is deprecated.</div>""");
         checkOutput("moduleB/module-summary.html", !found,
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
new file mode 100644
index 0000000000000..24af7cfe13476
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8250768
+ * @summary  test generated docs for items declared using preview
+ * @library  ../../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ *          jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.resources:+open
+ * @build    javadoc.tester.*
+ * @run main TestPreview
+ */
+
+import java.nio.file.Paths;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+import javadoc.tester.JavadocTester;
+
+public class TestPreview extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        TestPreview tester = new TestPreview();
+        tester.runTests();
+    }
+
+    @Test
+    public void testUserJavadoc() {
+        String doc = Paths.get(testSrc, "doc").toUri().toString();
+        javadoc("-d", "out-user-javadoc",
+                "-XDforcePreview", "--enable-preview", "-source", System.getProperty("java.specification.version"),
+                "--patch-module", "java.base=" + Paths.get(testSrc, "api").toAbsolutePath().toString(),
+                "--add-exports", "java.base/preview=m",
+                "--module-source-path", testSrc,
+                "-linkoffline", doc, doc,
+                "m/pkg");
+        checkExit(Exit.OK);
+
+        ResourceBundle bundle = ResourceBundle.getBundle("jdk.javadoc.internal.doclets.formats.html.resources.standard", ModuleLayer.boot().findModule("jdk.javadoc").get());
+
+        {
+            String zero = MessageFormat.format(bundle.getString("doclet.PreviewLeadingNote"), "<code>TestPreviewDeclaration</code>");
+            String one = MessageFormat.format(bundle.getString("doclet.Declared_Using_Preview"), "<code>TestPreviewDeclaration</code>", "<em>Sealed Classes</em>", "<code>sealed</code>");
+            String two = MessageFormat.format(bundle.getString("doclet.PreviewTrailingNote1"), "<code>TestPreviewDeclaration</code>");
+            String three = MessageFormat.format(bundle.getString("doclet.PreviewTrailingNote2"), new Object[0]);
+            String expectedTemplate = """
+                                      <div class="preview-block" id="preview-pkg.TestPreviewDeclaration"><span class="preview-label">{0}</span>
+                                      <ul class="preview-comment">
+                                      <li>{1}</li>
+                                      </ul>
+                                      <div class="preview-comment">{2}</div>
+                                      <div class="preview-comment">{3}</div>
+                                      </div>""";
+            String expected = MessageFormat.format(expectedTemplate, zero, one, two, three);
+            checkOutput("m/pkg/TestPreviewDeclaration.html", true, expected);
+        }
+
+        checkOutput("m/pkg/TestPreviewDeclarationUse.html", true,
+                    "<code><a href=\"TestPreviewDeclaration.html\" title=\"interface in pkg\">TestPreviewDeclaration</a><sup><a href=\"TestPreviewDeclaration.html#preview-pkg.TestPreviewDeclaration\">PREVIEW</a></sup></code>");
+        checkOutput("m/pkg/TestPreviewAPIUse.html", true,
+                "<a href=\"" + doc + "java.base/preview/Core.html\" title=\"class or interface in preview\" class=\"external-link\">Core</a><sup><a href=\"" + doc + "java.base/preview/Core.html#preview-preview.Core\" title=\"class or interface in preview\" class=\"external-link\">PREVIEW</a>");
+        checkOutput("m/pkg/DocAnnotation.html", true,
+                "<div class=\"preview-block\" id=\"preview-pkg.DocAnnotation\"><span class=\"preview-label\">");
+        checkOutput("m/pkg/DocAnnotationUse1.html", true,
+                "<div class=\"preview-block\" id=\"preview-pkg.DocAnnotationUse1\"><span class=\"preview-label\">");
+        checkOutput("m/pkg/DocAnnotationUse2.html", true,
+                "<div class=\"preview-block\" id=\"preview-pkg.DocAnnotationUse2\"><span class=\"preview-label\">");
+    }
+
+    @Test
+    public void testPreviewAPIJavadoc() {
+        javadoc("-d", "out-preview-api",
+                "--patch-module", "java.base=" + Paths.get(testSrc, "api").toAbsolutePath().toString(),
+                "--add-exports", "java.base/preview=m",
+                "--source-path", Paths.get(testSrc, "api").toAbsolutePath().toString(),
+                "--show-packages=all",
+                "preview");
+        checkExit(Exit.OK);
+
+        checkOutput("preview-list.html", true,
+                    """
+                    <div id="record.class">
+                    <div class="caption"><span>Record Classes</span></div>
+                    <div class="summary-table two-column-summary">
+                    <div class="table-header col-first">Record Class</div>
+                    <div class="table-header col-last">Description</div>
+                    <div class="col-summary-item-name even-row-color"><a href="java.base/preview/CoreRecord.html" title="class in preview">preview.CoreRecord</a><sup><a href="java.base/preview/CoreRecord.html#preview-preview.CoreRecord">PREVIEW</a></sup></div>
+                    <div class="col-last even-row-color"></div>
+                    </div>
+                    """,
+                    """
+                    <div id="method">
+                    <div class="caption"><span>Methods</span></div>
+                    <div class="summary-table two-column-summary">
+                    <div class="table-header col-first">Method</div>
+                    <div class="table-header col-last">Description</div>
+                    <div class="col-summary-item-name even-row-color"><a href="java.base/preview/CoreRecordComponent.html#i()">preview.CoreRecordComponent.i()</a><sup><a href="java.base/preview/CoreRecordComponent.html#preview-i()">PREVIEW</a></sup></div>
+                    <div class="col-last even-row-color">
+                    <div class="block">Returns the value of the <code>i</code> record component.</div>
+                    </div>
+                    """);
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Core.java b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Core.java
new file mode 100644
index 0000000000000..d2cf31c2e898b
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Core.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package preview;
+
+import jdk.internal.javac.PreviewFeature;
+import jdk.internal.javac.PreviewFeature.Feature;
+
+@PreviewFeature(feature=Feature.TEST)
+public class Core {
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecord.java b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecord.java
new file mode 100644
index 0000000000000..0cfd84d197c36
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecord.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package preview;
+
+import jdk.internal.javac.PreviewFeature;
+import jdk.internal.javac.PreviewFeature.Feature;
+
+@PreviewFeature(feature=Feature.TEST)
+public record CoreRecord(int i) {
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecordComponent.java b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecordComponent.java
new file mode 100644
index 0000000000000..bb081c6c6513b
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/CoreRecordComponent.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package preview;
+
+import jdk.internal.javac.PreviewFeature;
+import jdk.internal.javac.PreviewFeature.Feature;
+
+public record CoreRecordComponent(@PreviewFeature(feature=Feature.TEST) int i) {
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Reflective.java b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Reflective.java
new file mode 100644
index 0000000000000..d4e39595871cb
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/api/preview/Reflective.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package preview;
+
+import jdk.internal.javac.PreviewFeature;
+import jdk.internal.javac.PreviewFeature.Feature;
+
+@PreviewFeature(feature=Feature.TEST, reflective=true)
+public class Reflective {
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/doc/element-list b/test/langtools/jdk/javadoc/doclet/testPreview/doc/element-list
new file mode 100644
index 0000000000000..c59f8fc41e316
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/doc/element-list
@@ -0,0 +1,2 @@
+module:java.base
+preview
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/doc/java.base/preview/Core.html b/test/langtools/jdk/javadoc/doclet/testPreview/doc/java.base/preview/Core.html
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/doc/java.base/preview/Reflective.html b/test/langtools/jdk/javadoc/doclet/testPreview/doc/java.base/preview/Reflective.html
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/m/module-info.java b/test/langtools/jdk/javadoc/doclet/testPreview/m/module-info.java
new file mode 100644
index 0000000000000..28d4629808393
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/m/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+module m {
+    exports pkg;
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotation.java b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotation.java
new file mode 100644
index 0000000000000..d6b5b3d9f83f2
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotation.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+import java.lang.annotation.Documented;
+
+@Documented
+public @interface DocAnnotation {
+
+    public Class<?> a1() default Object.class;
+    public Class<?>[] a2() default {};
+    public Class<?> a3() default TestPreviewDeclaration.class;
+
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse1.java b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse1.java
new file mode 100644
index 0000000000000..be1435468100a
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse1.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+@DocAnnotation(a1=TestPreviewDeclaration.class)
+public class DocAnnotationUse1 {
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse2.java b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse2.java
new file mode 100644
index 0000000000000..0f95e684e46f1
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/DocAnnotationUse2.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+@DocAnnotation(a2={TestPreviewDeclaration.class})
+public class DocAnnotationUse2 {
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewAPIUse.java b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewAPIUse.java
new file mode 100644
index 0000000000000..1eb59b84628a2
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewAPIUse.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+import preview.*;
+
+public class TestPreviewAPIUse {
+
+    public Core fieldCore;
+    public Reflective fieldReflective;
+
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclaration.java b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclaration.java
new file mode 100644
index 0000000000000..81ae744423f7c
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclaration.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+public sealed interface TestPreviewDeclaration permits Impl {
+}
+class Impl implements TestPreviewDeclaration {}
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclarationUse.java b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclarationUse.java
new file mode 100644
index 0000000000000..74cbe30959ffc
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/m/pkg/TestPreviewDeclarationUse.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+public class TestPreviewDeclarationUse {
+
+    public TestPreviewDeclaration field;
+
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
index 5af0efc53e9f0..0ecd564b1f067 100644
--- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -524,7 +524,7 @@ public record R(int r1) { }""");
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Record Class</div>
                     <div class="table-header col-last">Description</div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="p/R.html" title="class in p">p.R</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="p/R.html" title="class in p">p.R</a></div>
                     <div class="col-last even-row-color">
                     <div class="deprecation-comment">Do not use.</div>
                     </div>""");
@@ -556,7 +556,7 @@ public record R(@Deprecated int r1) { }""");
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Method</div>
                     <div class="table-header col-last">Description</div>
-                    <div class="col-deprecated-item-name even-row-color"><a href="p/R.html#r1()">p.R.r1()</a></div>
+                    <div class="col-summary-item-name even-row-color"><a href="p/R.html#r1()">p.R.r1()</a></div>
                     <div class="col-last even-row-color"></div>
                     </div>""");
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java b/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java
index 336005ed6e89d..7c13190fe7125 100644
--- a/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,9 @@ public void testSealedModifierClass(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>""");
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>""");
     }
 
     @Test
@@ -78,8 +79,9 @@ public void testSealedModifierInterface(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed interface </sp\
-                    an><span class="element-name type-name-label">A</span>""");
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> interface </span><span class="element-name type-n\
+                    ame-label">A</span>""");
     }
 
     @Test
@@ -97,13 +99,15 @@ public void testNonSealedModifierClass(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>""");
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>""");
 
         checkOutput("p/B.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public non-sealed class </span><\
-                    span class="element-name type-name-label">B</span>""");
+                    <div class="type-signature"><span class="modifiers">public non-sealed<sup><a hre\
+                    f="#preview-p.B">PREVIEW</a></sup> class </span><span class="element-name type-n\
+                    ame-label">B</span>""");
     }
 
     @Test
@@ -121,13 +125,15 @@ public void testNonSealedModifierInterface(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed interface </span><\
-                    span class="element-name type-name-label">A</span>""");
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> interface </span><span class="element-name type-n\
+                    ame-label">A</span>""");
 
         checkOutput("p/B.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public non-sealed interface </span><\
-                    span class="element-name type-name-label">B</span>""");
+                    <div class="type-signature"><span class="modifiers">public non-sealed<sup><a hre\
+                    f="#preview-p.B">PREVIEW</a></sup> interface </span><span class="element-name ty\
+                    pe-name-label">B</span>""");
     }
 
     @Test
@@ -145,13 +151,15 @@ public void testSealedSubtypeModifierClass(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>""");
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>""");
 
         checkOutput("p/B.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public abstract sealed class\
-                     </span><span class="element-name type-name-label">B</span>""");
+                    <div class="type-signature"><span class="modifiers">public abstract sealed<sup><\
+                    a href="#preview-p.B">PREVIEW</a></sup> class </span><span class="element-name t\
+                    ype-name-label">B</span>""");
     }
 
     @Test
@@ -169,13 +177,15 @@ public void testSealedSubtypeInterface(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed interface </sp\
-                    an><span class="element-name type-name-label">A</span>""");
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> interface </span><span class="element-name type-n\
+                    ame-label">A</span>""");
 
         checkOutput("p/B.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed interface </sp\
-                    an><span class="element-name type-name-label">B</span>""");
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.B">PREVIEW</a></sup> interface </span><span class="element-name type-n\
+                    ame-label">B</span>""");
     }
 
     @Test
@@ -194,10 +204,13 @@ public void testSinglePermits(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>
                     <span class="extends-implements">extends java.lang.Object</span>
-                    <span class="permits">permits <a href="B.html" title="class in p">B</a></span></div>""");
+                    <span class="permits">permits<sup><a href="#preview-p.A">PREVIEW</a></sup> <a hr\
+                    ef="B.html" title="class in p">B</a><sup><a href="B.html#preview-p.B">PREVIEW</a\
+                    ></sup></span></div>""");
     }
 
     @Test
@@ -218,12 +231,15 @@ public void testMultiplePermits(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>
                     <span class="extends-implements">extends java.lang.Object</span>
-                    <span class="permits">permits <a href="B.html" title="class in p">B</a>, <a href\
-                    ="C.html" title="class in p">C</a>, <a href="D.html" title="class in p">D</a></s\
-                    pan></div>""");
+                    <span class="permits">permits<sup><a href="#preview-p.A">PREVIEW</a></sup> <a hr\
+                    ef="B.html" title="class in p">B</a><sup><a href="B.html#preview-p.B">PREVIEW</a\
+                    ></sup>, <a href="C.html" title="class in p">C</a><sup><a href="C.html#preview-p\
+                    .C">PREVIEW</a></sup>, <a href="D.html" title="class in p">D</a><sup><a href="D.\
+                    html#preview-p.D">PREVIEW</a></sup></span></div>""");
     }
 
     @Test
@@ -244,12 +260,15 @@ public void testPartialMultiplePermits(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>
                     <span class="extends-implements">extends java.lang.Object</span>
-                    <span class="permits">permits <a href="B.html" title="class in p">B</a>, <a href\
-                    ="C.html" title="class in p">C</a> <span class="permits-note">(not exhaustive)</\
-                    span></span></div>""");
+                    <span class="permits">permits<sup><a href="#preview-p.A">PREVIEW</a></sup> <a hr\
+                    ef="B.html" title="class in p">B</a><sup><a href="B.html#preview-p.B">PREVIEW</a\
+                    ></sup>, <a href="C.html" title="class in p">C</a><sup><a href="C.html#preview-p\
+                    .C">PREVIEW</a></sup> <span class="permits-note">(not exhaustive)</span></span><\
+                    /div>""");
     }
 
     // @Test // javac incorrectly rejects the source
@@ -271,12 +290,14 @@ public void testPartialMultiplePermitsWithSubtypes1(Path base) throws IOExceptio
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview">PREVIEW</a></sup> class </span><span class="element-name type-name-labe\
+                    l">A</span>
                     <span class="extends-implements">extends java.lang.Object</span>
-                    <span class="permits">permits <a href="A.B.html" title="class in p">A.B</a>, <a \
-                    href="A.C.html" title="class in p">A.C</a>, <a href="A.D.html" title="class in p\
-                    ">A.D</a></span></div>""");
+                    <span class="permits">permits<sup><a href="#preview">PREVIEW</a></sup> <a href="\
+                    A.B.html" title="class in p">A.B</a><sup><a href="B.html#preview">PREVIEW</a></s\
+                    up>, <a href="A.C.html" title="class in p">A.C</a><sup><a href="C.html#preview">\
+                    PREVIEW</a></sup>, <a href="A.D.html" title="class in p">A.D</a></span></div>""");
     }
 
     @Test
@@ -299,12 +320,14 @@ public void testPartialMultiplePermitsWithSubtypes2(Path base) throws IOExceptio
 
         checkOutput("p/A.html", true,
                 """
-                <div class="type-signature"><span class="modifiers">public sealed class </span><span\
-                 class="element-name type-name-label">A</span>
+                <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#prev\
+                iew-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-label">A\
+                </span>
                 <span class="extends-implements">extends java.lang.Object</span>
-                <span class="permits">permits <a href="B.html" title="class in p">B</a>, <a href="C.\
-                html" title="class in p">C</a> <span class="permits-note">(not exhaustive)</span></s\
-                pan></div>""");
+                <span class="permits">permits<sup><a href="#preview-p.A">PREVIEW</a></sup> <a href="\
+                B.html" title="class in p">B</a><sup><a href="B.html#preview-p.B">PREVIEW</a></sup>,\
+                 <a href="C.html" title="class in p">C</a><sup><a href="C.html#preview-p.C">PREVIEW<\
+                /a></sup> <span class="permits-note">(not exhaustive)</span></span></div>""");
     }
 
     @Test
@@ -326,12 +349,15 @@ public void testImplicitPermitsAuxiliary(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>
                     <span class="extends-implements">extends java.lang.Object</span>
-                    <span class="permits">permits <a href="B.html" title="class in p">B</a>, <a href\
-                    ="C.html" title="class in p">C</a>, <a href="D.html" title="class in p">D</a></s\
-                    pan></div>""");
+                    <span class="permits">permits<sup><a href="#preview-p.A">PREVIEW</a></sup> <a hr\
+                    ef="B.html" title="class in p">B</a><sup><a href="B.html#preview-p.B">PREVIEW</a\
+                    ></sup>, <a href="C.html" title="class in p">C</a><sup><a href="C.html#preview-p\
+                    .C">PREVIEW</a></sup>, <a href="D.html" title="class in p">D</a><sup><a href="D.\
+                    html#preview-p.D">PREVIEW</a></sup></span></div>""");
     }
 
     @Test
@@ -353,11 +379,14 @@ public void testImplicitPermitsNested(Path base) throws IOException {
 
         checkOutput("p/A.html", true,
                 """
-                    <div class="type-signature"><span class="modifiers">public sealed class </span><\
-                    span class="element-name type-name-label">A</span>
+                    <div class="type-signature"><span class="modifiers">public sealed<sup><a href="#\
+                    preview-p.A">PREVIEW</a></sup> class </span><span class="element-name type-name-\
+                    label">A</span>
                     <span class="extends-implements">extends java.lang.Object</span>
-                    <span class="permits">permits <a href="A.B.html" title="class in p">A.B</a>, <a \
-                    href="A.C.html" title="class in p">A.C</a>, <a href="A.D.html" title="class in p\
-                    ">A.D</a></span></div>""");
+                    <span class="permits">permits<sup><a href="#preview-p.A">PREVIEW</a></sup> <a hr\
+                    ef="A.B.html" title="class in p">A.B</a><sup><a href="A.B.html#preview-p.A.B">PR\
+                    EVIEW</a></sup>, <a href="A.C.html" title="class in p">A.C</a><sup><a href="A.C.\
+                    html#preview-p.A.C">PREVIEW</a></sup>, <a href="A.D.html" title="class in p">A.D\
+                    </a><sup><a href="A.D.html#preview-p.A.D">PREVIEW</a></sup></span></div>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index ce2965f555b0f..6cc1d10797959 100644
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,7 +160,7 @@ public void test(Path base) {
                     .col-first a:link, .col-first a:visited,
                     .col-second a:link, .col-second a:visited,
                     .col-constructor-name a:link, .col-constructor-name a:visited,
-                    .col-deprecated-item-name a:link, .col-deprecated-item-name a:visited,
+                    .col-summary-item-name a:link, .col-summary-item-name a:visited,
                     .constant-values-container a:link, .constant-values-container a:visited,
                     .all-classes-container a:link, .all-classes-container a:visited,
                     .all-packages-container a:link, .all-packages-container a:visited {
diff --git a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
index 83c056be818b8..e82b062289584 100644
--- a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
+++ b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,6 +151,9 @@ void findDeadKeys(Set<String> codeKeys, Set<String> resourceKeys) {
             // ignore these synthesized keys, tested by usageTests
             if (rk.matches("main\\.opt\\..*\\.(arg|desc)"))
                 continue;
+            // ignore this partial key
+            if (rk.startsWith("doclet.Declared_Using_Preview."))
+                continue;
             if (codeKeys.contains(rk))
                 continue;
 
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index 0161b2b7d760b..52744fe27c89f 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -115,6 +115,7 @@ compiler.warn.illegal.char.for.encoding
 compiler.warn.incubating.modules                        # requires adjusted classfile
 compiler.warn.invalid.archive.file
 compiler.warn.is.preview                                # difficult to produce reliably despite future changes to java.base
+compiler.warn.is.preview.reflective                     # difficult to produce reliably despite future changes to java.base
 compiler.warn.override.bridge
 compiler.warn.position.overflow                         # CRTable: caused by files with long lines >= 1024 chars
 compiler.warn.proc.type.already.exists                  # JavacFiler: just mentioned in TODO
diff --git a/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherModule/CantExtendSealedInAnotherModule.java b/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherModule/CantExtendSealedInAnotherModule.java
index d01cfe215905c..2ff3575c21d91 100644
--- a/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherModule/CantExtendSealedInAnotherModule.java
+++ b/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherModule/CantExtendSealedInAnotherModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,6 @@
  */
 
 // key: compiler.err.class.in.module.cant.extend.sealed.in.diff.module
-// key: compiler.note.preview.filename
+// key: compiler.note.preview.plural
 // key: compiler.note.preview.recompile
 // options: --add-reads mSealed=mSub --enable-preview -source ${jdk.version}
diff --git a/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherPkg/CantExtendSealedInAnotherPkg.java b/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherPkg/CantExtendSealedInAnotherPkg.java
index 26cb9b0583f40..c421689fc3226 100644
--- a/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherPkg/CantExtendSealedInAnotherPkg.java
+++ b/test/langtools/tools/javac/diags/examples/CantExtendSealedInAnotherPkg/CantExtendSealedInAnotherPkg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,6 @@
  */
 
 // key: compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package
-// key: compiler.note.preview.filename
+// key: compiler.note.preview.plural
 // key: compiler.note.preview.recompile
 // options: --enable-preview -source ${jdk.version}
diff --git a/test/langtools/tools/javac/diags/examples/SealedTypes.java b/test/langtools/tools/javac/diags/examples/SealedTypes.java
index b533bddce2026..bcf32afd817de 100644
--- a/test/langtools/tools/javac/diags/examples/SealedTypes.java
+++ b/test/langtools/tools/javac/diags/examples/SealedTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 // key: compiler.misc.feature.sealed.classes
 // key: compiler.warn.preview.feature.use.plural
+// key: compiler.warn.declared.using.preview
 // options: --enable-preview -source ${jdk.version} -Xlint:preview
 
 sealed class Sealed {}
diff --git a/test/langtools/tools/javac/enum/FauxEnum3-preview.out b/test/langtools/tools/javac/enum/FauxEnum3-preview.out
new file mode 100644
index 0000000000000..79a3e388a447c
--- /dev/null
+++ b/test/langtools/tools/javac/enum/FauxEnum3-preview.out
@@ -0,0 +1,4 @@
+FauxEnum3.java:11:14: compiler.err.enum.types.not.extensible
+- compiler.note.preview.filename: FauxEnum3.java, DEFAULT
+- compiler.note.preview.recompile
+1 error
\ No newline at end of file
diff --git a/test/langtools/tools/javac/lib/combo/ComboTask.java b/test/langtools/tools/javac/lib/combo/ComboTask.java
index fddd940e4d02e..04a2a2ebb5173 100644
--- a/test/langtools/tools/javac/lib/combo/ComboTask.java
+++ b/test/langtools/tools/javac/lib/combo/ComboTask.java
@@ -213,6 +213,10 @@ private <V> void doRunTest(Consumer<Result<Iterable<? extends V>>> c,
         });
     }
 
+    public List<JavaFileObject> getSources() {
+        return sources;
+    }
+
     interface Convertor<V> {
         public Iterable<? extends V> convert(JavacTask task) throws IOException;
     }
diff --git a/test/langtools/tools/javac/options/BCPOrSystemNotSpecified.java b/test/langtools/tools/javac/options/BCPOrSystemNotSpecified.java
index c08f843931f77..36bf20b805876 100644
--- a/test/langtools/tools/javac/options/BCPOrSystemNotSpecified.java
+++ b/test/langtools/tools/javac/options/BCPOrSystemNotSpecified.java
@@ -194,7 +194,7 @@ protected void runTests() throws Exception {
     private void prepareBCP(Path target) throws IOException {
         try (JavaFileManager jfm = ToolProvider.getSystemJavaCompiler()
                                                .getStandardFileManager(null, null, null)) {
-            for (String pack : new String[] {"", "java.lang", "java.lang.annotation", "jdk.internal"}) {
+            for (String pack : new String[] {"", "java.lang", "java.lang.annotation", "jdk.internal.javac"}) {
                 JavaFileManager.Location javaBase =
                         jfm.getLocationForModule(StandardLocation.SYSTEM_MODULES,
                                                  "java.base");
diff --git a/test/langtools/tools/javac/patterns/BreakAndLoops.java b/test/langtools/tools/javac/patterns/BreakAndLoops.java
index 3d43fb504b25c..0c19fcbf35dc1 100644
--- a/test/langtools/tools/javac/patterns/BreakAndLoops.java
+++ b/test/langtools/tools/javac/patterns/BreakAndLoops.java
@@ -27,7 +27,6 @@
  * @summary Verify proper scope of binding related to loops and breaks.
  * @library /tools/lib /tools/javac/lib
  * @modules
- *      java.base/jdk.internal
  *      jdk.compiler/com.sun.tools.javac.api
  *      jdk.compiler/com.sun.tools.javac.file
  *      jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/patterns/ConditionalTest.java b/test/langtools/tools/javac/patterns/ConditionalTest.java
index 16f2ceb008459..de6063620118a 100644
--- a/test/langtools/tools/javac/patterns/ConditionalTest.java
+++ b/test/langtools/tools/javac/patterns/ConditionalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary Verify proper scope of binding related to loops and breaks.
  * @library /tools/lib /tools/javac/lib
  * @modules
- *      java.base/jdk.internal
  *      jdk.compiler/com.sun.tools.javac.api
  *      jdk.compiler/com.sun.tools.javac.file
  *      jdk.compiler/com.sun.tools.javac.main
diff --git a/test/langtools/tools/javac/patterns/PatternMatchPosTest.out b/test/langtools/tools/javac/patterns/PatternMatchPosTest.out
index 71eb6d7186dde..0b7f657b257aa 100644
--- a/test/langtools/tools/javac/patterns/PatternMatchPosTest.out
+++ b/test/langtools/tools/javac/patterns/PatternMatchPosTest.out
@@ -11,4 +11,4 @@
 - compiler.note.proc.messager: java.lang.String s
 - compiler.note.proc.messager: java.lang.String
 - compiler.note.proc.messager: java.lang
-- compiler.note.proc.messager: java
\ No newline at end of file
+- compiler.note.proc.messager: java
diff --git a/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.out b/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.out
index f07ff3a3b9675..16dfc44d4b47a 100644
--- a/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.out
+++ b/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.out
@@ -1,4 +1,4 @@
 PreviewAPIsWithRelease.java:12:11: compiler.err.is.preview: stripIndent()
-PreviewAPIsWithRelease.java:13:22: compiler.warn.is.preview: RECORD
+PreviewAPIsWithRelease.java:13:22: compiler.warn.is.preview.reflective: RECORD
 1 error
 1 warning
diff --git a/test/langtools/tools/javac/preview/DeclaredUsingPreview-class.out b/test/langtools/tools/javac/preview/DeclaredUsingPreview-class.out
new file mode 100644
index 0000000000000..cb6f33ab9aad6
--- /dev/null
+++ b/test/langtools/tools/javac/preview/DeclaredUsingPreview-class.out
@@ -0,0 +1,5 @@
+- compiler.warn.preview.feature.use.classfile: DeclaredUsingPreviewDeclarations.class, 17
+- compiler.warn.preview.feature.use.classfile: DeclaredUsingPreviewDeclarations$C.class, 17
+- compiler.warn.preview.feature.use.classfile: DeclaredUsingPreviewDeclarations$C2.class, 17
+DeclaredUsingPreview.java:9:37: compiler.warn.declared.using.preview: kindname.class, DeclaredUsingPreviewDeclarations.C
+4 warnings
diff --git a/test/langtools/tools/javac/preview/DeclaredUsingPreview-source.out b/test/langtools/tools/javac/preview/DeclaredUsingPreview-source.out
new file mode 100644
index 0000000000000..3630a9e0ac53c
--- /dev/null
+++ b/test/langtools/tools/javac/preview/DeclaredUsingPreview-source.out
@@ -0,0 +1,7 @@
+DeclaredUsingPreviewDeclarations.java:3:5: compiler.warn.preview.feature.use.plural: (compiler.misc.feature.sealed.classes)
+DeclaredUsingPreviewDeclarations.java:3:5: compiler.warn.preview.feature.use.plural: (compiler.misc.feature.sealed.classes)
+DeclaredUsingPreviewDeclarations.java:4:5: compiler.warn.preview.feature.use.plural: (compiler.misc.feature.sealed.classes)
+DeclaredUsingPreview.java:9:37: compiler.warn.declared.using.preview: kindname.class, DeclaredUsingPreviewDeclarations.C
+DeclaredUsingPreview.java:10:37: compiler.warn.declared.using.preview: kindname.class, DeclaredUsingPreviewDeclarations.C2
+DeclaredUsingPreviewDeclarations.java:4:33: compiler.warn.declared.using.preview: kindname.class, DeclaredUsingPreviewDeclarations.C
+6 warnings
diff --git a/test/langtools/tools/javac/preview/DeclaredUsingPreview.java b/test/langtools/tools/javac/preview/DeclaredUsingPreview.java
new file mode 100644
index 0000000000000..403c471d1f613
--- /dev/null
+++ b/test/langtools/tools/javac/preview/DeclaredUsingPreview.java
@@ -0,0 +1,11 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug 8250768
+ * @summary Verify javac correctly reports errors for uses of classes declared using preview features.
+ * @compile/ref=DeclaredUsingPreview-source.out -XDrawDiagnostics --enable-preview -source ${jdk.version} -Xlint:preview DeclaredUsingPreview.java DeclaredUsingPreviewDeclarations.java
+ * @compile/ref=DeclaredUsingPreview-class.out -XDrawDiagnostics --enable-preview -source ${jdk.version} -Xlint:preview DeclaredUsingPreview.java
+ */
+public class DeclaredUsingPreview {
+    DeclaredUsingPreviewDeclarations.C c;
+    DeclaredUsingPreviewDeclarations.C2 c2; //TODO: should cause warning?
+}
diff --git a/test/langtools/tools/javac/preview/DeclaredUsingPreviewDeclarations.java b/test/langtools/tools/javac/preview/DeclaredUsingPreviewDeclarations.java
new file mode 100644
index 0000000000000..0cf8b99791497
--- /dev/null
+++ b/test/langtools/tools/javac/preview/DeclaredUsingPreviewDeclarations.java
@@ -0,0 +1,5 @@
+///nodynamiccopyright/
+public class DeclaredUsingPreviewDeclarations {
+    sealed class C {}
+    non-sealed class C2 extends C {}
+}
diff --git a/test/langtools/tools/javac/preview/PreviewAutoSuppress.java b/test/langtools/tools/javac/preview/PreviewAutoSuppress.java
new file mode 100644
index 0000000000000..59266dc27dfdf
--- /dev/null
+++ b/test/langtools/tools/javac/preview/PreviewAutoSuppress.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8250768
+ * @library /tools/lib
+ * @modules
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.main
+ *      jdk.jdeps/com.sun.tools.classfile
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main PreviewAutoSuppress
+ */
+import com.sun.tools.classfile.ClassFile;
+import java.io.InputStream;
+import java.nio.file.Files;
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+public class PreviewAutoSuppress extends TestRunner {
+
+    protected ToolBox tb;
+
+    PreviewAutoSuppress() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public static void main(String... args) throws Exception {
+        PreviewAutoSuppress t = new PreviewAutoSuppress();
+        t.runTests();
+    }
+
+    protected void runTests() throws Exception {
+        runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    @Test
+    public void declarationWarning(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          public class Outer {
+                              record R(int i) {}
+                              R r;
+                          }
+                          """,
+                          """
+                          package test;
+                          public class Use {
+                            Outer.R r;
+                          }
+                          """);
+        Path classes = base.resolve("classes");
+
+        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(classes)
+                .options("--enable-preview",
+                         "-source", String.valueOf(Runtime.version().feature()),
+                         "-Xlint:preview",
+                         "-XDforcePreview",
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(src))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                List.of("Outer.java:3:5: compiler.warn.preview.feature.use.plural: (compiler.misc.feature.records)",
+                        "Outer.java:3:5: compiler.warn.preview.feature.use.plural: (compiler.misc.feature.records)",
+                        "Outer.java:4:5: compiler.warn.declared.using.preview: kindname.record, test.Outer.R",
+                        "Use.java:3:8: compiler.warn.declared.using.preview: kindname.record, test.Outer.R",
+                        "4 warnings");
+        if (!log.equals(expected))
+            throw new Exception("expected output not found" + log);
+        checkPreviewClassfile(classes.resolve("test").resolve("Outer.class"),
+                              true); //TODO: correct?
+        checkPreviewClassfile(classes.resolve("test").resolve("Outer$R.class"),
+                              true);
+        checkPreviewClassfile(classes.resolve("test").resolve("Use.class"),
+                              true);
+    }
+
+    @Test
+    public void previewAPI(Path base) throws Exception {
+        Path apiSrc = base.resolve("api-src");
+        tb.writeJavaFiles(apiSrc,
+                          """
+                          package preview.api;
+                          @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.TEST)
+                          public class Outer {
+                              public void test() {}
+                          }
+                          """,
+                          """
+                          package preview.impl;
+                          import preview.api.Outer;
+                          public class Impl {
+                              public void run() {
+                                  new Outer().test();
+                              }
+                              public static class C extends Outer {}
+                          }
+                          """);
+        Path apiClasses = base.resolve("api-classes");
+
+        new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(apiClasses)
+                .options("-XDforcePreview",
+                         "-XDrawDiagnostics",
+                         "--patch-module", "java.base=" + apiSrc.toString(),
+                         "-Werror")
+                .files(tb.findJavaFiles(apiSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        checkPreviewClassfile(apiClasses.resolve("preview").resolve("api").resolve("Outer.class"),
+                              false);
+        checkPreviewClassfile(apiClasses.resolve("preview").resolve("impl").resolve("Impl.class"),
+                              false);
+        checkPreviewClassfile(apiClasses.resolve("preview").resolve("impl").resolve("Impl$C.class"),
+                              false);
+
+        Path testSrc = base.resolve("test-src");
+        tb.writeJavaFiles(testSrc,
+                          """
+                          package test;
+                          import preview.api.Outer;
+                          public class Use {
+                              public void run() {
+                                  new Outer().test();
+                              }
+                              public static class C extends Outer {}
+                          }
+                          """);
+        Path testClasses = base.resolve("test-classes");
+        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(testClasses)
+                .options("--patch-module", "java.base=" + apiClasses.toString(),
+                         "--add-exports", "java.base/preview.api=ALL-UNNAMED",
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(testSrc))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                List.of("Use.java:2:19: compiler.err.is.preview: preview.api.Outer",
+                        "Use.java:7:35: compiler.err.is.preview: preview.api.Outer",
+                        "Use.java:5:13: compiler.err.is.preview: preview.api.Outer",
+                        "3 errors");
+
+        if (!log.equals(expected))
+            throw new Exception("expected output not found" + log);
+
+        log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .outdir(testClasses)
+                .options("--patch-module", "java.base=" + apiClasses.toString(),
+                         "--add-exports", "java.base/preview.api=ALL-UNNAMED",
+                         "--enable-preview",
+                         "-Xlint:preview",
+                         "-source", String.valueOf(Runtime.version().feature()),
+                         "-XDrawDiagnostics")
+                .files(tb.findJavaFiles(testSrc))
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        expected =
+                List.of("Use.java:5:13: compiler.warn.is.preview: preview.api.Outer",
+                        "Use.java:7:35: compiler.warn.is.preview: preview.api.Outer",
+                        "2 warnings");
+
+        if (!log.equals(expected))
+            throw new Exception("expected output not found" + log);
+
+        checkPreviewClassfile(testClasses.resolve("test").resolve("Use.class"),
+                              true);
+        checkPreviewClassfile(testClasses.resolve("test").resolve("Use$C.class"),
+                              true);
+    }
+
+    private void checkPreviewClassfile(Path p, boolean preview) throws Exception {
+        try (InputStream in = Files.newInputStream(p)) {
+            ClassFile cf = ClassFile.read(in);
+            if (preview && cf.minor_version != 65535) {
+                throw new IllegalStateException("Expected preview class, but got: " + cf.minor_version);
+            } else if (!preview && cf.minor_version != 0) {
+                throw new IllegalStateException("Expected minor version == 0 but got: " + cf.minor_version);
+            }
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/preview/PreviewErrors.java b/test/langtools/tools/javac/preview/PreviewErrors.java
index 2e8fc74e91eda..ae08e885ec3c0 100644
--- a/test/langtools/tools/javac/preview/PreviewErrors.java
+++ b/test/langtools/tools/javac/preview/PreviewErrors.java
@@ -23,19 +23,19 @@
 
 /*
  * @test
- * @bug 8226585
+ * @bug 8226585 8250768
  * @summary Verify behavior w.r.t. preview feature API errors and warnings
  * @library /tools/lib /tools/javac/lib
  * @modules
- *      java.base/jdk.internal
+ *      java.base/jdk.internal.javac
  *      jdk.compiler/com.sun.tools.javac.api
  *      jdk.compiler/com.sun.tools.javac.file
  *      jdk.compiler/com.sun.tools.javac.main
  *      jdk.compiler/com.sun.tools.javac.util
+ *      jdk.jdeps/com.sun.tools.classfile
  * @build toolbox.ToolBox toolbox.JavacTask
  * @build combo.ComboTestHelper
- * @compile --enable-preview -source ${jdk.version} PreviewErrors.java
- * @run main/othervm --enable-preview PreviewErrors
+ * @run main PreviewErrors
  */
 
 import java.io.IOException;
@@ -48,11 +48,19 @@
 import combo.ComboTask;
 import combo.ComboTestHelper;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 import javax.tools.Diagnostic;
 
-import jdk.internal.PreviewFeature;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPoolException;
+import java.io.FileWriter;
+import java.io.UncheckedIOException;
+import java.io.Writer;
+import java.util.Map.Entry;
+import javax.tools.JavaFileObject;
 
 import toolbox.JavacTask;
 import toolbox.ToolBox;
@@ -66,25 +74,120 @@ public class PreviewErrors extends ComboInstance<PreviewErrors> {
         tb = new ToolBox();
     }
 
+    private static String previewAPI(PreviewElementType elementType) {
+        return """
+               package preview.api;
+               public class ${name} {
+                   @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.${preview}
+                                                ${reflective})
+                   public static void test() { }
+                   @jdk.internal.javac.PreviewFeature(feature=jdk.internal.javac.PreviewFeature.Feature.${preview}
+                                                ${reflective})
+                   public static class Clazz {}
+               }
+               """.replace("${name}", elementType.className)
+                  .replace("${preview}", "TEST")
+                  .replace("${reflective}", elementType.reflective);
+    }
+
+    private static final String SEALED_DECLARATION = """
+                                                     package user;
+                                                     public sealed interface R {}
+                                                     final class C implements R {}
+                                                     """;
+
+    static Map<PreviewElementType, Map<Preview, Map<Suppress, Map<Lint, StringBuilder>>>> parts = new TreeMap<>();
     public static void main(String... args) throws Exception {
         new ComboTestHelper<PreviewErrors>()
-                .withDimension("ESSENTIAL", (x, essential) -> x.essential = essential, EssentialAPI.values())
                 .withDimension("PREVIEW", (x, preview) -> x.preview = preview, Preview.values())
                 .withDimension("LINT", (x, lint) -> x.lint = lint, Lint.values())
                 .withDimension("SUPPRESS", (x, suppress) -> x.suppress = suppress, Suppress.values())
-                .withDimension("FROM", (x, from) -> x.from = from, PreviewFrom.values())
+                .withDimension("ELEMENT_TYPE", (x, elementType) -> x.elementType = elementType, PreviewElementType.values())
                 .run(PreviewErrors::new);
+        if (args.length == 1) {
+            try (Writer out = new FileWriter(args[0])) {
+                int petCount = 0;
+                for (Entry<PreviewElementType, Map<Preview, Map<Suppress, Map<Lint, StringBuilder>>>> pet : parts.entrySet()) {
+                    petCount++;
+                    switch (pet.getKey()) {
+                        case API_REFLECTIVE_CLASS, API_CLASS -> {
+                            if (pet.getKey() == PreviewElementType.API_REFLECTIVE_CLASS) {
+                                out.write("<h2>" + petCount + ". Reflective Preview API</h2>\n");
+                            } else {
+                                out.write("<h2>" + petCount + ". Preview API</h2>\n");
+                            }
+                            out.write("API source (part of java.base):\n");
+                            out.write("<pre>\n");
+                            String previewAPI = previewAPI(pet.getKey());
+                            out.write(previewAPI);
+                            out.write("\n</pre>\n");
+                        }
+                        case REFER_TO_DECLARATION_CLASS -> {
+                            out.write("<h2>" + petCount + ". Using an element declared using a preview feature</h2>\n");
+                            out.write("Element declaration:\n");
+                            out.write("<pre>\n");
+                            out.write(SEALED_DECLARATION);
+                            out.write("\n</pre>\n");
+                        }
+                        case LANGUAGE -> {
+                            out.write("<h2>" + petCount + ". Using preview language feature</h2>\n");
+                        }
+                    }
+                    int prevCount = 0;
+                    for (Entry<Preview, Map<Suppress, Map<Lint, StringBuilder>>> prev : pet.getValue().entrySet()) {
+                        prevCount++;
+                        switch (prev.getKey()) {
+                            case YES -> {
+                                out.write("<h3>" + petCount + "." + prevCount + ". With --enable-preview</h3>\n");
+                            }
+                            case NO -> {
+                                out.write("<h3>" + petCount + "." + prevCount + ". Without --enable-preview</h3>\n");
+                            }
+                        }
+                        int supCount = 0;
+                        for (Entry<Suppress, Map<Lint, StringBuilder>> sup : prev.getValue().entrySet()) {
+                            supCount++;
+                            switch (sup.getKey()) {
+                                case YES -> {
+                                    out.write("<h4>" + petCount + "." + prevCount + "." + supCount + ". Usages suppressed with @SuppressWarnings</h4>\n");
+                                }
+                                case NO -> {
+                                    out.write("<h4>" + petCount + "." + prevCount + "." + supCount + ". Usages not suppressed with @SuppressWarnings</h4>\n");
+                                }
+                            }
+                            int lintCount = 0;
+                            for (Entry<Lint, StringBuilder> lint : sup.getValue().entrySet()) {
+                                lintCount++;
+                                switch (lint.getKey()) {
+                                    case NONE -> {
+                                        out.write("<h5>" + petCount + "." + prevCount + "." + supCount + "." + lintCount + ". Neither -Xlint:preview nor -Xlint:-preview</h5>\n");
+                                    }
+                                    case ENABLE_PREVIEW -> {
+                                        out.write("<h5>" + petCount + "." + prevCount + "." + supCount + "." + lintCount + ". With -Xlint:preview</h5>\n");
+                                    }
+                                    case DISABLE_PREVIEW -> {
+                                        out.write("<h5>" + petCount + "." + prevCount + "." + supCount + "." + lintCount + ". With -Xlint:-preview</h5>\n");
+                                    }
+                                }
+                                out.write(lint.getValue().toString());
+                                out.write("\n");
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
-    private EssentialAPI essential;
     private Preview preview;
     private Lint lint;
     private Suppress suppress;
-    private PreviewFrom from;
+    private PreviewElementType elementType;
 
     @Override
     public void doWork() throws IOException {
         Path base = Paths.get(".");
+        tb.cleanDirectory(base);
         Path src = base.resolve("src");
         Path srcJavaBase = src.resolve("java.base");
         Path classes = base.resolve("classes");
@@ -92,62 +195,83 @@ public void doWork() throws IOException {
 
         Files.createDirectories(classesJavaBase);
 
-        String previewAPI = """
-                            package preview.api;
-                            public class Extra {
-                                @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview}
-                                                             ${essential})
-                                public static void test() { }
-                                @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview}
-                                                             ${essential})
-                                public static class Clazz {}
-                            }
-                            """.replace("${preview}", PreviewFeature.Feature.values()[0].name())
-                               .replace("${essential}", essential.expand(null));
-
-         if (from == PreviewFrom.CLASS) {
-            tb.writeJavaFiles(srcJavaBase, previewAPI);
-
-            new JavacTask(tb)
-                    .outdir(classesJavaBase)
-                    .options("--patch-module", "java.base=" + srcJavaBase.toString())
-                    .files(tb.findJavaFiles(srcJavaBase))
-                    .run()
-                    .writeAll();
-         }
+        String previewAPI = previewAPI(elementType);
 
         ComboTask task = newCompilationTask()
-                .withSourceFromTemplate("""
-                                        package test;
-                                        public class Test {
-                                            #{SUPPRESS}
-                                            public void test() {
-                                                preview.api.Extra.test();
-                                                preview.api.Extra.Clazz c;
-                                            }
-                                        }
-                                        """)
                 .withOption("-XDrawDiagnostics")
                 .withOption("-source")
                 .withOption(String.valueOf(Runtime.version().feature()));
 
-        if (from == PreviewFrom.CLASS) {
-            task.withOption("--patch-module")
-                .withOption("java.base=" + classesJavaBase.toString())
-                .withOption("--add-exports")
-                .withOption("java.base/preview.api=ALL-UNNAMED");
-        } else {
-            task.withSourceFromTemplate("Extra", previewAPI)
-                .withOption("--add-exports")
-                .withOption("java.base/jdk.internal=ALL-UNNAMED");
+        switch (elementType) {
+            case API_CLASS, API_REFLECTIVE_CLASS -> {
+                tb.writeJavaFiles(srcJavaBase, previewAPI);
+
+                new JavacTask(tb)
+                        .outdir(classesJavaBase)
+                        .options("--patch-module", "java.base=" + srcJavaBase.toString())
+                        .files(tb.findJavaFiles(srcJavaBase))
+                        .run()
+                        .writeAll();
+
+                task.withOption("--patch-module")
+                    .withOption("java.base=" + classesJavaBase.toString())
+                    .withOption("--add-exports")
+                    .withOption("java.base/preview.api=ALL-UNNAMED");
+            }
+            case API_SOURCE, API_REFLECTIVE_SOURCE -> {
+                tb.writeJavaFiles(srcJavaBase, previewAPI);
+
+                task.withOption("--patch-module")
+                    .withOption("java.base=" + srcJavaBase.toString())
+                    .withOption("--add-exports")
+                    .withOption("java.base/preview.api=ALL-UNNAMED");
+            }
+            case LANGUAGE -> {
+                task.withOption("-XDforcePreview=true");
+            }
+            case REFER_TO_DECLARATION_CLASS -> {
+                tb.writeJavaFiles(srcJavaBase, SEALED_DECLARATION);
+
+                new JavacTask(tb)
+                        .outdir(classesJavaBase)
+                        .options("--patch-module", "java.base=" + srcJavaBase.toString(),
+                                 "--enable-preview",
+                                 "-source", String.valueOf(Runtime.version().feature()))
+                        .files(tb.findJavaFiles(srcJavaBase))
+                        .run()
+                        .writeAll();
+
+                task.withOption("--patch-module")
+                    .withOption("java.base=" + classesJavaBase.toString())
+                    .withOption("--add-exports")
+                    .withOption("java.base/user=ALL-UNNAMED");
+            }
+            case REFER_TO_DECLARATION_SOURCE -> {
+                tb.writeJavaFiles(srcJavaBase, SEALED_DECLARATION);
+
+                task.withOption("--patch-module")
+                    .withOption("java.base=" + srcJavaBase.toString())
+                    .withOption("--add-exports")
+                    .withOption("java.base/user=ALL-UNNAMED");
+            }
         }
 
+        task.withSourceFromTemplate("""
+                                    package test;
+                                    public class Test {
+                                        #{SUPPRESS}
+                                        public void test(Object o) {
+                                            #{ELEMENT_TYPE}
+                                        }
+                                    }
+                                    """);
+
         if (preview.expand(null)!= null) {
-            task = task.withOption(preview.expand(null));
+            task.withOption(preview.expand(null));
         }
 
         if (lint.expand(null) != null) {
-            task = task.withOption(lint.expand(null));
+            task.withOption(lint.expand(null));
         }
 
         task.generate(result -> {
@@ -155,65 +279,174 @@ public void test() {
                                             .flatMap(kind -> result.diagnosticsForKind(kind).stream())
                                             .map(d -> d.getLineNumber() + ":" + d.getColumnNumber() + ":" + d.getCode())
                                             .collect(Collectors.toSet());
-                Set<String> expected;
                 boolean ok;
-                if (essential == EssentialAPI.YES) {
-                    if (preview == Preview.YES) {
-                        if (suppress == Suppress.YES) {
-                            expected = Set.of();
-                        } else if (lint == Lint.ENABLE_PREVIEW) {
-                            expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview");
-                        } else {
-                            expected = Set.of("-1:-1:compiler.note.preview.filename",
-                                              "-1:-1:compiler.note.preview.recompile");
+                boolean previewClass = true;
+                Set<String> expected = null;
+                if (preview == Preview.NO) {
+                    switch (elementType) {
+                        case LANGUAGE -> {
+                            ok = false;
+                            expected = Set.of("5:41:compiler.err.preview.feature.disabled");
+                        }
+                        case REFER_TO_DECLARATION_CLASS -> {
+                            ok = false;
+                            expected = Set.of("-1:-1:compiler.err.preview.feature.disabled.classfile");
+                        }
+                        case REFER_TO_DECLARATION_SOURCE -> {
+                            ok = false;
+                            expected = Set.of("2:8:compiler.err.preview.feature.disabled.plural");
+                        }
+                        case API_CLASS, API_SOURCE -> {
+                            ok = false;
+                            expected = Set.of("6:17:compiler.err.is.preview",
+                                              "5:25:compiler.err.is.preview");
+                        }
+                        case API_REFLECTIVE_CLASS, API_REFLECTIVE_SOURCE -> {
+                            ok = true;
+                            previewClass = false;
+                            if (suppress == Suppress.YES) {
+                                expected = Set.of();
+                            } else if (lint == Lint.NONE || lint == Lint.ENABLE_PREVIEW) {
+                                expected = Set.of("6:20:compiler.warn.is.preview.reflective",
+                                                  "5:28:compiler.warn.is.preview.reflective");
+                            } else {//-Xlint:-preview
+                                expected = Set.of("-1:-1:compiler.note.preview.filename",
+                                                  "-1:-1:compiler.note.preview.recompile");
+                            }
+                        }
+                        default -> {
+                            throw new IllegalStateException(elementType.name());
                         }
-                        ok = true;
-                    } else {
-                        expected = Set.of("5:26:compiler.err.is.preview", "6:26:compiler.err.is.preview");
-                        ok = false;
                     }
                 } else {
-                    if (suppress == Suppress.YES) {
-                        expected = Set.of();
-                    } else if ((preview == Preview.YES && (lint == Lint.NONE || lint == Lint.DISABLE_PREVIEW)) ||
-                               (preview == Preview.NO && lint == Lint.DISABLE_PREVIEW)) {
-                        expected = Set.of("-1:-1:compiler.note.preview.filename",
-                                          "-1:-1:compiler.note.preview.recompile");
-                    } else {
-                        expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview");
-                    }
                     ok = true;
+                    switch (elementType) {
+                        case LANGUAGE -> {
+                            if (lint == Lint.ENABLE_PREVIEW) {
+                                expected = Set.of("5:41:compiler.warn.preview.feature.use");
+                            } else {
+                                expected = Set.of("-1:-1:compiler.note.preview.filename",
+                                                  "-1:-1:compiler.note.preview.recompile");
+                            }
+                        }
+                        case REFER_TO_DECLARATION_CLASS -> {
+                            if (suppress == Suppress.YES) {
+                                if (lint == Lint.ENABLE_PREVIEW) {
+                                    expected = Set.of("-1:-1:compiler.warn.preview.feature.use.classfile");
+                                } else {
+                                    expected = Set.of(/*"-1:-1:compiler.note.preview.filename",
+                                                      "-1:-1:compiler.note.preview.recompile"*/);
+                                }
+                            } else if (lint == Lint.ENABLE_PREVIEW) {
+                                expected = Set.of("5:13:compiler.warn.declared.using.preview",
+                                                  "5:24:compiler.warn.declared.using.preview",
+                                                  "-1:-1:compiler.warn.preview.feature.use.classfile");
+                            } else {
+                                expected = Set.of("-1:-1:compiler.note.preview.filename",
+                                                  "-1:-1:compiler.note.preview.recompile");
+                            }
+                        }
+                        case REFER_TO_DECLARATION_SOURCE -> {
+                            if (lint == Lint.ENABLE_PREVIEW) {
+                                if (suppress == Suppress.YES) {
+                                    expected = Set.of("2:8:compiler.warn.preview.feature.use.plural",
+                                                      "3:26:compiler.warn.declared.using.preview");
+                                } else {
+                                    expected = Set.of("5:13:compiler.warn.declared.using.preview",
+                                                      "5:24:compiler.warn.declared.using.preview",
+                                                      "2:8:compiler.warn.preview.feature.use.plural",
+                                                      "3:26:compiler.warn.declared.using.preview");
+                                }
+                            } else {
+                                if (suppress == Suppress.YES) {
+                                    expected = Set.of("-1:-1:compiler.note.preview.filename",
+                                                      "-1:-1:compiler.note.preview.recompile");
+                                } else {
+                                    expected = Set.of("-1:-1:compiler.note.preview.plural",
+                                                      "-1:-1:compiler.note.preview.recompile");
+                                }
+                            }
+                        }
+                        case API_CLASS, API_SOURCE -> {
+                            if (suppress == Suppress.YES) {
+                                expected = Set.of();
+                            } else if (lint == Lint.ENABLE_PREVIEW) {
+                                expected = Set.of("6:17:compiler.warn.is.preview",
+                                                  "5:25:compiler.warn.is.preview");
+                            } else {
+                                expected = Set.of("-1:-1:compiler.note.preview.filename",
+                                                  "-1:-1:compiler.note.preview.recompile");
+                            }
+                        }
+                        case API_REFLECTIVE_CLASS, API_REFLECTIVE_SOURCE -> {
+                            previewClass = false;
+                            if (suppress == Suppress.YES) {
+                                expected = Set.of();
+                            } else if (lint == Lint.ENABLE_PREVIEW) {
+                                expected = Set.of("6:20:compiler.warn.is.preview.reflective",
+                                                  "5:28:compiler.warn.is.preview.reflective");
+                            } else {
+                                expected = Set.of("-1:-1:compiler.note.preview.filename",
+                                                  "-1:-1:compiler.note.preview.recompile");
+                            }
+                        }
+                    }
+                }
+                if (!elementType.isSource) {
+                    try {
+                        parts.computeIfAbsent(elementType, x -> new TreeMap<>())
+                                .computeIfAbsent(preview, x -> new TreeMap<>())
+                                .computeIfAbsent(suppress, x -> new TreeMap<>())
+                                .computeIfAbsent(lint, x -> new StringBuilder())
+                                .append("<pre>\n")
+                                .append(task.getSources().head.getCharContent(false))
+                                .append("\n</pre>\n")
+                                .append("<pre>\n")
+                                .append(Arrays.stream(Diagnostic.Kind.values())
+                                              .flatMap(kind -> result.diagnosticsForKind(kind).reverse().stream())
+                                              .filter(d -> d.getSource() == null || !d.getSource().getName().contains("R.java"))
+                                              .map(d -> (d.getSource() != null ? d.getSource().getName() + ":" + d.getLineNumber() + ":" : "") + d.getKind()+ ": " + d.getMessage(null)).collect(Collectors.joining("\n")))
+                                .append("\n</pre>\n")
+                                .append(ok ? previewClass ? "Test.class is marked as a preview class file." : "Test.class is <b>NOT</b> marked as a preview class file." : "Does not compile.");
+                    } catch (IOException ex) {
+                        throw new UncheckedIOException(ex);
+                    }
                 }
                 if (ok) {
                     if (!result.get().iterator().hasNext()) {
-                        throw new IllegalStateException("Did not succeed as expected." + actual);
+                        throw new IllegalStateException("Did not succeed as expected for preview=" + preview + ", lint=" + lint + ", suppress=" + suppress + ", elementType=" + elementType + ": actual:\"" + actual + "\"");
+                    }
+                    ClassFile cf;
+                    try {
+                        JavaFileObject testClass = null;
+                        for (JavaFileObject classfile : result.get()) {
+                            if (classfile.isNameCompatible("Test", JavaFileObject.Kind.CLASS)){
+                                testClass = classfile;
+                            }
+                        }
+                        if (testClass == null) {
+                            throw new IllegalStateException("Cannot find Test.class");
+                        }
+                        cf = ClassFile.read(testClass.openInputStream());
+                    } catch (IOException | ConstantPoolException ex) {
+                        throw new IllegalStateException(ex);
+                    }
+                    if (previewClass && cf.minor_version != 65535) {
+                        throw new IllegalStateException("Expected preview class, but got: " + cf.minor_version);
+                    } else if (!previewClass && cf.minor_version != 0) {
+                        throw new IllegalStateException("Expected minor version == 0 but got: " + cf.minor_version);
                     }
                 } else {
                     if (result.get().iterator().hasNext()) {
-                        throw new IllegalStateException("Succeed unexpectedly.");
+                        throw new IllegalStateException("Succeed unexpectedly for preview=" + preview + ", lint=" + lint + ", suppress=" + suppress + ", elementType=" + elementType);
                     }
                 }
-                if (!expected.equals(actual)) {
-                    throw new IllegalStateException("Unexpected output for " + essential + ", " + preview + ", " + lint + ", " + suppress + ", " + from + ": actual: \"" + actual + "\", expected: \"" + expected + "\"");
+                if (expected != null && !expected.equals(actual)) {
+                    throw new IllegalStateException("Unexpected output for preview=" + preview + ", lint=" + lint + ", suppress=" + suppress + ", elementType=" + elementType + ": actual: \"" + actual + "\", expected: \"" + expected + "\"");
                 }
             });
     }
 
-    public enum EssentialAPI implements ComboParameter {
-        YES(", essentialAPI=true"),
-        NO(", essentialAPI=false");
-
-        private final String code;
-
-        private EssentialAPI(String code) {
-            this.code = code;
-        }
-
-        public String expand(String optParameter) {
-            return code;
-        }
-    }
-
     public enum Preview implements ComboParameter {
         YES("--enable-preview"),
         NO(null);
@@ -260,15 +493,53 @@ public String expand(String optParameter) {
         }
     }
 
-    public enum PreviewFrom implements ComboParameter {
-        CLASS,
-        SOURCE;
-
-        private PreviewFrom() {
+    public enum PreviewElementType implements ComboParameter {
+        LANGUAGE("boolean b = o instanceof String s;", ", reflective=false", "", false),
+        REFER_TO_DECLARATION_SOURCE("user.R d1; user.R d2;", ", reflective=false", "", true),
+        REFER_TO_DECLARATION_CLASS("user.R d1; user.R d2;", ", reflective=false", "", false),
+        API_CLASS("""
+                  preview.api.Core.test();
+                  preview.api.Core.Clazz c;
+                  """,
+                  ", reflective=false",
+                  "Core",
+                false),
+        API_REFLECTIVE_CLASS("""
+                  preview.api.Reflect.test();
+                  preview.api.Reflect.Clazz c;
+                  """,
+                  ", reflective=true",
+                  "Reflect",
+                false),
+        API_SOURCE("""
+                   preview.api.Core.test();
+                   preview.api.Core.Clazz c;
+                   """,
+                   ", reflective=false",
+                   "Core",
+                   true),
+        API_REFLECTIVE_SOURCE("""
+                   preview.api.Reflect.test();
+                   preview.api.Reflect.Clazz c;
+                   """,
+                   ", reflective=true",
+                   "Reflect",
+                   true);
+
+        String code;
+        String reflective;
+        String className;
+        boolean isSource;
+
+        private PreviewElementType(String code, String reflective, String className, boolean isSource) {
+            this.code = code;
+            this.reflective = reflective;
+            this.className = className;
+            this.isSource = isSource;
         }
 
         public String expand(String optParameter) {
-            throw new IllegalStateException();
+            return code;
         }
     }
 }
diff --git a/test/langtools/tools/javac/processing/model/element/TestSealed.java b/test/langtools/tools/javac/processing/model/element/TestSealed.java
index 818ab6219cfe6..70ca7c25afb91 100644
--- a/test/langtools/tools/javac/processing/model/element/TestSealed.java
+++ b/test/langtools/tools/javac/processing/model/element/TestSealed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -115,32 +115,32 @@ class ClassOutOfSealedHierarchy extends NonSealedClass1 {}
         );
 
         List<String> expected = List.of(
-                "Note: visiting: SealedInterface Modifiers: [abstract, sealed]",
-                "Note:     this class has: 2, permitted subclasses",
-                "Note:     permitted subclass: NonSealedClass1",
-                "Note:     permitted subclass: SealedClass",
-                "Note: visiting: NonSealedClass1 Modifiers: [non-sealed]",
-                "Note:     this class has: 0, permitted subclasses",
-                "Note: visiting: SealedClass Modifiers: [sealed]",
-                "Note:     this class has: 2, permitted subclasses",
-                "Note:     permitted subclass: FinalClass",
-                "Note:     permitted subclass: NonSealedClass2",
-                "Note: visiting: FinalClass Modifiers: [final]",
-                "Note:     this class has: 0, permitted subclasses",
-                "Note: visiting: NonSealedClass2 Modifiers: [non-sealed]",
-                "Note:     this class has: 0, permitted subclasses",
-                "Note: visiting: ClassOutOfSealedHierarchy Modifiers: []",
-                "Note:     this class has: 0, permitted subclasses",
-                "Note: testSealedClassesProcessor" + File.separator + "src" + File.separator
-                        + "Test" + File.separator + "SealedInterface.java uses preview language features.",
-                "Note: Recompile with -Xlint:preview for details."
+                "- compiler.note.proc.messager: visiting: SealedInterface Modifiers: [abstract, sealed]",
+                "- compiler.note.proc.messager:     this class has: 2, permitted subclasses",
+                "- compiler.note.proc.messager:     permitted subclass: NonSealedClass1",
+                "- compiler.note.proc.messager:     permitted subclass: SealedClass",
+                "- compiler.note.proc.messager: visiting: NonSealedClass1 Modifiers: [non-sealed]",
+                "- compiler.note.proc.messager:     this class has: 0, permitted subclasses",
+                "- compiler.note.proc.messager: visiting: SealedClass Modifiers: [sealed]",
+                "- compiler.note.proc.messager:     this class has: 2, permitted subclasses",
+                "- compiler.note.proc.messager:     permitted subclass: FinalClass",
+                "- compiler.note.proc.messager:     permitted subclass: NonSealedClass2",
+                "- compiler.note.proc.messager: visiting: FinalClass Modifiers: [final]",
+                "- compiler.note.proc.messager:     this class has: 0, permitted subclasses",
+                "- compiler.note.proc.messager: visiting: NonSealedClass2 Modifiers: [non-sealed]",
+                "- compiler.note.proc.messager:     this class has: 0, permitted subclasses",
+                "- compiler.note.proc.messager: visiting: ClassOutOfSealedHierarchy Modifiers: []",
+                "- compiler.note.proc.messager:     this class has: 0, permitted subclasses",
+                "- compiler.note.preview.filename: SealedInterface.java, DEFAULT",
+                "- compiler.note.preview.recompile"
         );
 
         for (Mode mode : new Mode[] {Mode.API}) {
             List<String> log = new JavacTask(tb, mode)
                     .options("-processor", SealedClassesProcessor.class.getName(),
                             "--enable-preview",
-                            "-source", Integer.toString(Runtime.version().feature()))
+                            "-source", Integer.toString(Runtime.version().feature()),
+                            "-XDrawDiagnostics")
                     .files(findJavaFiles(src))
                     .outdir(classes)
                     .run()
diff --git a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
index 041daccd7a654..92beb53e88d44 100644
--- a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
+++ b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -601,6 +601,8 @@ public void testDifferentModuleNeg(Path base) throws Exception {
 
         List<String> expected = List.of(
             "Base.java:1:46: compiler.err.class.in.module.cant.extend.sealed.in.diff.module: a.Base, mSealed",
+            "- compiler.note.preview.plural: DEFAULT",
+            "- compiler.note.preview.recompile",
             "1 error"
         );
         if (!error.containsAll(expected)) {
diff --git a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
index d0d208d579d73..0f014f4bc3613 100644
--- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
+++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
@@ -92,7 +92,7 @@ public void compileAll() throws Exception {
     public Object[][] jdkModules() {
         return new Object[][]{
             {"jdk.compiler", new String[]{
-                                "java.base/jdk.internal",
+                                "java.base/jdk.internal.javac",
                                 "java.base/jdk.internal.jmod",
                                 "java.base/jdk.internal.misc",
                                 "java.base/sun.reflect.annotation",

From 1bd015fb0c29e1e4ea3ada86b6c83bf000956c02 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 11 Jan 2021 11:28:29 +0000
Subject: [PATCH 108/129] 8258407: Split up CompileJavaModules.gmk into
 make/modules/$M/Java.gmk

Reviewed-by: erikj
---
 make/CompileJavaModules.gmk                   | 593 +-----------------
 make/modules/java.base/Java.gmk               |  50 ++
 make/modules/java.compiler/Java.gmk           |  27 +
 make/modules/java.datatransfer/Java.gmk       |  28 +
 make/modules/java.desktop/Java.gmk            | 152 +++++
 make/modules/java.instrument/Java.gmk         |  27 +
 make/modules/java.logging/Java.gmk            |  27 +
 make/modules/java.management.rmi/Java.gmk     |  27 +
 make/modules/java.management/Java.gmk         |  27 +
 make/modules/java.naming/Java.gmk             |  28 +
 make/modules/java.prefs/Java.gmk              |  27 +
 make/modules/java.rmi/Java.gmk                |  32 +
 make/modules/java.scripting/Java.gmk          |  29 +
 make/modules/java.security.jgss/Java.gmk      |  27 +
 make/modules/java.smartcardio/Java.gmk        |  27 +
 make/modules/java.sql.rowset/Java.gmk         |  32 +
 make/modules/java.sql/Java.gmk                |  27 +
 make/modules/java.transaction.xa/Java.gmk     |  27 +
 make/modules/java.xml.crypto/Java.gmk         |  29 +
 make/modules/java.xml/Java.gmk                |  29 +
 make/modules/jdk.aot/Java.gmk                 |  54 ++
 make/modules/jdk.charsets/Java.gmk            |  26 +
 make/modules/jdk.compiler/Java.gmk            |  31 +
 make/modules/jdk.dev/Java.gmk                 |  30 +
 make/modules/jdk.dynalink/Java.gmk            |  26 +
 make/modules/jdk.editpad/Java.gmk             |  26 +
 make/modules/jdk.hotspot.agent/Java.gmk       |  28 +
 make/modules/jdk.httpserver/Java.gmk          |  26 +
 make/modules/jdk.incubator.vector/Java.gmk    |  26 +
 make/modules/jdk.internal.jvmstat/Java.gmk    |  26 +
 make/modules/jdk.internal.le/Java.gmk         |  26 +
 make/modules/jdk.internal.opt/Java.gmk        |  26 +
 make/modules/jdk.internal.vm.ci/Java.gmk      |  38 ++
 .../modules/jdk.internal.vm.compiler/Java.gmk |  88 +++
 make/modules/jdk.jartool/Java.gmk             |  27 +
 make/modules/jdk.javadoc/Java.gmk             |  26 +
 make/modules/jdk.jcmd/Java.gmk                |  26 +
 make/modules/jdk.jconsole/Java.gmk            |  29 +
 make/modules/jdk.jdeps/Java.gmk               |  30 +
 make/modules/jdk.jdi/Java.gmk                 |  33 +
 make/modules/jdk.jfr/Java.gmk                 |  28 +
 make/modules/jdk.jpackage/Java.gmk            |  30 +
 make/modules/jdk.jshell/Java.gmk              |  26 +
 make/modules/jdk.localedata/Java.gmk          |  30 +
 make/modules/jdk.sctp/Java.gmk                |  46 ++
 make/modules/jdk.unsupported.desktop/Java.gmk |  26 +
 make/modules/sun.charsets/Java.gmk            |  26 +
 47 files changed, 1570 insertions(+), 562 deletions(-)
 create mode 100644 make/modules/java.base/Java.gmk
 create mode 100644 make/modules/java.compiler/Java.gmk
 create mode 100644 make/modules/java.datatransfer/Java.gmk
 create mode 100644 make/modules/java.desktop/Java.gmk
 create mode 100644 make/modules/java.instrument/Java.gmk
 create mode 100644 make/modules/java.logging/Java.gmk
 create mode 100644 make/modules/java.management.rmi/Java.gmk
 create mode 100644 make/modules/java.management/Java.gmk
 create mode 100644 make/modules/java.naming/Java.gmk
 create mode 100644 make/modules/java.prefs/Java.gmk
 create mode 100644 make/modules/java.rmi/Java.gmk
 create mode 100644 make/modules/java.scripting/Java.gmk
 create mode 100644 make/modules/java.security.jgss/Java.gmk
 create mode 100644 make/modules/java.smartcardio/Java.gmk
 create mode 100644 make/modules/java.sql.rowset/Java.gmk
 create mode 100644 make/modules/java.sql/Java.gmk
 create mode 100644 make/modules/java.transaction.xa/Java.gmk
 create mode 100644 make/modules/java.xml.crypto/Java.gmk
 create mode 100644 make/modules/java.xml/Java.gmk
 create mode 100644 make/modules/jdk.aot/Java.gmk
 create mode 100644 make/modules/jdk.charsets/Java.gmk
 create mode 100644 make/modules/jdk.compiler/Java.gmk
 create mode 100644 make/modules/jdk.dev/Java.gmk
 create mode 100644 make/modules/jdk.dynalink/Java.gmk
 create mode 100644 make/modules/jdk.editpad/Java.gmk
 create mode 100644 make/modules/jdk.hotspot.agent/Java.gmk
 create mode 100644 make/modules/jdk.httpserver/Java.gmk
 create mode 100644 make/modules/jdk.incubator.vector/Java.gmk
 create mode 100644 make/modules/jdk.internal.jvmstat/Java.gmk
 create mode 100644 make/modules/jdk.internal.le/Java.gmk
 create mode 100644 make/modules/jdk.internal.opt/Java.gmk
 create mode 100644 make/modules/jdk.internal.vm.ci/Java.gmk
 create mode 100644 make/modules/jdk.internal.vm.compiler/Java.gmk
 create mode 100644 make/modules/jdk.jartool/Java.gmk
 create mode 100644 make/modules/jdk.javadoc/Java.gmk
 create mode 100644 make/modules/jdk.jcmd/Java.gmk
 create mode 100644 make/modules/jdk.jconsole/Java.gmk
 create mode 100644 make/modules/jdk.jdeps/Java.gmk
 create mode 100644 make/modules/jdk.jdi/Java.gmk
 create mode 100644 make/modules/jdk.jfr/Java.gmk
 create mode 100644 make/modules/jdk.jpackage/Java.gmk
 create mode 100644 make/modules/jdk.jshell/Java.gmk
 create mode 100644 make/modules/jdk.localedata/Java.gmk
 create mode 100644 make/modules/jdk.sctp/Java.gmk
 create mode 100644 make/modules/jdk.unsupported.desktop/Java.gmk
 create mode 100644 make/modules/sun.charsets/Java.gmk

diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index a76a8f4a21ab0..c039ad30b002c 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -31,516 +31,6 @@ include MakeBase.gmk
 include Modules.gmk
 include JavaCompilation.gmk
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
-
-################################################################################
-# Module specific build settings
-
-java.base_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
-    '-Xdoclint/package:java.*,javax.*'
-java.base_JAVAC_FLAGS += -XDstringConcat=inline
-java.base_COPY += .icu .dat .spp .nrm content-types.properties \
-    hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
-java.base_CLEAN += intrinsic.properties
-
-java.base_EXCLUDE_FILES += \
-  $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
-
-java.base_EXCLUDES += java/lang/doc-files
-
-# Exclude BreakIterator classes that are just used in compile process to generate
-# data files and shouldn't go in the product
-java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
-
-ifeq ($(call isTargetOs, macosx aix), false)
-  java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
-endif
-
-ifeq ($(call isTargetOs, windows), true)
-  java.base_EXCLUDE_FILES += \
-      sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
-      #
-endif
-
-################################################################################
-
-java.compiler_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.datatransfer_DOCLINT += -Xdoclint:all/protected,-reference \
-    '-Xdoclint/package:java.*,javax.*'
-java.datatransfer_COPY += flavormap.properties
-
-################################################################################
-
-java.desktop_DOCLINT += -Xdoclint:all/protected,-reference \
-    '-Xdoclint/package:java.*,javax.*'
-java.desktop_COPY += .gif .png .wav .txt .xml .css .pf
-java.desktop_CLEAN += iio-plugin.properties cursors.properties
-
-java.desktop_EXCLUDES += \
-    java/awt/doc-files \
-    javax/swing/doc-files \
-    javax/swing/text/doc-files \
-    javax/swing/plaf/synth/doc-files \
-    javax/swing/undo/doc-files \
-    sun/awt/X11/doc-files \
-    #
-
-java.desktop_EXCLUDE_FILES += \
-    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
-    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
-    javax/swing/plaf/nimbus/ScrollBarPainter.java \
-    javax/swing/plaf/nimbus/SliderPainter.java \
-    javax/swing/plaf/nimbus/SpinnerPainter.java \
-    javax/swing/plaf/nimbus/SplitPanePainter.java \
-    javax/swing/plaf/nimbus/TabbedPanePainter.java \
-    sun/awt/resources/security-icon-bw16.png \
-    sun/awt/resources/security-icon-bw24.png \
-    sun/awt/resources/security-icon-bw32.png \
-    sun/awt/resources/security-icon-bw48.png \
-    sun/awt/resources/security-icon-interim16.png \
-    sun/awt/resources/security-icon-interim24.png \
-    sun/awt/resources/security-icon-interim32.png \
-    sun/awt/resources/security-icon-interim48.png \
-    sun/awt/resources/security-icon-yellow16.png \
-    sun/awt/resources/security-icon-yellow24.png \
-    sun/awt/resources/security-icon-yellow32.png \
-    sun/awt/resources/security-icon-yellow48.png \
-    sun/awt/X11/java-icon16.png \
-    sun/awt/X11/java-icon24.png \
-    sun/awt/X11/java-icon32.png \
-    sun/awt/X11/java-icon48.png \
-    .template \
-    #
-
-ifeq ($(call isTargetOs, macosx), true)
-  # exclude all X11 on Mac.
-  java.desktop_EXCLUDES += \
-      sun/awt/X11 \
-      sun/java2d/x11 \
-      sun/java2d/jules \
-      sun/java2d/xr \
-      com/sun/java/swing/plaf/gtk \
-      #
-  java.desktop_EXCLUDE_FILES += \
-      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
-      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
-      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
-      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
-      #
-else
-  # TBD: figure out how to eliminate this long list
-  java.desktop_EXCLUDE_FILES += \
-      sun/awt/X11/ScreenFormat.java \
-      sun/awt/X11/XArc.java \
-      sun/awt/X11/XChar2b.java \
-      sun/awt/X11/XCharStruct.java \
-      sun/awt/X11/XClassHint.java \
-      sun/awt/X11/XComposeStatus.java \
-      sun/awt/X11/XExtCodes.java \
-      sun/awt/X11/XFontProp.java \
-      sun/awt/X11/XFontSetExtents.java \
-      sun/awt/X11/XFontStruct.java \
-      sun/awt/X11/XGCValues.java \
-      sun/awt/X11/XHostAddress.java \
-      sun/awt/X11/XIMCallback.java \
-      sun/awt/X11/XIMHotKeyTrigger.java \
-      sun/awt/X11/XIMHotKeyTriggers.java \
-      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
-      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
-      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
-      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
-      sun/awt/X11/XIMStringConversionCallbackStruct.java \
-      sun/awt/X11/XIMStringConversionText.java \
-      sun/awt/X11/XIMStyles.java \
-      sun/awt/X11/XIMText.java \
-      sun/awt/X11/XIMValuesList.java \
-      sun/awt/X11/XImage.java \
-      sun/awt/X11/XKeyboardControl.java \
-      sun/awt/X11/XKeyboardState.java \
-      sun/awt/X11/XOMCharSetList.java \
-      sun/awt/X11/XOMFontInfo.java \
-      sun/awt/X11/XOMOrientation.java \
-      sun/awt/X11/XPoint.java \
-      sun/awt/X11/XRectangle.java \
-      sun/awt/X11/XSegment.java \
-      sun/awt/X11/XStandardColormap.java \
-      sun/awt/X11/XTextItem.java \
-      sun/awt/X11/XTextItem16.java \
-      sun/awt/X11/XTextProperty.java \
-      sun/awt/X11/XTimeCoord.java \
-      sun/awt/X11/XWindowChanges.java \
-      sun/awt/X11/XdbeSwapInfo.java \
-      sun/awt/X11/XmbTextItem.java \
-      sun/awt/X11/XwcTextItem.java
-endif
-
-ifeq ($(call isTargetOs, windows), true)
-  java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
-endif
-
-ifeq ($(call isTargetOs, windows macosx), false)
-  java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
-endif
-
-# These files do not appear in the build result of the old build. This
-# is because they are generated sources, but the AUTO_JAVA_FILES won't
-# pick them up since they aren't generated when the source dirs are
-# searched and they aren't referenced by any other classes so they won't
-# be picked up by implicit compilation. On a rebuild, they are picked up
-# and compiled. Exclude them here to produce the same rt.jar as the old
-# build does when building just once.
-java.desktop_EXCLUDE_FILES += \
-    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
-    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
-    javax/swing/plaf/nimbus/ScrollBarPainter.java \
-    javax/swing/plaf/nimbus/SliderPainter.java \
-    javax/swing/plaf/nimbus/SpinnerPainter.java \
-    javax/swing/plaf/nimbus/SplitPanePainter.java \
-    javax/swing/plaf/nimbus/TabbedPanePainter.java \
-    #
-
-################################################################################
-
-java.scripting_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:java.*,javax.*'
-java.scripting_COPY += .js
-java.scripting_CLEAN += .properties
-
-################################################################################
-
-java.instrument_DOCLINT += -Xdoclint:all/protected,-accessibility \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.logging_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.management_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.management.rmi_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:javax.*'
-
-################################################################################
-
-java.prefs_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.transaction.xa_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:javax.*'
-
-################################################################################
-
-java.sql_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.sql.rowset_DOCLINT += -Xdoclint:all/protected,-accessibility \
-    '-Xdoclint/package:java.*,javax.*'
-java.sql.rowset_CLEAN_FILES += $(wildcard \
-    $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
-    $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
-
-################################################################################
-
-java.rmi_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:java.*,javax.*'
-java.rmi_CLEAN_FILES += $(wildcard \
-    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
-    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
-
-################################################################################
-
-java.xml_DOCLINT += -Xdoclint:all/protected,-accessibility \
-    '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
-    javax.xml.transform javax.xml.validation javax.xml.xpath)'
-java.xml_CLEAN += .properties
-
-################################################################################
-
-java.naming_DOCLINT += -Xdoclint:all/protected,-accessibility \
-    '-Xdoclint/package:java.*,javax.*'
-java.naming_CLEAN += jndiprovider.properties
-
-################################################################################
-
-java.security.jgss_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.smartcardio_DOCLINT += -Xdoclint:all/protected,-accessibility \
-    '-Xdoclint/package:java.*,javax.*'
-
-################################################################################
-
-java.xml.crypto_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:java.*,javax.*'
-java.xml.crypto_COPY += .dtd .xml
-java.xml.crypto_CLEAN += .properties
-
-################################################################################
-
-jdk.charsets_COPY += .dat
-
-################################################################################
-
-################################################################################
-
-jdk.compiler_DOCLINT += -Xdoclint:all/protected \
-    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*'
-jdk.compiler_JAVAC_FLAGS += -XDstringConcat=inline
-jdk.compiler_CLEAN_FILES += $(wildcard \
-    $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
-        sun/tools/serialver/resources))
-
-################################################################################
-
-jdk.hotspot.agent_DISABLED_WARNINGS += rawtypes serial cast static overrides \
-    fallthrough
-jdk.hotspot.agent_COPY += .gif .png .properties
-
-################################################################################
-
-jdk.editpad_COPY += .properties
-
-################################################################################
-
-jdk.jshell_COPY += .jsh .properties
-
-################################################################################
-
-jdk.internal.le_COPY += .properties .caps .txt
-
-################################################################################
-
-jdk.internal.opt_COPY += .properties
-
-################################################################################
-
-jdk.jcmd_COPY += _options
-
-################################################################################
-
-jdk.dynalink_CLEAN += .properties
-
-################################################################################
-
-jdk.javadoc_COPY += .xml .css .js .js.template .png .txt
-
-################################################################################
-
-jdk.jartool_DISABLED_WARNINGS += missing-explicit-ctor
-jdk.jartool_JAVAC_FLAGS += -XDstringConcat=inline
-
-################################################################################
-
-jdk.httpserver_DISABLED_WARNINGS += missing-explicit-ctor
-
-################################################################################
-
-jdk.unsupported.desktop_DISABLED_WARNINGS += missing-explicit-ctor
-
-################################################################################
-
-# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
-SCTP_IMPL_CLASSES = \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
-    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
-
-ifeq ($(call isTargetOs, macosx), true)
-  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
-endif
-
-ifeq ($(call isTargetOs, aix), true)
-  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
-endif
-
-################################################################################
-
-jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
-    .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
-    .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff
-
-jdk.jpackage_CLEAN += .properties
-
-################################################################################
-
-jdk.jconsole_COPY += .gif .png
-
-jdk.jconsole_CLEAN_FILES += $(wildcard \
-    $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
-
-################################################################################
-
-jdk.jdeps_COPY += .txt
-
-jdk.jdeps_CLEAN_FILES += $(wildcard \
-    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
-    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
-
-################################################################################
-
-jdk.jdi_EXCLUDES += \
-    com/sun/tools/example/debug/bdi \
-    com/sun/tools/example/debug/event \
-    com/sun/tools/example/debug/gui \
-    com/sun/jdi/doc-files \
-    #
-
-jdk.jdi_EXCLUDE_FILES += jdi-overview.html
-
-################################################################################
-
-jdk.dev_CLEAN_FILES += $(wildcard \
-    $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
-        com/sun/tools/script/shell))
-
-jdk.dev_COPY += .js oqlhelp.html .txt
-
-################################################################################
-
-jdk.internal.jvmstat_COPY += aliasmap
-
-################################################################################
-
-# -parameters provides method's parameters information in class file,
-# JVMCI compilers make use of that information for various sanity checks.
-# Don't use Indy strings concatenation to have good JVMCI startup performance.
-# The exports are needed since JVMCI is dynamically exported (see
-# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
-
-jdk.internal.vm.ci_JAVAC_FLAGS += -parameters -XDstringConcat=inline
-
-################################################################################
-
-jdk.internal.vm.compiler_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \
-    #
-
-jdk.internal.vm.compiler_EXCLUDES += \
-    jdk.internal.vm.compiler.collections.test \
-    jdk.tools.jaotc.test \
-    org.graalvm.compiler.api.directives.test \
-    org.graalvm.compiler.api.test \
-    org.graalvm.compiler.asm.aarch64.test \
-    org.graalvm.compiler.asm.amd64.test \
-    org.graalvm.compiler.asm.test \
-    org.graalvm.compiler.core.aarch64.test \
-    org.graalvm.compiler.core.amd64.test \
-    org.graalvm.compiler.core.jdk9.test \
-    org.graalvm.compiler.core.match.processor \
-    org.graalvm.compiler.core.test \
-    org.graalvm.compiler.debug.test \
-    org.graalvm.compiler.graph.test \
-    org.graalvm.compiler.hotspot.aarch64.test \
-    org.graalvm.compiler.hotspot.amd64.test \
-    org.graalvm.compiler.hotspot.jdk15.test \
-    org.graalvm.compiler.hotspot.jdk9.test \
-    org.graalvm.compiler.hotspot.lir.test \
-    org.graalvm.compiler.hotspot.test \
-    org.graalvm.compiler.jtt \
-    org.graalvm.compiler.lir.jtt \
-    org.graalvm.compiler.lir.test \
-    org.graalvm.compiler.loop.test \
-    org.graalvm.compiler.microbenchmarks \
-    org.graalvm.compiler.nodeinfo.processor \
-    org.graalvm.compiler.nodes.test \
-    org.graalvm.compiler.options.processor \
-    org.graalvm.compiler.options.test \
-    org.graalvm.compiler.phases.common.test \
-    org.graalvm.compiler.processor \
-    org.graalvm.compiler.replacements.jdk10.test \
-    org.graalvm.compiler.replacements.jdk12.test \
-    org.graalvm.compiler.replacements.jdk9.test \
-    org.graalvm.compiler.replacements.processor \
-    org.graalvm.compiler.replacements.test \
-    org.graalvm.compiler.serviceprovider.processor \
-    org.graalvm.compiler.test \
-    org.graalvm.compiler.virtual.bench \
-    org.graalvm.micro.benchmarks \
-    org.graalvm.util.test \
-    #
-
-################################################################################
-
-# -parameters provides method's parameters information in class file,
-# JVMCI compilers make use of that information for various sanity checks.
-# Don't use Indy strings concatenation to have good JAOTC startup performance.
-# The exports are needed since JVMCI is dynamically exported (see
-# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
-
-jdk.aot_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \
-    #
-
-jdk.aot_EXCLUDES += \
-    jdk.tools.jaotc.test
-    #
-
-################################################################################
-
-sun.charsets_COPY += .dat
-
-################################################################################
-
-jdk.localedata_COPY += _dict _th
-# Exclude BreakIterator classes that are just used in compile process to generate
-# data files and shouldn't go in the product
-jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
-jdk.localedata_KEEP_ALL_TRANSLATIONS := true
-################################################################################
-
-jdk.jfr_DISABLED_WARNINGS += exports
-jdk.jfr_COPY := .xsd .xml .dtd
-jdk.jfr_JAVAC_FLAGS := -XDstringConcat=inline
-
-################################################################################
-
-jdk.incubator.vector_DOCLINT += -Xdoclint:all/protected
-
 ################################################################################
 # If this is an imported module that has prebuilt classes, only compile
 # module-info.java.
@@ -577,29 +67,29 @@ MODULESOURCEPATH := $(call GetModuleSrcPath)
 # Add imported modules to the modulepath
 MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
 
-ifeq ($(MODULE), jdk.internal.vm.ci)
-  ## WORKAROUND jdk.internal.vm.ci source structure issue
-  JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
-      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
-          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
-  MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
-endif
+################################################################################
+# Copy zh_HK properties files from zh_TW (needed by some modules)
 
-ifeq ($(MODULE), jdk.internal.vm.compiler)
-  ## WORKAROUND jdk.internal.vm.compiler source structure issue
-  VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
-      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
-          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
-  MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
-endif
+$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
+	$(install-file)
 
-ifeq ($(MODULE), jdk.aot)
-  ## WORKAROUND jdk.aot source structure issue
-  AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
-      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
-          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
-  MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
-endif
+CreateHkTargets = \
+    $(call FilterExcludedTranslations, \
+       $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
+         $(subst /share/classes,, \
+            $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
+         ) \
+       ), \
+       .properties \
+    )
+
+################################################################################
+# Include module specific build settings
+
+-include $(TOPDIR)/make/modules/$(MODULE)/Java.gmk
+
+################################################################################
+# Setup the main compilation
 
 $(eval $(call SetupJavaCompilation, $(MODULE), \
     SMALL_JAVA := false, \
@@ -610,15 +100,22 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
     HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
     CREATE_API_DIGEST := true, \
+    CLEAN := $(CLEAN), \
+    CLEAN_FILES := $(CLEAN_FILES), \
+    COPY := $(COPY), \
+    DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
+    EXCLUDES := $(EXCLUDES), \
+    EXCLUDE_FILES := $(EXCLUDE_FILES), \
+    KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
     JAVAC_FLAGS := \
-        $($(MODULE)_DOCLINT) \
-        $($(MODULE)_JAVAC_FLAGS) \
+        $(DOCLINT) \
+        $(JAVAC_FLAGS) \
         --module-source-path $(MODULESOURCEPATH) \
         --module-path $(MODULEPATH) \
         --system none, \
 ))
 
-TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
+TARGETS += $($(MODULE))
 
 # Declare dependencies between java compilations of different modules.
 # Since the other modules are declared in different invocations of this file,
@@ -629,30 +126,6 @@ $($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)),
     $(call SetupJavaCompilationApiTarget, $d, \
         $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
 
-################################################################################
-# Copy zh_HK properties files from zh_TW
-
-$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
-	$(install-file)
-
-CreateHkTargets = \
-    $(call FilterExcludedTranslations, \
-       $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
-         $(subst /share/classes,, \
-            $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
-         ) \
-       ), \
-       .properties \
-    )
-
-ifeq ($(MODULE), java.sql.rowset)
-  TARGETS += $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES))
-endif
-
-ifeq ($(MODULE), java.rmi)
-  TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
-endif
-
 ################################################################################
 # If this is an imported module, copy the pre built classes and resources into
 # the modules output dir
@@ -675,10 +148,6 @@ endif
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))
-
-################################################################################
-
 all: $(TARGETS)
 
 .PHONY: all
diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk
new file mode 100644
index 0000000000000..58d707e6148c5
--- /dev/null
+++ b/make/modules/java.base/Java.gmk
@@ -0,0 +1,50 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+JAVAC_FLAGS += -XDstringConcat=inline
+COPY += .icu .dat .spp .nrm content-types.properties \
+    hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
+CLEAN += intrinsic.properties
+
+EXCLUDE_FILES += \
+  $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
+
+EXCLUDES += java/lang/doc-files
+
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
+
+ifeq ($(call isTargetOs, macosx aix), false)
+  EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
+endif
+
+ifeq ($(call isTargetOs, windows), true)
+  EXCLUDE_FILES += \
+      sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
+      #
+endif
diff --git a/make/modules/java.compiler/Java.gmk b/make/modules/java.compiler/Java.gmk
new file mode 100644
index 0000000000000..e124e8844d3b3
--- /dev/null
+++ b/make/modules/java.compiler/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.datatransfer/Java.gmk b/make/modules/java.datatransfer/Java.gmk
new file mode 100644
index 0000000000000..a9f7c8f4f0af9
--- /dev/null
+++ b/make/modules/java.datatransfer/Java.gmk
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-reference \
+    '-Xdoclint/package:java.*,javax.*'
+COPY += flavormap.properties
diff --git a/make/modules/java.desktop/Java.gmk b/make/modules/java.desktop/Java.gmk
new file mode 100644
index 0000000000000..4b1c14a1133ff
--- /dev/null
+++ b/make/modules/java.desktop/Java.gmk
@@ -0,0 +1,152 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-reference \
+    '-Xdoclint/package:java.*,javax.*'
+COPY += .gif .png .wav .txt .xml .css .pf
+CLEAN += iio-plugin.properties cursors.properties
+
+EXCLUDES += \
+    java/awt/doc-files \
+    javax/swing/doc-files \
+    javax/swing/text/doc-files \
+    javax/swing/plaf/synth/doc-files \
+    javax/swing/undo/doc-files \
+    sun/awt/X11/doc-files \
+    #
+
+EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    sun/awt/resources/security-icon-bw16.png \
+    sun/awt/resources/security-icon-bw24.png \
+    sun/awt/resources/security-icon-bw32.png \
+    sun/awt/resources/security-icon-bw48.png \
+    sun/awt/resources/security-icon-interim16.png \
+    sun/awt/resources/security-icon-interim24.png \
+    sun/awt/resources/security-icon-interim32.png \
+    sun/awt/resources/security-icon-interim48.png \
+    sun/awt/resources/security-icon-yellow16.png \
+    sun/awt/resources/security-icon-yellow24.png \
+    sun/awt/resources/security-icon-yellow32.png \
+    sun/awt/resources/security-icon-yellow48.png \
+    sun/awt/X11/java-icon16.png \
+    sun/awt/X11/java-icon24.png \
+    sun/awt/X11/java-icon32.png \
+    sun/awt/X11/java-icon48.png \
+    .template \
+    #
+
+ifeq ($(call isTargetOs, macosx), true)
+  # exclude all X11 on Mac.
+  EXCLUDES += \
+      sun/awt/X11 \
+      sun/java2d/x11 \
+      sun/java2d/jules \
+      sun/java2d/xr \
+      com/sun/java/swing/plaf/gtk \
+      #
+  EXCLUDE_FILES += \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
+      #
+else
+  # TBD: figure out how to eliminate this long list
+  EXCLUDE_FILES += \
+      sun/awt/X11/ScreenFormat.java \
+      sun/awt/X11/XArc.java \
+      sun/awt/X11/XChar2b.java \
+      sun/awt/X11/XCharStruct.java \
+      sun/awt/X11/XClassHint.java \
+      sun/awt/X11/XComposeStatus.java \
+      sun/awt/X11/XExtCodes.java \
+      sun/awt/X11/XFontProp.java \
+      sun/awt/X11/XFontSetExtents.java \
+      sun/awt/X11/XFontStruct.java \
+      sun/awt/X11/XGCValues.java \
+      sun/awt/X11/XHostAddress.java \
+      sun/awt/X11/XIMCallback.java \
+      sun/awt/X11/XIMHotKeyTrigger.java \
+      sun/awt/X11/XIMHotKeyTriggers.java \
+      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
+      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
+      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
+      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionCallbackStruct.java \
+      sun/awt/X11/XIMStringConversionText.java \
+      sun/awt/X11/XIMStyles.java \
+      sun/awt/X11/XIMText.java \
+      sun/awt/X11/XIMValuesList.java \
+      sun/awt/X11/XImage.java \
+      sun/awt/X11/XKeyboardControl.java \
+      sun/awt/X11/XKeyboardState.java \
+      sun/awt/X11/XOMCharSetList.java \
+      sun/awt/X11/XOMFontInfo.java \
+      sun/awt/X11/XOMOrientation.java \
+      sun/awt/X11/XPoint.java \
+      sun/awt/X11/XRectangle.java \
+      sun/awt/X11/XSegment.java \
+      sun/awt/X11/XStandardColormap.java \
+      sun/awt/X11/XTextItem.java \
+      sun/awt/X11/XTextItem16.java \
+      sun/awt/X11/XTextProperty.java \
+      sun/awt/X11/XTimeCoord.java \
+      sun/awt/X11/XWindowChanges.java \
+      sun/awt/X11/XdbeSwapInfo.java \
+      sun/awt/X11/XmbTextItem.java \
+      sun/awt/X11/XwcTextItem.java
+endif
+
+ifeq ($(call isTargetOs, windows), true)
+  EXCLUDES += com/sun/java/swing/plaf/gtk
+endif
+
+ifeq ($(call isTargetOs, windows macosx), false)
+  EXCLUDE_FILES += sun/awt/AWTCharset.java
+endif
+
+# These files do not appear in the build result of the old build. This
+# is because they are generated sources, but the AUTO_JAVA_FILES won't
+# pick them up since they aren't generated when the source dirs are
+# searched and they aren't referenced by any other classes so they won't
+# be picked up by implicit compilation. On a rebuild, they are picked up
+# and compiled. Exclude them here to produce the same rt.jar as the old
+# build does when building just once.
+EXCLUDE_FILES += \
+    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
+    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
+    javax/swing/plaf/nimbus/ScrollBarPainter.java \
+    javax/swing/plaf/nimbus/SliderPainter.java \
+    javax/swing/plaf/nimbus/SpinnerPainter.java \
+    javax/swing/plaf/nimbus/SplitPanePainter.java \
+    javax/swing/plaf/nimbus/TabbedPanePainter.java \
+    #
diff --git a/make/modules/java.instrument/Java.gmk b/make/modules/java.instrument/Java.gmk
new file mode 100644
index 0000000000000..5f46b155e0cc2
--- /dev/null
+++ b/make/modules/java.instrument/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.logging/Java.gmk b/make/modules/java.logging/Java.gmk
new file mode 100644
index 0000000000000..40da53d432b16
--- /dev/null
+++ b/make/modules/java.logging/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.management.rmi/Java.gmk b/make/modules/java.management.rmi/Java.gmk
new file mode 100644
index 0000000000000..4579fea684343
--- /dev/null
+++ b/make/modules/java.management.rmi/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:javax.*'
diff --git a/make/modules/java.management/Java.gmk b/make/modules/java.management/Java.gmk
new file mode 100644
index 0000000000000..40da53d432b16
--- /dev/null
+++ b/make/modules/java.management/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.naming/Java.gmk b/make/modules/java.naming/Java.gmk
new file mode 100644
index 0000000000000..32bb474385f2a
--- /dev/null
+++ b/make/modules/java.naming/Java.gmk
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+CLEAN += jndiprovider.properties
diff --git a/make/modules/java.prefs/Java.gmk b/make/modules/java.prefs/Java.gmk
new file mode 100644
index 0000000000000..e124e8844d3b3
--- /dev/null
+++ b/make/modules/java.prefs/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.rmi/Java.gmk b/make/modules/java.rmi/Java.gmk
new file mode 100644
index 0000000000000..69448146fa4fe
--- /dev/null
+++ b/make/modules/java.rmi/Java.gmk
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
+
+TARGETS += $(call CreateHkTargets, $(CLEAN_FILES))
diff --git a/make/modules/java.scripting/Java.gmk b/make/modules/java.scripting/Java.gmk
new file mode 100644
index 0000000000000..c9060b5fa46b6
--- /dev/null
+++ b/make/modules/java.scripting/Java.gmk
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+COPY += .js
+CLEAN += .properties
diff --git a/make/modules/java.security.jgss/Java.gmk b/make/modules/java.security.jgss/Java.gmk
new file mode 100644
index 0000000000000..e124e8844d3b3
--- /dev/null
+++ b/make/modules/java.security.jgss/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.smartcardio/Java.gmk b/make/modules/java.smartcardio/Java.gmk
new file mode 100644
index 0000000000000..5f46b155e0cc2
--- /dev/null
+++ b/make/modules/java.smartcardio/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.sql.rowset/Java.gmk b/make/modules/java.sql.rowset/Java.gmk
new file mode 100644
index 0000000000000..2ea5be28ed17d
--- /dev/null
+++ b/make/modules/java.sql.rowset/Java.gmk
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
+    $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
+
+TARGETS += $(call CreateHkTargets, $(CLEAN_FILES))
diff --git a/make/modules/java.sql/Java.gmk b/make/modules/java.sql/Java.gmk
new file mode 100644
index 0000000000000..e124e8844d3b3
--- /dev/null
+++ b/make/modules/java.sql/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.transaction.xa/Java.gmk b/make/modules/java.transaction.xa/Java.gmk
new file mode 100644
index 0000000000000..4579fea684343
--- /dev/null
+++ b/make/modules/java.transaction.xa/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:javax.*'
diff --git a/make/modules/java.xml.crypto/Java.gmk b/make/modules/java.xml.crypto/Java.gmk
new file mode 100644
index 0000000000000..2680829fb609a
--- /dev/null
+++ b/make/modules/java.xml.crypto/Java.gmk
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
+COPY += .dtd .xml
+CLEAN += .properties
diff --git a/make/modules/java.xml/Java.gmk b/make/modules/java.xml/Java.gmk
new file mode 100644
index 0000000000000..b7bf8b7016501
--- /dev/null
+++ b/make/modules/java.xml/Java.gmk
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
+    javax.xml.transform javax.xml.validation javax.xml.xpath)'
+CLEAN += .properties
diff --git a/make/modules/jdk.aot/Java.gmk b/make/modules/jdk.aot/Java.gmk
new file mode 100644
index 0000000000000..af920f0411d95
--- /dev/null
+++ b/make/modules/jdk.aot/Java.gmk
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# -parameters provides method's parameters information in class file,
+# JVMCI compilers make use of that information for various sanity checks.
+# Don't use Indy strings concatenation to have good JAOTC startup performance.
+# The exports are needed since JVMCI is dynamically exported (see
+# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
+
+JAVAC_FLAGS += -parameters -XDstringConcat=inline \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \
+    #
+
+EXCLUDES += \
+    jdk.tools.jaotc.test
+    #
+
+## WORKAROUND jdk.aot source structure issue
+AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+    $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
+        $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
diff --git a/make/modules/jdk.charsets/Java.gmk b/make/modules/jdk.charsets/Java.gmk
new file mode 100644
index 0000000000000..2745327c8e46e
--- /dev/null
+++ b/make/modules/jdk.charsets/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .dat
diff --git a/make/modules/jdk.compiler/Java.gmk b/make/modules/jdk.compiler/Java.gmk
new file mode 100644
index 0000000000000..49572b6efb907
--- /dev/null
+++ b/make/modules/jdk.compiler/Java.gmk
@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*'
+JAVAC_FLAGS += -XDstringConcat=inline
+CLEAN_FILES += $(wildcard \
+    $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
+        sun/tools/serialver/resources))
diff --git a/make/modules/jdk.dev/Java.gmk b/make/modules/jdk.dev/Java.gmk
new file mode 100644
index 0000000000000..c26b4f9c8f691
--- /dev/null
+++ b/make/modules/jdk.dev/Java.gmk
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+CLEAN_FILES += $(wildcard \
+    $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
+        com/sun/tools/script/shell))
+
+COPY += .js oqlhelp.html .txt
diff --git a/make/modules/jdk.dynalink/Java.gmk b/make/modules/jdk.dynalink/Java.gmk
new file mode 100644
index 0000000000000..852e68c0d3141
--- /dev/null
+++ b/make/modules/jdk.dynalink/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+CLEAN += .properties
diff --git a/make/modules/jdk.editpad/Java.gmk b/make/modules/jdk.editpad/Java.gmk
new file mode 100644
index 0000000000000..ef2d3bcfa7c52
--- /dev/null
+++ b/make/modules/jdk.editpad/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .properties
diff --git a/make/modules/jdk.hotspot.agent/Java.gmk b/make/modules/jdk.hotspot.agent/Java.gmk
new file mode 100644
index 0000000000000..6e2d47f75fcfd
--- /dev/null
+++ b/make/modules/jdk.hotspot.agent/Java.gmk
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DISABLED_WARNINGS_java += rawtypes serial cast static overrides \
+    fallthrough
+COPY += .gif .png .properties
diff --git a/make/modules/jdk.httpserver/Java.gmk b/make/modules/jdk.httpserver/Java.gmk
new file mode 100644
index 0000000000000..f892ebeb84c17
--- /dev/null
+++ b/make/modules/jdk.httpserver/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DISABLED_WARNINGS_java += missing-explicit-ctor
diff --git a/make/modules/jdk.incubator.vector/Java.gmk b/make/modules/jdk.incubator.vector/Java.gmk
new file mode 100644
index 0000000000000..a2013179acef9
--- /dev/null
+++ b/make/modules/jdk.incubator.vector/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DOCLINT += -Xdoclint:all/protected
diff --git a/make/modules/jdk.internal.jvmstat/Java.gmk b/make/modules/jdk.internal.jvmstat/Java.gmk
new file mode 100644
index 0000000000000..c22ef922aa08d
--- /dev/null
+++ b/make/modules/jdk.internal.jvmstat/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += aliasmap
diff --git a/make/modules/jdk.internal.le/Java.gmk b/make/modules/jdk.internal.le/Java.gmk
new file mode 100644
index 0000000000000..4aedb8491f824
--- /dev/null
+++ b/make/modules/jdk.internal.le/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .properties .caps .txt
diff --git a/make/modules/jdk.internal.opt/Java.gmk b/make/modules/jdk.internal.opt/Java.gmk
new file mode 100644
index 0000000000000..ef2d3bcfa7c52
--- /dev/null
+++ b/make/modules/jdk.internal.opt/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .properties
diff --git a/make/modules/jdk.internal.vm.ci/Java.gmk b/make/modules/jdk.internal.vm.ci/Java.gmk
new file mode 100644
index 0000000000000..ad4991e541429
--- /dev/null
+++ b/make/modules/jdk.internal.vm.ci/Java.gmk
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# -parameters provides method's parameters information in class file,
+# JVMCI compilers make use of that information for various sanity checks.
+# Don't use Indy strings concatenation to have good JVMCI startup performance.
+# The exports are needed since JVMCI is dynamically exported (see
+# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
+
+JAVAC_FLAGS += -parameters -XDstringConcat=inline
+
+## WORKAROUND jdk.internal.vm.ci source structure issue
+JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+	$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
+		$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
diff --git a/make/modules/jdk.internal.vm.compiler/Java.gmk b/make/modules/jdk.internal.vm.compiler/Java.gmk
new file mode 100644
index 0000000000000..fd45f8170ca54
--- /dev/null
+++ b/make/modules/jdk.internal.vm.compiler/Java.gmk
@@ -0,0 +1,88 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+JAVAC_FLAGS += -parameters -XDstringConcat=inline \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \
+    #
+
+EXCLUDES += \
+    jdk.internal.vm.compiler.collections.test \
+    jdk.tools.jaotc.test \
+    org.graalvm.compiler.api.directives.test \
+    org.graalvm.compiler.api.test \
+    org.graalvm.compiler.asm.aarch64.test \
+    org.graalvm.compiler.asm.amd64.test \
+    org.graalvm.compiler.asm.test \
+    org.graalvm.compiler.core.aarch64.test \
+    org.graalvm.compiler.core.amd64.test \
+    org.graalvm.compiler.core.jdk9.test \
+    org.graalvm.compiler.core.match.processor \
+    org.graalvm.compiler.core.test \
+    org.graalvm.compiler.debug.test \
+    org.graalvm.compiler.graph.test \
+    org.graalvm.compiler.hotspot.aarch64.test \
+    org.graalvm.compiler.hotspot.amd64.test \
+    org.graalvm.compiler.hotspot.jdk15.test \
+    org.graalvm.compiler.hotspot.jdk9.test \
+    org.graalvm.compiler.hotspot.lir.test \
+    org.graalvm.compiler.hotspot.test \
+    org.graalvm.compiler.jtt \
+    org.graalvm.compiler.lir.jtt \
+    org.graalvm.compiler.lir.test \
+    org.graalvm.compiler.loop.test \
+    org.graalvm.compiler.microbenchmarks \
+    org.graalvm.compiler.nodeinfo.processor \
+    org.graalvm.compiler.nodes.test \
+    org.graalvm.compiler.options.processor \
+    org.graalvm.compiler.options.test \
+    org.graalvm.compiler.phases.common.test \
+    org.graalvm.compiler.processor \
+    org.graalvm.compiler.replacements.jdk10.test \
+    org.graalvm.compiler.replacements.jdk12.test \
+    org.graalvm.compiler.replacements.jdk9.test \
+    org.graalvm.compiler.replacements.processor \
+    org.graalvm.compiler.replacements.test \
+    org.graalvm.compiler.serviceprovider.processor \
+    org.graalvm.compiler.test \
+    org.graalvm.compiler.virtual.bench \
+    org.graalvm.micro.benchmarks \
+    org.graalvm.util.test \
+    #
+
+## WORKAROUND jdk.internal.vm.compiler source structure issue
+VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+    $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
+        $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
diff --git a/make/modules/jdk.jartool/Java.gmk b/make/modules/jdk.jartool/Java.gmk
new file mode 100644
index 0000000000000..1cf56a317e7cb
--- /dev/null
+++ b/make/modules/jdk.jartool/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DISABLED_WARNINGS_java += missing-explicit-ctor
+JAVAC_FLAGS += -XDstringConcat=inline
diff --git a/make/modules/jdk.javadoc/Java.gmk b/make/modules/jdk.javadoc/Java.gmk
new file mode 100644
index 0000000000000..0fe708e6eae86
--- /dev/null
+++ b/make/modules/jdk.javadoc/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .xml .css .js .js.template .png .txt
diff --git a/make/modules/jdk.jcmd/Java.gmk b/make/modules/jdk.jcmd/Java.gmk
new file mode 100644
index 0000000000000..bec844a96f004
--- /dev/null
+++ b/make/modules/jdk.jcmd/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += _options
diff --git a/make/modules/jdk.jconsole/Java.gmk b/make/modules/jdk.jconsole/Java.gmk
new file mode 100644
index 0000000000000..8e38b9419da6c
--- /dev/null
+++ b/make/modules/jdk.jconsole/Java.gmk
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .gif .png
+
+CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
diff --git a/make/modules/jdk.jdeps/Java.gmk b/make/modules/jdk.jdeps/Java.gmk
new file mode 100644
index 0000000000000..914b0c6658709
--- /dev/null
+++ b/make/modules/jdk.jdeps/Java.gmk
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .txt
+
+CLEAN_FILES += $(wildcard \
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
diff --git a/make/modules/jdk.jdi/Java.gmk b/make/modules/jdk.jdi/Java.gmk
new file mode 100644
index 0000000000000..2be905a609274
--- /dev/null
+++ b/make/modules/jdk.jdi/Java.gmk
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+EXCLUDES += \
+    com/sun/tools/example/debug/bdi \
+    com/sun/tools/example/debug/event \
+    com/sun/tools/example/debug/gui \
+    com/sun/jdi/doc-files \
+    #
+
+EXCLUDE_FILES += jdi-overview.html
diff --git a/make/modules/jdk.jfr/Java.gmk b/make/modules/jdk.jfr/Java.gmk
new file mode 100644
index 0000000000000..c39e21a7173c3
--- /dev/null
+++ b/make/modules/jdk.jfr/Java.gmk
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DISABLED_WARNINGS_java += exports
+COPY := .xsd .xml .dtd
+JAVAC_FLAGS := -XDstringConcat=inline
diff --git a/make/modules/jdk.jpackage/Java.gmk b/make/modules/jdk.jpackage/Java.gmk
new file mode 100644
index 0000000000000..a0627f2d42234
--- /dev/null
+++ b/make/modules/jdk.jpackage/Java.gmk
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .gif .png .txt .spec .script .prerm .preinst \
+    .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
+    .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff
+
+CLEAN += .properties
diff --git a/make/modules/jdk.jshell/Java.gmk b/make/modules/jdk.jshell/Java.gmk
new file mode 100644
index 0000000000000..a9db351c333ad
--- /dev/null
+++ b/make/modules/jdk.jshell/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .jsh .properties
diff --git a/make/modules/jdk.localedata/Java.gmk b/make/modules/jdk.localedata/Java.gmk
new file mode 100644
index 0000000000000..fde703d7640fa
--- /dev/null
+++ b/make/modules/jdk.localedata/Java.gmk
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += _dict _th
+# Exclude BreakIterator classes that are just used in compile process to generate
+# data files and shouldn't go in the product
+EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
+KEEP_ALL_TRANSLATIONS := true
diff --git a/make/modules/jdk.sctp/Java.gmk b/make/modules/jdk.sctp/Java.gmk
new file mode 100644
index 0000000000000..05e27e1eaf81d
--- /dev/null
+++ b/make/modules/jdk.sctp/Java.gmk
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
+SCTP_IMPL_CLASSES = \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
+
+ifeq ($(call isTargetOs, macosx), true)
+  EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
+endif
+
+ifeq ($(call isTargetOs, aix), true)
+  EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
+endif
diff --git a/make/modules/jdk.unsupported.desktop/Java.gmk b/make/modules/jdk.unsupported.desktop/Java.gmk
new file mode 100644
index 0000000000000..f892ebeb84c17
--- /dev/null
+++ b/make/modules/jdk.unsupported.desktop/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+DISABLED_WARNINGS_java += missing-explicit-ctor
diff --git a/make/modules/sun.charsets/Java.gmk b/make/modules/sun.charsets/Java.gmk
new file mode 100644
index 0000000000000..2745327c8e46e
--- /dev/null
+++ b/make/modules/sun.charsets/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+COPY += .dat

From 01b2804ef7211916ed3b7b40458b2aaccdbb5b01 Mon Sep 17 00:00:00 2001
From: Clive Verghese <cverghese@openjdk.org>
Date: Mon, 11 Jan 2021 12:02:09 +0000
Subject: [PATCH 109/129] 8237578: JDK-8214339 (SSLSocketImpl wraps
 SocketException) appears to not be fully fixed

Reviewed-by: xuelei, simonis
---
 .../sun/security/ssl/SSLSocketImpl.java       |  18 +++
 .../sun/security/ssl/SSLTransport.java        |   4 +
 .../ssl/SSLContextImpl/TrustTrustedCert.java  |   4 +-
 .../SSLSocketShouldThrowSocketException.java  | 153 ++++++++++++++++++
 ...va => SocketExceptionForSocketIssues.java} |  10 +-
 5 files changed, 182 insertions(+), 7 deletions(-)
 create mode 100644 test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java
 rename test/jdk/sun/security/ssl/SSLSocketImpl/{SSLExceptionForIOIssue.java => SocketExceptionForSocketIssues.java} (95%)

diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index 91a7822958727..3833edd59e4f2 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -447,6 +447,8 @@ private void startHandshake(boolean resumable) throws IOException {
                     throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
                             "Couldn't kickstart handshaking", iioe);
                 }
+            } catch (SocketException se) {
+                handleException(se);
             } catch (IOException ioe) {
                 throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
                     "Couldn't kickstart handshaking", ioe);
@@ -1411,6 +1413,9 @@ private int readHandshakeRecord() throws IOException {
             } catch (InterruptedIOException iioe) {
                 // don't change exception in case of timeouts or interrupts
                 throw iioe;
+            } catch (SocketException se) {
+                // don't change exception in case of SocketException
+                throw se;
             } catch (IOException ioe) {
                 throw new SSLException("readHandshakeRecord", ioe);
             }
@@ -1476,6 +1481,9 @@ private ByteBuffer readApplicationRecord(
             } catch (InterruptedIOException iioe) {
                 // don't change exception in case of timeouts or interrupts
                 throw iioe;
+            } catch (SocketException se) {
+                // don't change exception in case of SocketException
+                throw se;
             } catch (IOException ioe) {
                 if (!(ioe instanceof SSLException)) {
                     throw new SSLException("readApplicationRecord", ioe);
@@ -1687,6 +1695,16 @@ private void handleException(Exception cause) throws IOException {
             }
         }
 
+        if (cause instanceof SocketException) {
+            try {
+                conContext.fatal(alert, cause);
+            } catch (Exception e) {
+                // Just delivering the fatal alert, re-throw the socket exception instead.
+            }
+
+            throw (SocketException)cause;
+        }
+
         throw conContext.fatal(alert, cause);
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
index efd2e00808f45..8d4cf1e2be999 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
@@ -28,6 +28,7 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.net.SocketException;
 import java.nio.ByteBuffer;
 import javax.crypto.AEADBadTagException;
 import javax.crypto.BadPaddingException;
@@ -140,6 +141,9 @@ static Plaintext decode(TransportContext context,
         } catch (InterruptedIOException iioe) {
             // don't close the Socket in case of timeouts or interrupts.
             throw iioe;
+        } catch (SocketException se) {
+            // don't change exception in case of SocketException
+            throw se;
         } catch (IOException ioe) {
             throw context.fatal(Alert.UNEXPECTED_MESSAGE, ioe);
         }
diff --git a/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java b/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
index 51fdafff7da7c..aae4292fb3cee 100644
--- a/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
+++ b/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
@@ -131,9 +131,9 @@ protected void runServerApplication(SSLSocket socket) throws Exception {
             sslIS.read();
             sslOS.write('A');
             sslOS.flush();
-        } catch (SSLException ssle) {
+        } catch (SSLException | SocketException se) {
             if (!expectFail) {
-                throw ssle;
+                throw se;
             }   // Otherwise, ignore.
         }
     }
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java
new file mode 100644
index 0000000000000..0962db7788141
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2017, 2020, Amazon and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8214339
+ * @summary When a SocketException is thrown by the underlying layer, It
+ *      should be thrown as is and not be transformed to an SSLException.
+ * @library /javax/net/ssl/templates
+ * @run main/othervm SSLSocketShouldThrowSocketException
+ */
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.security.*;
+import javax.net.ssl.*;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class SSLSocketShouldThrowSocketException extends SSLSocketTemplate {
+
+    boolean handshake;
+
+    private final CountDownLatch clientTerminatedCondition = new CountDownLatch(1);
+
+    SSLSocketShouldThrowSocketException(boolean handshake) {
+        this.handshake = handshake;
+    }
+
+    @Override
+    protected boolean isCustomizedClientConnection() {
+        return true;
+    }
+
+    @Override
+    protected void runServerApplication(SSLSocket socket) throws Exception {
+        clientTerminatedCondition.await(30L, TimeUnit.SECONDS);
+    }
+
+    @Override
+    protected void runClientApplication(int serverPort) throws Exception {
+        Socket baseSocket = new Socket("localhost", this.serverPort);
+
+        SSLSocketFactory sslsf =
+                (SSLSocketFactory) SSLSocketFactory.getDefault();
+        SSLSocket sslSocket = (SSLSocket)
+                sslsf.createSocket(baseSocket, "localhost", serverPort, false);
+
+        if (this.handshake) {
+            testHandshakeClose(baseSocket, sslSocket);
+        } else {
+            testDataClose(baseSocket, sslSocket);
+        }
+
+        clientTerminatedCondition.countDown();
+
+    }
+
+    private void testHandshakeClose(Socket baseSocket, SSLSocket sslSocket) throws Exception {
+        Thread aborter = new Thread() {
+            @Override
+            public void run() {
+
+                try {
+                    Thread.sleep(10);
+                    System.err.println("Closing the client socket : " + System.nanoTime());
+                    baseSocket.close();
+                } catch (Exception ieo) {
+                    ieo.printStackTrace();
+                }
+            }
+        };
+
+        aborter.start();
+
+        try {
+            // handshaking
+            System.err.println("Client starting handshake: " + System.nanoTime());
+            sslSocket.startHandshake();
+            throw new Exception("Start handshake did not throw an exception");
+        } catch (SocketException se) {
+            System.err.println("Caught Expected SocketException");
+        }
+
+        aborter.join();
+    }
+
+    private void testDataClose(Socket baseSocket, SSLSocket sslSocket) throws Exception{
+
+        CountDownLatch handshakeCondition = new CountDownLatch(1);
+
+        Thread aborter = new Thread() {
+            @Override
+            public void run() {
+
+                try {
+                    handshakeCondition.await(10L, TimeUnit.SECONDS);
+                    System.err.println("Closing the client socket : " + System.nanoTime());
+                    baseSocket.close();
+                } catch (Exception ieo) {
+                    ieo.printStackTrace();
+                }
+            }
+        };
+
+        aborter.start();
+
+        try {
+            // handshaking
+            System.err.println("Client starting handshake: " + System.nanoTime());
+            sslSocket.startHandshake();
+            handshakeCondition.countDown();
+            System.err.println("Reading data from server");
+            BufferedReader is = new BufferedReader(
+                    new InputStreamReader(sslSocket.getInputStream()));
+            String data = is.readLine();
+            throw new Exception("Start handshake did not throw an exception");
+        } catch (SocketException se) {
+            System.err.println("Caught Expected SocketException");
+        }
+
+        aborter.join();
+    }
+
+    public static void main(String[] args) throws Exception {
+        // SocketException should be throws during a handshake phase.
+        (new SSLSocketShouldThrowSocketException(true)).run();
+        // SocketException should be throw during the application data phase.
+        (new SSLSocketShouldThrowSocketException(false)).run();
+    }
+}
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLExceptionForIOIssue.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SocketExceptionForSocketIssues.java
similarity index 95%
rename from test/jdk/sun/security/ssl/SSLSocketImpl/SSLExceptionForIOIssue.java
rename to test/jdk/sun/security/ssl/SSLSocketImpl/SocketExceptionForSocketIssues.java
index 5578ea7254db1..dcaf6dab977f4 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLExceptionForIOIssue.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SocketExceptionForSocketIssues.java
@@ -31,18 +31,18 @@
  * @bug 8214339
  * @summary SSLSocketImpl erroneously wraps SocketException
  * @library /javax/net/ssl/templates
- * @run main/othervm SSLExceptionForIOIssue
+ * @run main/othervm SocketExceptionForSocketIssues
  */
 
 import javax.net.ssl.*;
 import java.io.*;
 import java.net.*;
 
-public class SSLExceptionForIOIssue implements SSLContextTemplate {
+public class SocketExceptionForSocketIssues implements SSLContextTemplate {
 
     public static void main(String[] args) throws Exception {
         System.err.println("===================================");
-        new SSLExceptionForIOIssue().test();
+        new SocketExceptionForSocketIssues().test();
     }
 
     private void test() throws Exception {
@@ -79,9 +79,9 @@ private void test() throws Exception {
             os.flush();
         } catch (SSLProtocolException | SSLHandshakeException sslhe) {
             throw sslhe;
-        } catch (SSLException ssle) {
+        } catch (SocketException se) {
             // the expected exception, ignore it
-            System.err.println("server exception: " + ssle);
+            System.err.println("server exception: " + se);
         } finally {
             if (listenSocket != null) {
                 listenSocket.close();

From 23801da94bb6477d2f6ee92f481c2c78ba3c5638 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 11 Jan 2021 12:27:30 +0000
Subject: [PATCH 110/129] 8259482: jni_Set/GetField_probe are the same as their
 _nh versions

Reviewed-by: hseigel, sspitsyn, dholmes
---
 src/hotspot/share/prims/jni.cpp         |  6 +++---
 src/hotspot/share/prims/jvmtiExport.cpp | 27 -------------------------
 src/hotspot/share/prims/jvmtiExport.hpp |  8 +-------
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 82561c5a28da1..7546d43ebd89b 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -1942,7 +1942,7 @@ JNI_ENTRY_NO_PRESERVE(Return, jni_Get##Result##Field(JNIEnv *env, jobject obj, j
   int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID);  \
   /* Keep JVMTI addition small and only check enabled flag here.       */ \
   if (JvmtiExport::should_post_field_access()) { \
-    o = JvmtiExport::jni_GetField_probe_nh(thread, obj, o, k, fieldID, false); \
+    o = JvmtiExport::jni_GetField_probe(thread, obj, o, k, fieldID, false); \
   } \
   ret = o->Fieldname##_field(offset); \
   return ret; \
@@ -2009,7 +2009,7 @@ JNI_ENTRY_NO_PRESERVE(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldI
   if (JvmtiExport::should_post_field_modification()) {
     jvalue field_value;
     field_value.l = value;
-    o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, JVM_SIGNATURE_CLASS, (jvalue *)&field_value);
+    o = JvmtiExport::jni_SetField_probe(thread, obj, o, k, fieldID, false, JVM_SIGNATURE_CLASS, (jvalue *)&field_value);
   }
   HeapAccess<ON_UNKNOWN_OOP_REF>::oop_store_at(o, offset, JNIHandles::resolve(value));
   HOTSPOT_JNI_SETOBJECTFIELD_RETURN();
@@ -2031,7 +2031,7 @@ JNI_ENTRY_NO_PRESERVE(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfi
   if (JvmtiExport::should_post_field_modification()) { \
     jvalue field_value; \
     field_value.unionType = value; \
-    o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, SigType, (jvalue *)&field_value); \
+    o = JvmtiExport::jni_SetField_probe(thread, obj, o, k, fieldID, false, SigType, (jvalue *)&field_value); \
   } \
   if (SigType == JVM_SIGNATURE_BOOLEAN) { value = ((jboolean)value) & 1; } \
   o->Fieldname##_field_put(offset, value); \
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 73c07b876fd23..50ff8076e6169 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -1872,19 +1872,6 @@ void JvmtiExport::notice_unwind_due_to_exception(JavaThread *thread, Method* met
 
 oop JvmtiExport::jni_GetField_probe(JavaThread *thread, jobject jobj, oop obj,
                                     Klass* klass, jfieldID fieldID, bool is_static) {
-  if (*((int *)get_field_access_count_addr()) > 0 && thread->has_last_Java_frame()) {
-    // At least one field access watch is set so we have more work
-    // to do. This wrapper is used by entry points that allow us
-    // to create handles in post_field_access_by_jni().
-    post_field_access_by_jni(thread, obj, klass, fieldID, is_static);
-    // event posting can block so refetch oop if we were passed a jobj
-    if (jobj != NULL) return JNIHandles::resolve_non_null(jobj);
-  }
-  return obj;
-}
-
-oop JvmtiExport::jni_GetField_probe_nh(JavaThread *thread, jobject jobj, oop obj,
-                                       Klass* klass, jfieldID fieldID, bool is_static) {
   if (*((int *)get_field_access_count_addr()) > 0 && thread->has_last_Java_frame()) {
     // At least one field access watch is set so we have more work to do.
     post_field_access_by_jni(thread, obj, klass, fieldID, is_static);
@@ -1962,20 +1949,6 @@ void JvmtiExport::post_field_access(JavaThread *thread, Method* method,
 oop JvmtiExport::jni_SetField_probe(JavaThread *thread, jobject jobj, oop obj,
                                     Klass* klass, jfieldID fieldID, bool is_static,
                                     char sig_type, jvalue *value) {
-  if (*((int *)get_field_modification_count_addr()) > 0 && thread->has_last_Java_frame()) {
-    // At least one field modification watch is set so we have more work
-    // to do. This wrapper is used by entry points that allow us
-    // to create handles in post_field_modification_by_jni().
-    post_field_modification_by_jni(thread, obj, klass, fieldID, is_static, sig_type, value);
-    // event posting can block so refetch oop if we were passed a jobj
-    if (jobj != NULL) return JNIHandles::resolve_non_null(jobj);
-  }
-  return obj;
-}
-
-oop JvmtiExport::jni_SetField_probe_nh(JavaThread *thread, jobject jobj, oop obj,
-                                       Klass* klass, jfieldID fieldID, bool is_static,
-                                       char sig_type, jvalue *value) {
   if (*((int *)get_field_modification_count_addr()) > 0 && thread->has_last_Java_frame()) {
     // At least one field modification watch is set so we have more work to do.
     post_field_modification_by_jni(thread, obj, klass, fieldID, is_static, sig_type, value);
diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
index 72a89502ad027..871f439cb75cd 100644
--- a/src/hotspot/share/prims/jvmtiExport.hpp
+++ b/src/hotspot/share/prims/jvmtiExport.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -310,9 +310,6 @@ class JvmtiExport : public AllStatic {
   static oop jni_GetField_probe          (JavaThread *thread, jobject jobj,
     oop obj, Klass* klass, jfieldID fieldID, bool is_static)
     NOT_JVMTI_RETURN_(NULL);
-  static oop jni_GetField_probe_nh       (JavaThread *thread, jobject jobj,
-    oop obj, Klass* klass, jfieldID fieldID, bool is_static)
-    NOT_JVMTI_RETURN_(NULL);
   static void post_field_access_by_jni   (JavaThread *thread, oop obj,
     Klass* klass, jfieldID fieldID, bool is_static) NOT_JVMTI_RETURN;
   static void post_field_access          (JavaThread *thread, Method* method,
@@ -320,9 +317,6 @@ class JvmtiExport : public AllStatic {
   static oop jni_SetField_probe          (JavaThread *thread, jobject jobj,
     oop obj, Klass* klass, jfieldID fieldID, bool is_static, char sig_type,
     jvalue *value) NOT_JVMTI_RETURN_(NULL);
-  static oop jni_SetField_probe_nh       (JavaThread *thread, jobject jobj,
-    oop obj, Klass* klass, jfieldID fieldID, bool is_static, char sig_type,
-    jvalue *value) NOT_JVMTI_RETURN_(NULL);
   static void post_field_modification_by_jni(JavaThread *thread, oop obj,
     Klass* klass, jfieldID fieldID, bool is_static, char sig_type,
     jvalue *value);

From e05f36f463870e9f2bee262fe8768b4aed8da434 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 11 Jan 2021 13:45:35 +0000
Subject: [PATCH 111/129] 8259043: More Zero architectures need linkage with
 libatomic

Co-authored-by: Matthias Klose <doko@openjdk.org>
Reviewed-by: erikj
---
 make/autoconf/libraries.m4 | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index f13a7fe8597e7..6ad9715a9fb20 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -124,12 +124,18 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread"
   fi
 
-  # Libatomic library
-  # 32-bit MIPS needs fallback library for 8-byte atomic ops
-  if test "x$OPENJDK_TARGET_OS" = xlinux &&
-      (test "x$OPENJDK_TARGET_CPU" = xmips ||
-       test "x$OPENJDK_TARGET_CPU" = xmipsel); then
-    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
+  # Atomic library
+  # 32-bit platforms needs fallback library for 8-byte atomic ops on Zero
+  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
+    if test "x$OPENJDK_TARGET_OS" = xlinux &&
+        (test "x$OPENJDK_TARGET_CPU" = xarm ||
+         test "x$OPENJDK_TARGET_CPU" = xm68k ||
+         test "x$OPENJDK_TARGET_CPU" = xmips ||
+         test "x$OPENJDK_TARGET_CPU" = xmipsel ||
+         test "x$OPENJDK_TARGET_CPU" = xppc ||
+         test "x$OPENJDK_TARGET_CPU" = xsh); then
+      BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
+    fi
   fi
 
   # perfstat lib

From 33fbc10cb8c869984159230b55ab9f3c9ca039ec Mon Sep 17 00:00:00 2001
From: Guoxiong Li <lgxbslgx@gmail.com>
Date: Mon, 11 Jan 2021 13:50:53 +0000
Subject: [PATCH 112/129] 8259025: Record compact constructor using
 Objects.requireNonNull

Reviewed-by: attila
---
 .../classes/com/sun/tools/javac/comp/Attr.java     |  2 +-
 .../javac/records/RecordCompilationTests.java      | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index e56eb9f2c8d62..a70f6b1214b8e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -2962,7 +2962,6 @@ public void visitLambda(final JCLambda that) {
                 localEnv.info.isSerializable = true;
                 localEnv.info.isSerializableLambda = true;
             }
-            localEnv.info.isLambda = true;
             List<Type> explicitParamTypes = null;
             if (that.paramKind == JCLambda.ParameterKind.EXPLICIT) {
                 //attribute lambda parameters
@@ -3404,6 +3403,7 @@ public Env<AttrContext> lambdaEnv(JCLambda that, Env<AttrContext> env) {
                 lambdaEnv = env.dup(that, env.info.dup(env.info.scope.dup()));
             }
             lambdaEnv.info.yieldResult = null;
+            lambdaEnv.info.isLambda = true;
             return lambdaEnv;
         }
 
diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java
index d7bf4f249b723..0588e6a2143a8 100644
--- a/test/langtools/tools/javac/records/RecordCompilationTests.java
+++ b/test/langtools/tools/javac/records/RecordCompilationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * RecordCompilationTests
  *
  * @test
- * @bug 8250629 8252307 8247352 8241151 8246774
+ * @bug 8250629 8252307 8247352 8241151 8246774 8259025
  * @summary Negative compilation tests, and positive compilation (smoke) tests for records
  * @library /lib/combo /tools/lib /tools/javac/lib
  * @modules
@@ -343,6 +343,16 @@ public void testConstructorRedeclaration() {
 
         assertOK("import java.util.*; record R(String x, String y) {  public R { Objects.requireNonNull(x); Objects.requireNonNull(y); } }");
 
+        // The lambda expressions in the constructor should be compiled successfully.
+        assertOK("""
+                import static java.util.Objects.*;
+                record R(String v) {
+                    R {
+                        requireNonNull(v, () -> "v must be provided");
+                        requireNonNullElseGet(v, () -> "w");
+                    }
+                }""");
+
         // Not OK to redeclare canonical without DA
         assertFail("compiler.err.var.might.not.have.been.initialized", "record R(int x, int y) { # }",
                    "public R(int x, int y) { this.x = x; }");

From d60a937e876f1b38a958d96f10791c8d7a1c9277 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Mon, 11 Jan 2021 16:14:56 +0000
Subject: [PATCH 113/129] 8259028: ClassCastException when using custom
 filesystem with wrapper FileChannel impl

Reviewed-by: chegar, alanb, uschindler
---
 .../classes/jdk/incubator/foreign/MemorySegment.java  |  7 +++----
 .../jdk/internal/foreign/MappedMemorySegmentImpl.java | 11 +++++++++--
 test/jdk/java/foreign/TestByteBuffer.java             |  7 +++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
index d5360101dd3cd..64c8dc2b63761 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
@@ -876,10 +876,9 @@ static MemorySegment allocateNative(long bytesSize) {
      * @param mapMode a file mapping mode, see {@link FileChannel#map(FileChannel.MapMode, long, long)}; the chosen mapping mode
      *                might affect the behavior of the returned memory mapped segment (see {@link MappedMemorySegments#force(MemorySegment)}).
      * @return a new confined mapped memory segment.
-     * @throws IllegalArgumentException if {@code bytesOffset < 0}.
-     * @throws IllegalArgumentException if {@code bytesSize < 0}.
-     * @throws UnsupportedOperationException if an unsupported map mode is specified, or if the {@code path} is associated
-     * with a provider that does not support creating file channels.
+     * @throws IllegalArgumentException if {@code bytesOffset < 0}, {@code bytesSize < 0}, or if {@code path} is not associated
+     * with the default file system.
+     * @throws UnsupportedOperationException if an unsupported map mode is specified.
      * @throws IOException if the specified path does not point to an existing file, or if some other I/O error occurs.
      * @throws  SecurityException If a security manager is installed and it denies an unspecified permission required by the implementation.
      * In the case of the default provider, the {@link SecurityManager#checkRead(String)} method is invoked to check
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
index 62e4007282401..36a0e83323e20 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
@@ -34,6 +34,8 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -114,8 +116,13 @@ public static MemorySegment makeMappedSegment(Path path, long bytesOffset, long
         Objects.requireNonNull(mapMode);
         if (bytesSize < 0) throw new IllegalArgumentException("Requested bytes size must be >= 0.");
         if (bytesOffset < 0) throw new IllegalArgumentException("Requested bytes offset must be >= 0.");
-        try (FileChannelImpl channelImpl = (FileChannelImpl)FileChannel.open(path, openOptions(mapMode))) {
-            UnmapperProxy unmapperProxy = channelImpl.mapInternal(mapMode, bytesOffset, bytesSize);
+        FileSystem fs = path.getFileSystem();
+        if (fs != FileSystems.getDefault() ||
+                fs.getClass().getModule() != Object.class.getModule()) {
+            throw new IllegalArgumentException("Unsupported file system");
+        }
+        try (FileChannel channelImpl = FileChannel.open(path, openOptions(mapMode))) {
+            UnmapperProxy unmapperProxy = ((FileChannelImpl)channelImpl).mapInternal(mapMode, bytesOffset, bytesSize);
             int modes = defaultAccessModes(bytesSize);
             if (mapMode == FileChannel.MapMode.READ_ONLY) {
                 modes &= ~WRITE;
diff --git a/test/jdk/java/foreign/TestByteBuffer.java b/test/jdk/java/foreign/TestByteBuffer.java
index 46e288a2ece4c..a396ec48ec5c1 100644
--- a/test/jdk/java/foreign/TestByteBuffer.java
+++ b/test/jdk/java/foreign/TestByteBuffer.java
@@ -47,6 +47,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.net.URI;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -513,6 +514,12 @@ public void testMapZeroSize() throws IOException {
         }
     }
 
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testMapCustomPath() throws IOException {
+        Path path = Path.of(URI.create("jrt:/"));
+        MemorySegment.mapFile(path, 0L, 0L, FileChannel.MapMode.READ_WRITE);
+    }
+
     @Test(dataProvider="resizeOps")
     public void testCopyHeapToNative(Consumer<MemorySegment> checker, Consumer<MemorySegment> initializer, SequenceLayout seq) {
         checkByteArrayAlignment(seq.elementLayout());

From 2cb271e691b7d3d2a849503247b52fc57019c8ba Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Mon, 11 Jan 2021 17:35:50 +0000
Subject: [PATCH 114/129] 8253996: Javac error on jdk16 build 18: invalid flag:
 -Xdoclint:-missing

Reviewed-by: hannesw
---
 .../com/sun/tools/doclint/DocLint.java        |  8 +-
 .../sun/tools/javac/api/BasicJavacTask.java   | 10 ++-
 .../tools/javac/resources/compiler.properties |  3 +
 .../doclets/formats/html/HtmlOptions.java     |  6 +-
 .../tools/javac/diags/examples.not-yet.txt    |  1 +
 .../tools/javac/doclint/LimitedImage.java     | 75 +++++++++++++++++++
 6 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 test/langtools/tools/javac/doclint/LimitedImage.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java b/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
index f4e6e241bbe7b..ff05f7160d8a7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java
@@ -76,12 +76,16 @@ public String getName() {
 
         @Override
         public void init(JavacTask task, String... args) {
-            // ignore
+            throw new IllegalStateException("doclint not available");
         }
 
         @Override
         public boolean isValidOption(String s) {
-            return false;
+            // passively accept all "plausible" options
+            return s.equals(XMSGS_OPTION)
+                    || s.startsWith(XMSGS_CUSTOM_PREFIX)
+                    || s.startsWith(XHTML_VERSION_PREFIX)
+                    || s.startsWith(XCHECK_PACKAGE);
         }
     }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
index 0277d57b2373f..0e88ed29961a5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
@@ -55,6 +55,7 @@
 import com.sun.tools.javac.platform.PlatformDescription.PluginInfo;
 import com.sun.tools.javac.processing.JavacProcessingEnvironment;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
+import com.sun.tools.javac.resources.CompilerProperties.Warnings;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.DefinedBy;
@@ -257,8 +258,11 @@ private void initPlugin(Plugin p, String... args) {
     public void initDocLint(List<String> docLintOpts) {
         if (docLintOpts.isEmpty())
             return;
-
-        DocLint.newDocLint().init(this, docLintOpts.toArray(new String[docLintOpts.size()]));
-        JavaCompiler.instance(context).keepComments = true;
+        try {
+            DocLint.newDocLint().init(this, docLintOpts.toArray(new String[docLintOpts.size()]));
+            JavaCompiler.instance(context).keepComments = true;
+        } catch (IllegalStateException e) {
+            Log.instance(context).warning(Warnings.DoclintNotAvailable);
+        }
     }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 27909bae1bc6c..6b9362f8b9fcd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2049,6 +2049,9 @@ compiler.warn.deprecated.annotation.has.no.effect=\
 compiler.warn.invalid.path=\
     Invalid filename: {0}
 
+compiler.warn.doclint.not.available=\
+    No service provider for doclint is available
+
 # 0: string
 compiler.err.invalid.path=\
     Invalid filename: {0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java
index f7b19aed7e0ed..ce5f7def06fad 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java
@@ -32,12 +32,12 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import com.sun.tools.doclint.DocLint;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.Messages;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.doclint.DocLint;
 
 /**
  * Storage for all options supported by the
@@ -405,7 +405,7 @@ public boolean process(String opt,  List<String> args) {
                             messages.error("doclet.Option_doclint_no_qualifiers");
                             return false;
                         }
-                        if (!DocLint.newDocLint().isValidOption(dopt)) {
+                        if (!(new DocLint()).isValidOption(dopt)) {
                             messages.error("doclet.Option_doclint_invalid_arg");
                             return false;
                         }
@@ -418,7 +418,7 @@ public boolean process(String opt,  List<String> args) {
                     @Override
                     public boolean process(String opt,  List<String> args) {
                         String dopt = opt.replace("-Xdoclint/package:", DocLint.XCHECK_PACKAGE);
-                        if (!DocLint.newDocLint().isValidOption(dopt)) {
+                        if (!(new DocLint()).isValidOption(dopt)) {
                             messages.error("doclet.Option_doclint_package_invalid_arg");
                             return false;
                         }
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index 0161b2b7d760b..fa8b2313fb51b 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -110,6 +110,7 @@ compiler.misc.wrong.version                             # ClassReader
 compiler.warn.annotation.method.not.found               # ClassReader
 compiler.warn.annotation.method.not.found.reason        # ClassReader
 compiler.warn.big.major.version                         # ClassReader
+compiler.warn.doclint.not.available                     # requires restricted image
 compiler.warn.future.attr                               # ClassReader
 compiler.warn.illegal.char.for.encoding
 compiler.warn.incubating.modules                        # requires adjusted classfile
diff --git a/test/langtools/tools/javac/doclint/LimitedImage.java b/test/langtools/tools/javac/doclint/LimitedImage.java
new file mode 100644
index 0000000000000..e77a295e39bd6
--- /dev/null
+++ b/test/langtools/tools/javac/doclint/LimitedImage.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8253996
+ * @summary Verify doclint behavior when doclint not available
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ * @run main/othervm --limit-modules jdk.compiler,jdk.zipfs LimitedImage
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import toolbox.JavacTask;
+import toolbox.Task.Expect;
+import toolbox.Task.Mode;
+import toolbox.Task.OutputKind;
+import toolbox.ToolBox;
+
+public class LimitedImage {
+    public static void main(String... args) throws IOException {
+        ToolBox tb = new ToolBox();
+
+        //showing help should be OK
+        new JavacTask(tb, Mode.CMDLINE)
+                .options("--help")
+                .run().writeAll();
+
+        Path testSource = Path.of("Test.java");
+        tb.writeFile(testSource, "class Test {}");
+
+        List<String> actualOutput;
+        List<String> expectedOutput = List.of(
+                "- compiler.warn.doclint.not.available",
+                "1 warning"
+        );
+
+        //check proper diagnostics when doclint provider not present:
+        System.err.println("Test -Xdoclint when doclint not available");
+        actualOutput = new JavacTask(tb, Mode.CMDLINE)
+                .options("-XDrawDiagnostics", "-Xdoclint")
+                .files(testSource)
+                .outdir(".")
+                .run(Expect.SUCCESS)
+                .writeAll()
+                .getOutputLines(OutputKind.DIRECT);
+
+        tb.checkEqual(expectedOutput, actualOutput);
+    }
+
+}

From cf3e4bfdb5b50ebad1ece2765d645c4073b61727 Mon Sep 17 00:00:00 2001
From: Harold Seigel <hseigel@openjdk.org>
Date: Mon, 11 Jan 2021 18:18:13 +0000
Subject: [PATCH 115/129] 8258838: Remove JVM option UseStackBanging

Reviewed-by: dholmes, coleenp, kvn
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  4 +-
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     | 24 +++-----
 .../templateInterpreterGenerator_aarch64.cpp  | 16 +++--
 src/hotspot/cpu/arm/macroAssembler_arm.cpp    | 30 +++++-----
 src/hotspot/cpu/arm/sharedRuntime_arm.cpp     | 48 ++++++++-------
 src/hotspot/cpu/ppc/ppc.ad                    |  6 +-
 .../ppc/templateInterpreterGenerator_ppc.cpp  | 16 +++--
 src/hotspot/cpu/s390/s390.ad                  |  6 +-
 .../templateInterpreterGenerator_s390.cpp     | 14 ++---
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp |  2 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp  | 22 ++-----
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  | 22 ++-----
 .../x86/templateInterpreterGenerator_x86.cpp  | 14 ++---
 src/hotspot/share/asm/assembler.cpp           | 58 +++++++++----------
 .../share/jvmci/jvmciCompilerToVMInit.cpp     |  1 -
 src/hotspot/share/opto/output.cpp             |  4 +-
 src/hotspot/share/runtime/globals.hpp         |  5 --
 .../hotspot/GraalHotSpotVMConfig.java         |  4 +-
 18 files changed, 123 insertions(+), 173 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 26c6b4e4b7270..674e121ce07c8 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2014, 2020, Red Hat, Inc. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -1921,7 +1921,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
   }
 
   int bangsize = C->output()->bang_size_in_bytes();
-  if (C->output()->need_stack_bang(bangsize) && UseStackBanging)
+  if (C->output()->need_stack_bang(bangsize))
     __ generate_stack_overflow_check(bangsize);
 
   __ build_frame(framesize);
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 59fbff768cdab..5aa7e95eed7f6 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1499,11 +1499,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   }
 
   // Generate stack overflow check
-  if (UseStackBanging) {
-    __ bang_stack_with_offset(checked_cast<int>(StackOverflow::stack_shadow_zone_size()));
-  } else {
-    Unimplemented();
-  }
+  __ bang_stack_with_offset(checked_cast<int>(StackOverflow::stack_shadow_zone_size()));
 
   // Generate a new frame for the wrapper.
   __ enter();
@@ -2413,10 +2409,8 @@ void SharedRuntime::generate_deopt_blob() {
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  if (UseStackBanging) {
-    __ ldrw(r19, Address(r5, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
-    __ bang_stack_size(r19, r2);
-  }
+  __ ldrw(r19, Address(r5, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(r19, r2);
 #endif
   // Load address of array of frame pcs into r2
   __ ldr(r2, Address(r5, Deoptimization::UnrollBlock::frame_pcs_offset_in_bytes()));
@@ -2630,12 +2624,10 @@ void SharedRuntime::generate_uncommon_trap_blob() {
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  if (UseStackBanging) {
-    __ ldrw(r1, Address(r4,
-                        Deoptimization::UnrollBlock::
-                        total_frame_sizes_offset_in_bytes()));
-    __ bang_stack_size(r1, r2);
-  }
+  __ ldrw(r1, Address(r4,
+                      Deoptimization::UnrollBlock::
+                      total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(r1, r2);
 #endif
 
   // Load address of array of frame pcs into r2 (address*)
diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index 486fd4077163a..4ca132454bf95 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1121,14 +1121,12 @@ void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   // Bang each page in the shadow zone. We can't assume it's been done for
   // an interpreter frame with greater than a page of locals, so each page
   // needs to be checked.  Only true for non-native.
-  if (UseStackBanging) {
-    const int n_shadow_pages = (int)(StackOverflow::stack_shadow_zone_size() / os::vm_page_size());
-    const int start_page = native_call ? n_shadow_pages : 1;
-    const int page_size = os::vm_page_size();
-    for (int pages = start_page; pages <= n_shadow_pages ; pages++) {
-      __ sub(rscratch2, sp, pages*page_size);
-      __ str(zr, Address(rscratch2));
-    }
+  const int n_shadow_pages = (int)(StackOverflow::stack_shadow_zone_size() / os::vm_page_size());
+  const int start_page = native_call ? n_shadow_pages : 1;
+  const int page_size = os::vm_page_size();
+  for (int pages = start_page; pages <= n_shadow_pages ; pages++) {
+    __ sub(rscratch2, sp, pages*page_size);
+    __ str(zr, Address(rscratch2));
   }
 }
 
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.cpp b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
index 067ec70437643..1f8f62fe1dc15 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -977,28 +977,24 @@ void MacroAssembler::zero_memory(Register start, Register end, Register tmp) {
 
 void MacroAssembler::arm_stack_overflow_check(int frame_size_in_bytes, Register tmp) {
   // Version of AbstractAssembler::generate_stack_overflow_check optimized for ARM
-  if (UseStackBanging) {
-    const int page_size = os::vm_page_size();
+  const int page_size = os::vm_page_size();
 
-    sub_slow(tmp, SP, StackOverflow::stack_shadow_zone_size());
-    strb(R0, Address(tmp));
-    for (; frame_size_in_bytes >= page_size; frame_size_in_bytes -= 0xff0) {
-      strb(R0, Address(tmp, -0xff0, pre_indexed));
-    }
+  sub_slow(tmp, SP, StackOverflow::stack_shadow_zone_size());
+  strb(R0, Address(tmp));
+  for (; frame_size_in_bytes >= page_size; frame_size_in_bytes -= 0xff0) {
+    strb(R0, Address(tmp, -0xff0, pre_indexed));
   }
 }
 
 void MacroAssembler::arm_stack_overflow_check(Register Rsize, Register tmp) {
-  if (UseStackBanging) {
-    Label loop;
+  Label loop;
 
-    mov(tmp, SP);
-    add_slow(Rsize, Rsize, StackOverflow::stack_shadow_zone_size() - os::vm_page_size());
-    bind(loop);
-    subs(Rsize, Rsize, 0xff0);
-    strb(R0, Address(tmp, -0xff0, pre_indexed));
-    b(loop, hi);
-  }
+  mov(tmp, SP);
+  add_slow(Rsize, Rsize, StackOverflow::stack_shadow_zone_size() - os::vm_page_size());
+  bind(loop);
+  subs(Rsize, Rsize, 0xff0);
+  strb(R0, Address(tmp, -0xff0, pre_indexed));
+  b(loop, hi);
 }
 
 void MacroAssembler::stop(const char* msg) {
diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index 6380fbccfc857..77385a9536dbc 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1504,18 +1504,17 @@ void SharedRuntime::generate_deopt_blob() {
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  // See if it is enough stack to push deoptimized frames
-  if (UseStackBanging) {
-    // The compiled method that we are deoptimizing was popped from the stack.
-    // If the stack bang results in a stack overflow, we don't return to the
-    // method that is being deoptimized. The stack overflow exception is
-    // propagated to the caller of the deoptimized method. Need to get the pc
-    // from the caller in LR and restore FP.
-    __ ldr(LR, Address(R2, 0));
-    __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
-    __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
-    __ arm_stack_overflow_check(R8, Rtemp);
-  }
+  // See if it is enough stack to push deoptimized frames.
+  //
+  // The compiled method that we are deoptimizing was popped from the stack.
+  // If the stack bang results in a stack overflow, we don't return to the
+  // method that is being deoptimized. The stack overflow exception is
+  // propagated to the caller of the deoptimized method. Need to get the pc
+  // from the caller in LR and restore FP.
+  __ ldr(LR, Address(R2, 0));
+  __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
+  __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ arm_stack_overflow_check(R8, Rtemp);
 #endif
   __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::number_of_frames_offset_in_bytes()));
 
@@ -1700,22 +1699,21 @@ void SharedRuntime::generate_uncommon_trap_blob() {
 
   __ add(SP, SP, Rtemp);
 
-  // See if it is enough stack to push deoptimized frames
+  // See if it is enough stack to push deoptimized frames.
 #ifdef ASSERT
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  if (UseStackBanging) {
-    // The compiled method that we are deoptimizing was popped from the stack.
-    // If the stack bang results in a stack overflow, we don't return to the
-    // method that is being deoptimized. The stack overflow exception is
-    // propagated to the caller of the deoptimized method. Need to get the pc
-    // from the caller in LR and restore FP.
-    __ ldr(LR, Address(R2, 0));
-    __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
-    __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
-    __ arm_stack_overflow_check(R8, Rtemp);
-  }
+  //
+  // The compiled method that we are deoptimizing was popped from the stack.
+  // If the stack bang results in a stack overflow, we don't return to the
+  // method that is being deoptimized. The stack overflow exception is
+  // propagated to the caller of the deoptimized method. Need to get the pc
+  // from the caller in LR and restore FP.
+  __ ldr(LR, Address(R2, 0));
+  __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
+  __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ arm_stack_overflow_check(R8, Rtemp);
 #endif
   __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::number_of_frames_offset_in_bytes()));
   __ ldr_s32(Rtemp, Address(Rublock, Deoptimization::UnrollBlock::caller_adjustment_offset_in_bytes()));
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 028e7c702c635..cf1dfa13b90f3 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2012, 2020 SAP SE. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -1430,7 +1430,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
 
   int bangsize = C->output()->bang_size_in_bytes();
   assert(bangsize >= framesize || bangsize <= 0, "stack bang size incorrect");
-  if (C->output()->need_stack_bang(bangsize) && UseStackBanging) {
+  if (C->output()->need_stack_bang(bangsize)) {
     // Unfortunately we cannot use the function provided in
     // assembler.cpp as we have to emulate the pipes. So I had to
     // insert the code of generate_stack_overflow_check(), see
@@ -1484,7 +1484,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
       bang_offset += page_size;
     }
     // R11 trashed
-  } // C->output()->need_stack_bang(framesize) && UseStackBanging
+  } // C->output()->need_stack_bang(framesize)
 
   unsigned int bytes = (unsigned int)framesize;
   long offset = Assembler::align_addr(bytes, frame::alignment_in_bytes);
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index 59af7c64e3404..4cd87d1c227c2 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1185,14 +1185,12 @@ void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   // Bang each page in the shadow zone. We can't assume it's been done for
   // an interpreter frame with greater than a page of locals, so each page
   // needs to be checked.  Only true for non-native.
-  if (UseStackBanging) {
-    const int page_size = os::vm_page_size();
-    const int n_shadow_pages = ((int)StackOverflow::stack_shadow_zone_size()) / page_size;
-    const int start_page = native_call ? n_shadow_pages : 1;
-    BLOCK_COMMENT("bang_stack_shadow_pages:");
-    for (int pages = start_page; pages <= n_shadow_pages; pages++) {
-      __ bang_stack_with_offset(pages*page_size);
-    }
+  const int page_size = os::vm_page_size();
+  const int n_shadow_pages = ((int)StackOverflow::stack_shadow_zone_size()) / page_size;
+  const int start_page = native_call ? n_shadow_pages : 1;
+  BLOCK_COMMENT("bang_stack_shadow_pages:");
+  for (int pages = start_page; pages <= n_shadow_pages; pages++) {
+    __ bang_stack_with_offset(pages*page_size);
   }
 }
 
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index afb05d870b4c9..36eedf9456044 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2017, 2020 SAP SE. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -862,7 +862,7 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
   // careful, because some VM calls (such as call site linkage) can
   // use several kilobytes of stack. But the stack safety zone should
   // account for that. See bugs 4446381, 4468289, 4497237.
-  if (C->output()->need_stack_bang(bangsize) && UseStackBanging) {
+  if (C->output()->need_stack_bang(bangsize)) {
     st->print_cr("# stack bang"); st->print("\t");
   }
   st->print_cr("push_frame %d", (int)-framesize);
@@ -903,7 +903,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
   // careful, because some VM calls (such as call site linkage) can
   // use several kilobytes of stack. But the stack safety zone should
   // account for that. See bugs 4446381, 4468289, 4497237.
-  if (C->output()->need_stack_bang(bangsize) && UseStackBanging) {
+  if (C->output()->need_stack_bang(bangsize)) {
     __ generate_stack_overflow_check(bangsize);
   }
 
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index 9014a3045ce83..80cedc4d93186 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -2066,13 +2066,11 @@ void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   // Bang each page in the shadow zone. We can't assume it's been done for
   // an interpreter frame with greater than a page of locals, so each page
   // needs to be checked. Only true for non-native. For native, we only bang the last page.
-  if (UseStackBanging) {
-    const int page_size      = os::vm_page_size();
-    const int n_shadow_pages = (int)(StackOverflow::stack_shadow_zone_size()/page_size);
-    const int start_page_num = native_call ? n_shadow_pages : 1;
-    for (int pages = start_page_num; pages <= n_shadow_pages; pages++) {
-      __ bang_stack_with_offset(pages*page_size);
-    }
+  const int page_size      = os::vm_page_size();
+  const int n_shadow_pages = (int)(StackOverflow::stack_shadow_zone_size()/page_size);
+  const int start_page_num = native_call ? n_shadow_pages : 1;
+  for (int pages = start_page_num; pages <= n_shadow_pages; pages++) {
+    __ bang_stack_with_offset(pages*page_size);
   }
 }
 
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index 1ef26701ac14a..67273301a78ec 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -356,7 +356,7 @@ void C1_MacroAssembler::remove_frame(int frame_size_in_bytes) {
 
 
 void C1_MacroAssembler::verified_entry() {
-  if (C1Breakpoint || VerifyFPU || !UseStackBanging) {
+  if (C1Breakpoint || VerifyFPU) {
     // Verified Entry first instruction should be 5 bytes long for correct
     // patching by patch_verified_entry().
     //
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index e909e60c31e32..4aef8041ad2d7 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1597,13 +1597,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // instruction fits that requirement.
 
   // Generate stack overflow check
-
-  if (UseStackBanging) {
-    __ bang_stack_with_offset((int)StackOverflow::stack_shadow_zone_size());
-  } else {
-    // need a 5 byte instruction to allow MT safe patching to non-entrant
-    __ fat_nop();
-  }
+  __ bang_stack_with_offset((int)StackOverflow::stack_shadow_zone_size());
 
   // Generate a new frame for the wrapper.
   __ enter();
@@ -2430,10 +2424,8 @@ void SharedRuntime::generate_deopt_blob() {
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  if (UseStackBanging) {
-    __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
-    __ bang_stack_size(rbx, rcx);
-  }
+  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(rbx, rcx);
 #endif
 
   // Load array of frame pcs into ECX
@@ -2656,10 +2648,8 @@ void SharedRuntime::generate_uncommon_trap_blob() {
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  if (UseStackBanging) {
-    __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
-    __ bang_stack_size(rbx, rcx);
-  }
+  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(rbx, rcx);
 #endif
 
   // Load array of frame pcs into ECX
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 2c8d8ac15ebe1..ab9d5988c2170 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1958,13 +1958,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // instruction fits that requirement.
 
   // Generate stack overflow check
-
-  if (UseStackBanging) {
-    __ bang_stack_with_offset((int)StackOverflow::stack_shadow_zone_size());
-  } else {
-    // need a 5 byte instruction to allow MT safe patching to non-entrant
-    __ fat_nop();
-  }
+  __ bang_stack_with_offset((int)StackOverflow::stack_shadow_zone_size());
 
   // Generate a new frame for the wrapper.
   __ enter();
@@ -2874,10 +2868,8 @@ void SharedRuntime::generate_deopt_blob() {
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  if (UseStackBanging) {
-    __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
-    __ bang_stack_size(rbx, rcx);
-  }
+  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(rbx, rcx);
 #endif
 
   // Load address of array of frame pcs into rcx
@@ -3077,10 +3069,8 @@ void SharedRuntime::generate_uncommon_trap_blob() {
   // Compilers generate code that bang the stack by as much as the
   // interpreter would need. So this stack banging should never
   // trigger a fault. Verify that it does not on non product builds.
-  if (UseStackBanging) {
-    __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
-    __ bang_stack_size(rbx, rcx);
-  }
+  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(rbx, rcx);
 #endif
 
   // Load address of array of frame pcs into rcx (address*)
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index 5e1da51550843..1f6cc42593113 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -771,13 +771,11 @@ void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   // Bang each page in the shadow zone. We can't assume it's been done for
   // an interpreter frame with greater than a page of locals, so each page
   // needs to be checked.  Only true for non-native.
-  if (UseStackBanging) {
-    const int page_size = os::vm_page_size();
-    const int n_shadow_pages = ((int)StackOverflow::stack_shadow_zone_size()) / page_size;
-    const int start_page = native_call ? n_shadow_pages : 1;
-    for (int pages = start_page; pages <= n_shadow_pages; pages++) {
-      __ bang_stack_with_offset(pages*page_size);
-    }
+  const int page_size = os::vm_page_size();
+  const int n_shadow_pages = ((int)StackOverflow::stack_shadow_zone_size()) / page_size;
+  const int start_page = native_call ? n_shadow_pages : 1;
+  for (int pages = start_page; pages <= n_shadow_pages; pages++) {
+    __ bang_stack_with_offset(pages*page_size);
   }
 }
 
diff --git a/src/hotspot/share/asm/assembler.cpp b/src/hotspot/share/asm/assembler.cpp
index 66e3052bdeb1d..a8718c9c4fbca 100644
--- a/src/hotspot/share/asm/assembler.cpp
+++ b/src/hotspot/share/asm/assembler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,36 +121,34 @@ void AbstractAssembler::bind(Label& L) {
 }
 
 void AbstractAssembler::generate_stack_overflow_check(int frame_size_in_bytes) {
-  if (UseStackBanging) {
-    // Each code entry causes one stack bang n pages down the stack where n
-    // is configurable by StackShadowPages.  The setting depends on the maximum
-    // depth of VM call stack or native before going back into java code,
-    // since only java code can raise a stack overflow exception using the
-    // stack banging mechanism.  The VM and native code does not detect stack
-    // overflow.
-    // The code in JavaCalls::call() checks that there is at least n pages
-    // available, so all entry code needs to do is bang once for the end of
-    // this shadow zone.
-    // The entry code may need to bang additional pages if the framesize
-    // is greater than a page.
-
-    const int page_size = os::vm_page_size();
-    int bang_end = (int)StackOverflow::stack_shadow_zone_size();
-
-    // This is how far the previous frame's stack banging extended.
-    const int bang_end_safe = bang_end;
-
-    if (frame_size_in_bytes > page_size) {
-      bang_end += frame_size_in_bytes;
-    }
+  // Each code entry causes one stack bang n pages down the stack where n
+  // is configurable by StackShadowPages.  The setting depends on the maximum
+  // depth of VM call stack or native before going back into java code,
+  // since only java code can raise a stack overflow exception using the
+  // stack banging mechanism.  The VM and native code does not detect stack
+  // overflow.
+  // The code in JavaCalls::call() checks that there is at least n pages
+  // available, so all entry code needs to do is bang once for the end of
+  // this shadow zone.
+  // The entry code may need to bang additional pages if the framesize
+  // is greater than a page.
+
+  const int page_size = os::vm_page_size();
+  int bang_end = (int)StackOverflow::stack_shadow_zone_size();
+
+  // This is how far the previous frame's stack banging extended.
+  const int bang_end_safe = bang_end;
+
+  if (frame_size_in_bytes > page_size) {
+    bang_end += frame_size_in_bytes;
+  }
 
-    int bang_offset = bang_end_safe;
-    while (bang_offset <= bang_end) {
-      // Need at least one stack bang at end of shadow zone.
-      bang_stack_with_offset(bang_offset);
-      bang_offset += page_size;
-    }
-  } // end (UseStackBanging)
+  int bang_offset = bang_end_safe;
+  while (bang_offset <= bang_end) {
+    // Need at least one stack bang at end of shadow zone.
+    bang_stack_with_offset(bang_offset);
+    bang_offset += page_size;
+  }
 }
 
 void Label::add_patch_at(CodeBuffer* cb, int branch_loc, const char* file, int line) {
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 55b734156775c..c3f80710fe962 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -249,7 +249,6 @@ JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
   do_bool_flag(UseSHA512Intrinsics)                                        \
   X86_ONLY(do_intx_flag(UseSSE))                                           \
   COMPILER2_PRESENT(do_bool_flag(UseSquareToLenIntrinsic))                 \
-  do_bool_flag(UseStackBanging)                                            \
   do_bool_flag(UseTLAB)                                                    \
   do_bool_flag(VerifyOops)                                                 \
 
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index daff5e72ca809..583fd78f00489 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -440,7 +440,7 @@ bool PhaseOutput::need_stack_bang(int frame_size_in_bytes) const {
   // unexpected stack overflow (compiled method stack banging should
   // guarantee it doesn't happen) so we always need the stack bang in
   // a debug VM.
-  return (UseStackBanging && C->stub_function() == NULL &&
+  return (C->stub_function() == NULL &&
           (C->has_java_calls() || frame_size_in_bytes > os::vm_page_size()>>3
            DEBUG_ONLY(|| true)));
 }
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index f4f47dcfc7103..568e47e2e01c0 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -973,11 +973,6 @@ const intx ObjectAlignmentInBytes = 8;
           "Inject thread creation failures for "                            \
           "UseDynamicNumberOfCompilerThreads")                              \
                                                                             \
-  develop(bool, UseStackBanging, true,                                      \
-          "use stack banging for stack overflow checks (required for "      \
-          "proper StackOverflow handling; disable only to measure cost "    \
-          "of stackbanging)")                                               \
-                                                                            \
   develop(bool, GenerateSynchronizationCode, true,                          \
           "generate locking/unlocking code for synchronized methods and "   \
           "monitors")                                                       \
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
index a6a07ea734d65..17e0b05abd480 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -253,7 +253,7 @@ public final int logMinObjAlignment() {
 
     public final int stackShadowPages = getFlag("StackShadowPages", Integer.class);
     public final int stackReservedPages = getFlag("StackReservedPages", Integer.class, 0, JDK >= 9);
-    public final boolean useStackBanging = getFlag("UseStackBanging", Boolean.class);
+    public final boolean useStackBanging = getFlag("UseStackBanging", Boolean.class, true, JDK < 17);
     public final int stackBias = getConstant("STACK_BIAS", Integer.class, 0, JDK < 15);
     public final int vmPageSize = getFieldValue("CompilerToVM::Data::vm_page_size", Integer.class, "int");
 

From dab1787583209123fb92aed48f8965c474bf4138 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 11 Jan 2021 18:18:46 +0000
Subject: [PATCH 116/129] 8259559: COMPARE_BUILD can't compare patch files

Reviewed-by: erikj
---
 make/Init.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/Init.gmk b/make/Init.gmk
index 1df133eeef09d..4d297ee85e9e5 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -200,7 +200,7 @@ ifeq ($(HAS_SPEC),)
 	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" main && \
 	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
 	            SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
-	            COMPARE_BUILD="$(COMPARE_BUILD)" post-compare-build && \
+	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" post-compare-build && \
 	    ) \
 	  ) true ) \
 	  $(eval TARGET_DONE=true) \

From 386196023edec6936f9a31dc4442127d0e106c85 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 11 Jan 2021 18:22:58 +0000
Subject: [PATCH 117/129] 8258426: Split up autoconf/version-numbers and move
 it to conf dir

Reviewed-by: erikj
---
 .github/workflows/submit.yml                  |  2 +-
 make/autoconf/jdk-options.m4                  |  2 +-
 make/autoconf/jdk-version.m4                  | 16 ++++----
 make/autoconf/spec.gmk.in                     |  2 +-
 make/conf/branding.conf                       | 38 +++++++++++++++++++
 make/conf/jib-profiles.js                     | 12 +++---
 .../version-numbers.conf}                     | 14 -------
 7 files changed, 56 insertions(+), 30 deletions(-)
 create mode 100644 make/conf/branding.conf
 rename make/{autoconf/version-numbers => conf/version-numbers.conf} (80%)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index 7f6fa10f499cd..c63d062f8b441 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -55,7 +55,7 @@ jobs:
 
       - name: Determine versions and locations to be used for dependencies
         id: check_deps
-        run: "echo ::set-output name=dependencies::`cat make/autoconf/version-numbers make/conf/test-dependencies | sed -e '1i {' -e 's/#.*//g' -e 's/\"//g' -e 's/\\(.*\\)=\\(.*\\)/\"\\1\": \"\\2\",/g' -e '$s/,\\s\\{0,\\}$/\\}/'`"
+        run: "echo ::set-output name=dependencies::`cat make/conf/version-numbers.conf make/conf/test-dependencies | sed -e '1i {' -e 's/#.*//g' -e 's/\"//g' -e 's/\\(.*\\)=\\(.*\\)/\"\\1\": \"\\2\",/g' -e '$s/,\\s\\{0,\\}$/\\}/'`"
         working-directory: jdk
         if: steps.check_submit.outputs.should_run != 'false'
 
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index c87522ffa2eb9..6f29078bbaf3c 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -640,7 +640,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
     SOURCE_DATE=$($DATE +"%s")
     AC_MSG_RESULT([$SOURCE_DATE, from 'current'])
   elif test "x$with_source_date" = xversion; then
-    # Use the date from version-numbers
+    # Use the date from version-numbers.conf
     UTIL_GET_EPOCH_TIMESTAMP(SOURCE_DATE, $DEFAULT_VERSION_DATE)
     if test "x$SOURCE_DATE" = x; then
       AC_MSG_RESULT([unavailable])
diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4
index c5e23937ac6be..f61478b85fa30 100644
--- a/make/autoconf/jdk-version.m4
+++ b/make/autoconf/jdk-version.m4
@@ -58,7 +58,9 @@ AC_DEFUN([JDKVER_CHECK_AND_SET_NUMBER],
 AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
 [
   # Source the version numbers file
-  . $AUTOCONF_DIR/version-numbers
+  . $TOPDIR/make/conf/version-numbers.conf
+  # Source the branding file
+  . $TOPDIR/make/conf/branding.conf
 
   # Some non-version number information is set in that file
   AC_SUBST(LAUNCHER_NAME)
@@ -79,7 +81,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     # Set JDK_RC_NAME to a custom value if '--with-jdk-rc-name' was used and is not empty.
     JDK_RC_NAME="$with_jdk_rc_name"
   else
-    # Otherwise calculate from "version-numbers" included above.
+    # Otherwise calculate from "branding.conf" included above.
     JDK_RC_NAME="$PRODUCT_NAME $JDK_RC_PLATFORM_NAME"
   fi
   AC_SUBST(JDK_RC_NAME)
@@ -94,7 +96,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
   elif test "x$with_vendor_name" != x; then
     # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
-    # Otherwise we will use the value from "version-numbers" included above.
+    # Otherwise we will use the value from "branding.conf" included above.
     COMPANY_NAME="$with_vendor_name"
   fi
   AC_SUBST(COMPANY_NAME)
@@ -108,7 +110,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
   elif test "x$with_vendor_url" != x; then
     # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
-    # Otherwise we will use the value from "version-numbers" included above.
+    # Otherwise we will use the value from "branding.conf" included above.
     VENDOR_URL="$with_vendor_url"
   fi
   AC_SUBST(VENDOR_URL)
@@ -122,7 +124,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
   elif test "x$with_vendor_bug_url" != x; then
     # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty.
-    # Otherwise we will use the value from "version-numbers" included above.
+    # Otherwise we will use the value from "branding.conf" included above.
     VENDOR_URL_BUG="$with_vendor_bug_url"
   fi
   AC_SUBST(VENDOR_URL_BUG)
@@ -136,7 +138,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
   elif test "x$with_vendor_vm_bug_url" != x; then
     # Only set VENDOR_URL_VM_BUG if '--with-vendor-vm-bug-url' was used and is not empty.
-    # Otherwise we will use the value from "version-numbers" included above.
+    # Otherwise we will use the value from "branding.conf" included above.
     VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
   fi
   AC_SUBST(VENDOR_URL_VM_BUG)
@@ -280,7 +282,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     fi
   else
     if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
-      # Default is to get value from version-numbers
+      # Default is to get value from version-numbers.conf
       VERSION_FEATURE="$DEFAULT_VERSION_FEATURE"
     fi
   fi
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index fd9f782c0df5d..bf888e2329559 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -255,7 +255,7 @@ VERSION_CFLAGS := \
     #
 
 ifneq ($(COMPANY_NAME),)
-  # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default,
+  # COMPANY_NAME is set to "N/A" in make/conf/branding.conf by default,
   # but can be customized with the '--with-vendor-name' configure option.
   # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
   # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
diff --git a/make/conf/branding.conf b/make/conf/branding.conf
new file mode 100644
index 0000000000000..0a8571e129985
--- /dev/null
+++ b/make/conf/branding.conf
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+LAUNCHER_NAME=openjdk
+PRODUCT_NAME=OpenJDK
+PRODUCT_SUFFIX="Runtime Environment"
+JDK_RC_PLATFORM_NAME=Platform
+COMPANY_NAME=N/A
+HOTSPOT_VM_DISTRO="OpenJDK"
+VENDOR_URL=https://openjdk.java.net/
+VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
+VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp
+
+# Might need better names for these
+MACOSX_BUNDLE_NAME_BASE="OpenJDK"
+MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 632953e8e8887..982dec5aa09fd 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -211,7 +211,7 @@ var getJibProfiles = function (input) {
     // Include list to use when creating a minimal jib source bundle which
     // contains just the jib configuration files.
     data.conf_bundle_includes = [
-        "make/autoconf/version-numbers",
+        "make/conf/version-numbers.conf",
     ];
 
     // Define some common values
@@ -1354,7 +1354,7 @@ var concatObjects = function (o1, o2) {
 
 /**
  * Constructs the numeric version string from reading the
- * make/autoconf/version-numbers file and removing all trailing ".0".
+ * make/conf/version-numbers.conf file and removing all trailing ".0".
  *
  * @param feature Override feature version
  * @param interim Override interim version
@@ -1405,20 +1405,20 @@ var versionArgs = function(input, common) {
     return args;
 }
 
-// Properties representation of the make/autoconf/version-numbers file. Lazily
+// Properties representation of the make/conf/version-numbers.conf file. Lazily
 // initiated by the function below.
 var version_numbers;
 
 /**
- * Read the make/autoconf/version-numbers file into a Properties object.
+ * Read the make/conf/version-numbers.conf file into a Properties object.
  *
  * @returns {java.utilProperties}
  */
 var getVersionNumbers = function () {
-    // Read version information from make/autoconf/version-numbers
+    // Read version information from make/conf/version-numbers.conf
     if (version_numbers == null) {
         version_numbers = new java.util.Properties();
-        var stream = new java.io.FileInputStream(__DIR__ + "/../autoconf/version-numbers");
+        var stream = new java.io.FileInputStream(__DIR__ + "/version-numbers.conf");
         version_numbers.load(stream);
         stream.close();
     }
diff --git a/make/autoconf/version-numbers b/make/conf/version-numbers.conf
similarity index 80%
rename from make/autoconf/version-numbers
rename to make/conf/version-numbers.conf
index 7e9313331b8d7..98ed69ff35aec 100644
--- a/make/autoconf/version-numbers
+++ b/make/conf/version-numbers.conf
@@ -39,17 +39,3 @@ DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="15 16 17"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=17
 DEFAULT_PROMOTED_VERSION_PRE=ea
-
-LAUNCHER_NAME=openjdk
-PRODUCT_NAME=OpenJDK
-PRODUCT_SUFFIX="Runtime Environment"
-JDK_RC_PLATFORM_NAME=Platform
-COMPANY_NAME=N/A
-HOTSPOT_VM_DISTRO="OpenJDK"
-VENDOR_URL=https://openjdk.java.net/
-VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
-VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp
-
-# Might need better names for these
-MACOSX_BUNDLE_NAME_BASE="OpenJDK"
-MACOSX_BUNDLE_ID_BASE="net.java.openjdk"

From c956e7a69c1a2ff08d809d65a9c20ecf49f7cca7 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Mon, 11 Jan 2021 18:46:52 +0000
Subject: [PATCH 118/129] 8258659: Eliminate whitespace comments from generated
 pages

Reviewed-by: hannesw
---
 .../doclets/formats/html/Navigation.java      |  4 +--
 .../doclet/AccessSkipNav/AccessSkipNav.java   |  6 ++---
 .../TestAnnotationTypes.java                  |  1 -
 .../doclet/testNavigation/TestNavigation.java | 26 +++++--------------
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
index ec731b181f0ee..d3bbfb804e50d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
@@ -83,8 +83,6 @@ public class Navigation {
     private final String rowListTitle;
     private final Content searchLabel;
 
-    private static final Content EMPTY_COMMENT = new Comment(" ");
-
     public enum PageMode {
         ALL_CLASSES,
         ALL_PACKAGES,
@@ -953,7 +951,7 @@ public Content getContent() {
         tree.add(subDiv);
 
         tree.add(MarkerComments.END_OF_TOP_NAVBAR);
-        tree.add(HtmlTree.SPAN(HtmlStyle.skipNav, EMPTY_COMMENT)
+        tree.add(HtmlTree.SPAN(HtmlStyle.skipNav, HtmlTree.EMPTY)
                 .setId(SectionName.SKIP_NAVBAR_TOP.getName()));
 
         return tree;
diff --git a/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java
index e96d63cc869b1..622ee4b21f8d5 100644
--- a/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java
+++ b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4638136 7198273 8025633 8081854 8182765
+ * @bug 4638136 7198273 8025633 8081854 8182765 8258659
  * @summary  Add ability to skip over nav bar for accessibility
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -54,8 +54,6 @@ public void test() {
                     <a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a>""",
                 // Top navbar <span id>
                 """
-                    <span class="skip-nav" id="skip.navbar.top">
-                    <!--   -->
-                    </span>""");
+                    <span class="skip-nav" id="skip.navbar.top"></span>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
index ae17feafd9077..056a235287a97 100644
--- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
@@ -85,7 +85,6 @@ public void test() {
                     """
                         <section class="details" id="annotation.interface.element.detail">""",
                     "<h2>Element Details</h2>",
-                    "<!--   -->",
                     "</a>",
                     "<ul class=\"member-list\">",
                     "<li>",
diff --git a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
index e01d88d827683..b8fe273d7d6ce 100644
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854 8150188 8151743 8196027 8182765
- *           8196200 8196202 8223378
+ *           8196200 8196202 8223378 8258659
  * @summary  Make sure the Next/Prev Class links iterate through all types.
  *           Make sure the navagation is 2 columns, not 3.
  * @library  /tools/lib ../../lib
@@ -89,9 +89,7 @@ public void test(Path ignore) {
         checkOutput("pkg/A.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top">
-                    <!--   -->
-                    </span></nav>
+                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
                     </header>
                     <div class="flex-content">
                     <main role="main">
@@ -100,9 +98,7 @@ public void test(Path ignore) {
         checkOutput("pkg/package-summary.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top">
-                    <!--   -->
-                    </span></nav>
+                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
                     </header>
                     <div class="flex-content">
                     <main role="main">
@@ -122,9 +118,7 @@ public void test1(Path ignore) {
         checkOutput("pkg/A.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top">
-                    <!--   -->
-                    </span></nav>
+                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
                     </header>
                     <div class="flex-content">
                     <main role="main">
@@ -133,9 +127,7 @@ public void test1(Path ignore) {
         checkOutput("pkg/package-summary.html", true,
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
-                    <span class="skip-nav" id="skip.navbar.top">
-                    <!--   -->
-                    </span></nav>
+                    <span class="skip-nav" id="skip.navbar.top"></span></nav>
                     """);
     }
 
@@ -153,9 +145,7 @@ public void test2(Path ignore) {
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
                     </div>
-                    <div class="skip-nav"><a id="skip.navbar.top">
-                    <!--   -->
-                    </a></div>
+                    <div class="skip-nav"><a id="skip.navbar.top"></a></div>
                     </nav>
                     </header>
                     <!-- ======== START OF CLASS DATA ======== -->""");
@@ -164,9 +154,7 @@ public void test2(Path ignore) {
                 """
                     <!-- ========= END OF TOP NAVBAR ========= -->
                     </div>
-                    <div class="skip-nav"><a id="skip.navbar.top">
-                    <!--   -->
-                    </a></div>
+                    <div class="skip-nav"><a id="skip.navbar.top"></a></div>
                     </nav>""");
     }
 

From d9f21346bf26c74a155679f1184e88ddea395350 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Mon, 11 Jan 2021 18:49:50 +0000
Subject: [PATCH 119/129] 8258655: remove <-- NewPage --> comment from
 generated pages

Reviewed-by: hannesw
---
 .../doclets/formats/html/Contents.java        |  2 --
 .../formats/html/HtmlDocletWriter.java        |  5 ++---
 .../formats/html/IndexRedirectWriter.java     |  5 ++---
 .../formats/html/markup/HtmlDocument.java     | 19 +++----------------
 .../html/resources/standard.properties        |  1 -
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
index dc61bf801b066..78803aa0653e8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
@@ -140,7 +140,6 @@ public class Contents {
     public final Content navProperty;
     public final Content navServices;
     public final Content nestedClassSummary;
-    public final Content newPage;
     public final Content noScriptMessage;
     public final Content openModuleLabel;
     public final Content openedTo;
@@ -287,7 +286,6 @@ public class Contents {
         navProperty = getContent("doclet.navProperty");
         navServices = getContent("doclet.navServices");
         nestedClassSummary = getContent("doclet.Nested_Class_Summary");
-        newPage = new Comment(resources.getText("doclet.New_Page"));
         noScriptMessage = getContent("doclet.No_Script_Message");
         openedTo = getContent("doclet.OpenedTo");
         openModuleLabel = getContent("doclet.Open_Module");
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index b4eb2066f9183..06752809d0a7d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -459,7 +459,6 @@ public void printHtmlDocument(List<String> metakeywords,
                                   List<DocPath> localStylesheets,
                                   Content body)
             throws DocFileIOException {
-        Content htmlComment = contents.newPage;
         List<DocPath> additionalStylesheets = configuration.getAdditionalStylesheets();
         additionalStylesheets.addAll(localStylesheets);
         Head head = new Head(path, configuration.getDocletVersion(), configuration.startTime)
@@ -473,8 +472,8 @@ public void printHtmlDocument(List<String> metakeywords,
                 .setIndex(options.createIndex(), mainBodyScript)
                 .addContent(extraHeadContent);
 
-        Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body);
-        HtmlDocument htmlDocument = new HtmlDocument(htmlComment, htmlTree);
+        HtmlDocument htmlDocument = new HtmlDocument(
+                HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body));
         htmlDocument.write(DocFile.createFileForOutput(configuration, path));
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
index 99db81bcc59fd..15f3e1045bb16 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
@@ -74,7 +74,6 @@ private IndexRedirectWriter(HtmlConfiguration configuration, DocPath filename, D
      * @throws DocFileIOException if there is a problem generating the file
      */
     private void generateIndexFile() throws DocFileIOException {
-        Content htmlComment = contents.newPage;
         Head head = new Head(path, configuration.getDocletVersion(), configuration.startTime)
                 .setTimestamp(!options.noTimestamp())
                 .setDescription("index redirect")
@@ -109,8 +108,8 @@ private void generateIndexFile() throws DocFileIOException {
         HtmlTree main = HtmlTree.MAIN(bodyContent);
         body.add(main);
 
-        Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body);
-        HtmlDocument htmlDocument = new HtmlDocument(htmlComment, htmlTree);
+        HtmlDocument htmlDocument = new HtmlDocument(
+                HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body));
         htmlDocument.write(DocFile.createFileForOutput(configuration, path));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
index c7e8fa69c24d1..40ae4699ea6b7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
@@ -45,17 +45,7 @@
  */
 public class HtmlDocument {
     private final DocType docType = DocType.HTML5;
-    private final List<Content> docContent;
-
-    /**
-     * Constructor to construct an HTML document.
-     *
-     * @param docComment comment for the document
-     * @param htmlTree HTML tree of the document
-     */
-    public HtmlDocument(Content docComment, Content htmlTree) {
-        docContent = Arrays.asList(docComment, htmlTree);
-    }
+    private final Content docContent;
 
     /**
      * Constructor to construct an HTML document.
@@ -63,7 +53,7 @@ public HtmlDocument(Content docComment, Content htmlTree) {
      * @param htmlTree HTML tree of the document
      */
     public HtmlDocument(Content htmlTree) {
-        docContent = Collections.singletonList(htmlTree);
+        docContent = htmlTree;
     }
 
     /**
@@ -93,9 +83,6 @@ public String toString() {
     private void write(Writer writer) throws IOException {
         writer.write(docType.text);
         writer.write(DocletConstants.NL);
-        boolean atNewline = true;
-        for (Content c : docContent) {
-            atNewline = c.write(writer, atNewline);
-        }
+        docContent.write(writer, true);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
index 2f6ef2dc5ffe1..257759bd7ea1f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
@@ -72,7 +72,6 @@ doclet.Window_Split_Index={0}-Index
 doclet.Help=Help
 doclet.Skip_navigation_links=Skip navigation links
 doclet.Navigation=Navigation
-doclet.New_Page=NewPage
 doclet.navDeprecated=Deprecated
 doclet.Window_Deprecated_List=Deprecated List
 doclet.Window_Preview_List=Preview List

From 8dfc77bfa669a29d275c202ce83422ccb6853717 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Mon, 11 Jan 2021 19:44:26 +0000
Subject: [PATCH 120/129] 8259586: ProblemList
 dll_address_to_function_and_library_name

Reviewed-by: hseigel
---
 test/hotspot/gtest/runtime/test_os.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 2bf31998f7593..15f2225c9cea0 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -698,7 +698,7 @@ TEST_VM(os, pagesizes_test_print) {
   ASSERT_EQ(strcmp(expected, buffer), 0);
 }
 
-TEST_VM(os, dll_address_to_function_and_library_name) {
+TEST_VM(os, DISABLED_dll_address_to_function_and_library_name) {
   char tmp[1024];
   char output[1024];
   stringStream st(output, sizeof(output));

From e9929e2b5aad12c83ca90de24ab6afab541c1c33 Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Mon, 11 Jan 2021 21:36:16 +0000
Subject: [PATCH 121/129] 8259582: Backout JDK-8237578 until all affected tests
 have been fixed

Reviewed-by: xuelei
---
 .../sun/security/ssl/SSLSocketImpl.java       |  18 ---
 .../sun/security/ssl/SSLTransport.java        |   4 -
 .../ssl/SSLContextImpl/TrustTrustedCert.java  |   4 +-
 ...ssues.java => SSLExceptionForIOIssue.java} |  10 +-
 .../SSLSocketShouldThrowSocketException.java  | 153 ------------------
 5 files changed, 7 insertions(+), 182 deletions(-)
 rename test/jdk/sun/security/ssl/SSLSocketImpl/{SocketExceptionForSocketIssues.java => SSLExceptionForIOIssue.java} (95%)
 delete mode 100644 test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java

diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index 3833edd59e4f2..91a7822958727 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -447,8 +447,6 @@ private void startHandshake(boolean resumable) throws IOException {
                     throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
                             "Couldn't kickstart handshaking", iioe);
                 }
-            } catch (SocketException se) {
-                handleException(se);
             } catch (IOException ioe) {
                 throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
                     "Couldn't kickstart handshaking", ioe);
@@ -1413,9 +1411,6 @@ private int readHandshakeRecord() throws IOException {
             } catch (InterruptedIOException iioe) {
                 // don't change exception in case of timeouts or interrupts
                 throw iioe;
-            } catch (SocketException se) {
-                // don't change exception in case of SocketException
-                throw se;
             } catch (IOException ioe) {
                 throw new SSLException("readHandshakeRecord", ioe);
             }
@@ -1481,9 +1476,6 @@ private ByteBuffer readApplicationRecord(
             } catch (InterruptedIOException iioe) {
                 // don't change exception in case of timeouts or interrupts
                 throw iioe;
-            } catch (SocketException se) {
-                // don't change exception in case of SocketException
-                throw se;
             } catch (IOException ioe) {
                 if (!(ioe instanceof SSLException)) {
                     throw new SSLException("readApplicationRecord", ioe);
@@ -1695,16 +1687,6 @@ private void handleException(Exception cause) throws IOException {
             }
         }
 
-        if (cause instanceof SocketException) {
-            try {
-                conContext.fatal(alert, cause);
-            } catch (Exception e) {
-                // Just delivering the fatal alert, re-throw the socket exception instead.
-            }
-
-            throw (SocketException)cause;
-        }
-
         throw conContext.fatal(alert, cause);
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
index 8d4cf1e2be999..efd2e00808f45 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
@@ -28,7 +28,6 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InterruptedIOException;
-import java.net.SocketException;
 import java.nio.ByteBuffer;
 import javax.crypto.AEADBadTagException;
 import javax.crypto.BadPaddingException;
@@ -141,9 +140,6 @@ static Plaintext decode(TransportContext context,
         } catch (InterruptedIOException iioe) {
             // don't close the Socket in case of timeouts or interrupts.
             throw iioe;
-        } catch (SocketException se) {
-            // don't change exception in case of SocketException
-            throw se;
         } catch (IOException ioe) {
             throw context.fatal(Alert.UNEXPECTED_MESSAGE, ioe);
         }
diff --git a/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java b/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
index aae4292fb3cee..51fdafff7da7c 100644
--- a/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
+++ b/test/jdk/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
@@ -131,9 +131,9 @@ protected void runServerApplication(SSLSocket socket) throws Exception {
             sslIS.read();
             sslOS.write('A');
             sslOS.flush();
-        } catch (SSLException | SocketException se) {
+        } catch (SSLException ssle) {
             if (!expectFail) {
-                throw se;
+                throw ssle;
             }   // Otherwise, ignore.
         }
     }
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SocketExceptionForSocketIssues.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLExceptionForIOIssue.java
similarity index 95%
rename from test/jdk/sun/security/ssl/SSLSocketImpl/SocketExceptionForSocketIssues.java
rename to test/jdk/sun/security/ssl/SSLSocketImpl/SSLExceptionForIOIssue.java
index dcaf6dab977f4..5578ea7254db1 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/SocketExceptionForSocketIssues.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLExceptionForIOIssue.java
@@ -31,18 +31,18 @@
  * @bug 8214339
  * @summary SSLSocketImpl erroneously wraps SocketException
  * @library /javax/net/ssl/templates
- * @run main/othervm SocketExceptionForSocketIssues
+ * @run main/othervm SSLExceptionForIOIssue
  */
 
 import javax.net.ssl.*;
 import java.io.*;
 import java.net.*;
 
-public class SocketExceptionForSocketIssues implements SSLContextTemplate {
+public class SSLExceptionForIOIssue implements SSLContextTemplate {
 
     public static void main(String[] args) throws Exception {
         System.err.println("===================================");
-        new SocketExceptionForSocketIssues().test();
+        new SSLExceptionForIOIssue().test();
     }
 
     private void test() throws Exception {
@@ -79,9 +79,9 @@ private void test() throws Exception {
             os.flush();
         } catch (SSLProtocolException | SSLHandshakeException sslhe) {
             throw sslhe;
-        } catch (SocketException se) {
+        } catch (SSLException ssle) {
             // the expected exception, ignore it
-            System.err.println("server exception: " + se);
+            System.err.println("server exception: " + ssle);
         } finally {
             if (listenSocket != null) {
                 listenSocket.close();
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java
deleted file mode 100644
index 0962db7788141..0000000000000
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketShouldThrowSocketException.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2017, 2020, Amazon and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8214339
- * @summary When a SocketException is thrown by the underlying layer, It
- *      should be thrown as is and not be transformed to an SSLException.
- * @library /javax/net/ssl/templates
- * @run main/othervm SSLSocketShouldThrowSocketException
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-import javax.net.ssl.*;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class SSLSocketShouldThrowSocketException extends SSLSocketTemplate {
-
-    boolean handshake;
-
-    private final CountDownLatch clientTerminatedCondition = new CountDownLatch(1);
-
-    SSLSocketShouldThrowSocketException(boolean handshake) {
-        this.handshake = handshake;
-    }
-
-    @Override
-    protected boolean isCustomizedClientConnection() {
-        return true;
-    }
-
-    @Override
-    protected void runServerApplication(SSLSocket socket) throws Exception {
-        clientTerminatedCondition.await(30L, TimeUnit.SECONDS);
-    }
-
-    @Override
-    protected void runClientApplication(int serverPort) throws Exception {
-        Socket baseSocket = new Socket("localhost", this.serverPort);
-
-        SSLSocketFactory sslsf =
-                (SSLSocketFactory) SSLSocketFactory.getDefault();
-        SSLSocket sslSocket = (SSLSocket)
-                sslsf.createSocket(baseSocket, "localhost", serverPort, false);
-
-        if (this.handshake) {
-            testHandshakeClose(baseSocket, sslSocket);
-        } else {
-            testDataClose(baseSocket, sslSocket);
-        }
-
-        clientTerminatedCondition.countDown();
-
-    }
-
-    private void testHandshakeClose(Socket baseSocket, SSLSocket sslSocket) throws Exception {
-        Thread aborter = new Thread() {
-            @Override
-            public void run() {
-
-                try {
-                    Thread.sleep(10);
-                    System.err.println("Closing the client socket : " + System.nanoTime());
-                    baseSocket.close();
-                } catch (Exception ieo) {
-                    ieo.printStackTrace();
-                }
-            }
-        };
-
-        aborter.start();
-
-        try {
-            // handshaking
-            System.err.println("Client starting handshake: " + System.nanoTime());
-            sslSocket.startHandshake();
-            throw new Exception("Start handshake did not throw an exception");
-        } catch (SocketException se) {
-            System.err.println("Caught Expected SocketException");
-        }
-
-        aborter.join();
-    }
-
-    private void testDataClose(Socket baseSocket, SSLSocket sslSocket) throws Exception{
-
-        CountDownLatch handshakeCondition = new CountDownLatch(1);
-
-        Thread aborter = new Thread() {
-            @Override
-            public void run() {
-
-                try {
-                    handshakeCondition.await(10L, TimeUnit.SECONDS);
-                    System.err.println("Closing the client socket : " + System.nanoTime());
-                    baseSocket.close();
-                } catch (Exception ieo) {
-                    ieo.printStackTrace();
-                }
-            }
-        };
-
-        aborter.start();
-
-        try {
-            // handshaking
-            System.err.println("Client starting handshake: " + System.nanoTime());
-            sslSocket.startHandshake();
-            handshakeCondition.countDown();
-            System.err.println("Reading data from server");
-            BufferedReader is = new BufferedReader(
-                    new InputStreamReader(sslSocket.getInputStream()));
-            String data = is.readLine();
-            throw new Exception("Start handshake did not throw an exception");
-        } catch (SocketException se) {
-            System.err.println("Caught Expected SocketException");
-        }
-
-        aborter.join();
-    }
-
-    public static void main(String[] args) throws Exception {
-        // SocketException should be throws during a handshake phase.
-        (new SSLSocketShouldThrowSocketException(true)).run();
-        // SocketException should be throw during the application data phase.
-        (new SSLSocketShouldThrowSocketException(false)).run();
-    }
-}

From cd73939b794320d92d45e00b220fd953d83183cf Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 11 Jan 2021 22:02:46 +0000
Subject: [PATCH 122/129] 8259528: Broken Link for [java.text.Normalizer.Form]

Reviewed-by: lancea, joehw, iris
---
 src/java.base/share/classes/java/text/Normalizer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/text/Normalizer.java b/src/java.base/share/classes/java/text/Normalizer.java
index 84cb886a08f45..d717d7d79fa31 100644
--- a/src/java.base/share/classes/java/text/Normalizer.java
+++ b/src/java.base/share/classes/java/text/Normalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
  * sorting and searching of text.
  * The {@code normalize} method supports the standard normalization forms
  * described in
- * <a href="http://www.unicode.org/unicode/reports/tr15/tr15-23.html">
+ * <a href="https://www.unicode.org/reports/tr15/">
  * Unicode Standard Annex #15 &mdash; Unicode Normalization Forms</a>.
  * <p>
  * Characters with accents or other adornments can be encoded in
@@ -112,7 +112,7 @@ public final class Normalizer {
     /**
      * This enum provides constants of the four Unicode normalization forms
      * that are described in
-     * <a href="http://www.unicode.org/unicode/reports/tr15/tr15-23.html">
+     * <a href="https://www.unicode.org/reports/tr15/">
      * Unicode Standard Annex #15 &mdash; Unicode Normalization Forms</a>
      * and two methods to access them.
      *

From 712ea25057db51f33d3587114443f7cb3df972cc Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Mon, 11 Jan 2021 23:13:52 +0000
Subject: [PATCH 123/129] 8258925: configure script failed on WSL

Reviewed-by: dholmes, erikj
---
 make/scripts/fixpath.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/make/scripts/fixpath.sh b/make/scripts/fixpath.sh
index 7cae7183551c4..1a894df5413cd 100644
--- a/make/scripts/fixpath.sh
+++ b/make/scripts/fixpath.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -145,11 +145,14 @@ function import_path() {
   fi
 
   if [[ "$path" != "" ]]; then
+    # Store current unix path
+    unixpath="$path"
     # Now turn it into a windows path
     winpath="$($PATHTOOL -w "$path" 2>/dev/null)"
     # If it fails, try again with an added .exe (needed on WSL)
     if [[ $? -ne 0 ]]; then
-      winpath="$($PATHTOOL -w "$path.exe" 2>/dev/null)"
+      unixpath="$unixpath.exe"
+      winpath="$($PATHTOOL -w "$unixpath" 2>/dev/null)"
     fi
     if [[ $? -eq 0 ]]; then
       if [[ ! "$winpath" =~ ^"$ENVROOT"\\.*$ ]] ; then
@@ -159,11 +162,11 @@ function import_path() {
           # This monster of a command uses the %~s support from cmd.exe to
           # reliably convert to short paths on all winenvs.
           shortpath="$($CMD /q /c for %I in \( "$winpath" \) do echo %~sI 2>/dev/null | tr -d \\n\\r)"
-          path="$($PATHTOOL -u "$shortpath")"
-          # Path is now unix style, based on short name
+          unixpath="$($PATHTOOL -u "$shortpath")"
+          # unixpath is based on short name
         fi
         # Make it lower case
-        path="$(echo "$path" | tr [:upper:] [:lower:])"
+        path="$(echo "$unixpath" | tr [:upper:] [:lower:])"
       fi
     else
       # On WSL1, PATHTOOL will fail for files in envroot. If the unix path

From ff54b77b768d65b69d808d13ea14c528356fae4e Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 11 Jan 2021 23:14:56 +0000
Subject: [PATCH 124/129] 8259439: Apply java.io.Serial annotations in
 java.datatransfer

Reviewed-by: aivanov, pbansal, trebari, darcy
---
 .../classes/java/awt/datatransfer/DataFlavor.java     |  7 ++++++-
 .../classes/java/awt/datatransfer/FlavorEvent.java    |  7 ++++++-
 .../share/classes/java/awt/datatransfer/MimeType.java | 11 ++++++-----
 .../java/awt/datatransfer/MimeTypeParseException.java |  9 +++++++--
 .../awt/datatransfer/UnsupportedFlavorException.java  |  9 ++++++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
index 9d3df2aa0cd51..f44cba22c1350 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
 import java.io.ObjectOutput;
 import java.io.OptionalDataException;
 import java.io.Reader;
+import java.io.Serial;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
@@ -111,6 +112,10 @@
  */
 public class DataFlavor implements Externalizable, Cloneable {
 
+    /**
+     * Use serialVersionUID from JDK 1.2 for interoperability.
+     */
+    @Serial
     private static final long serialVersionUID = 8367026044764648243L;
     private static final Class<InputStream> ioInputStreamClass = InputStream.class;
 
diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java
index 8f38c86560d63..d90ca9265a19a 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/FlavorEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package java.awt.datatransfer;
 
+import java.io.Serial;
 import java.util.EventObject;
 
 /**
@@ -37,6 +38,10 @@
  */
 public class FlavorEvent extends EventObject {
 
+    /**
+     * Use serialVersionUID from JDK 1.5 for interoperability.
+     */
+    @Serial
     private static final long serialVersionUID = -5842664112252414548L;
 
     /**
diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java
index 01b7edd01dc49..854791c13c869 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.io.Serial;
 import java.util.Locale;
 
 /**
@@ -41,11 +42,11 @@
  */
 class MimeType implements Externalizable, Cloneable {
 
-    /*
-     * serialization support
+    /**
+     * Use serialVersionUID from JDK 1.2 for interoperability.
      */
-
-    static final long serialVersionUID = -6568722458793895906L;
+    @Serial
+    private static final long serialVersionUID = -6568722458793895906L;
 
     /**
      * Constructor for externalization; this constructor should not be called
diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java
index 61e411609145d..bf5769c8bd562 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package java.awt.datatransfer;
 
+import java.io.Serial;
+
 /**
  * A class to encapsulate MimeType parsing related exceptions.
  *
@@ -33,7 +35,10 @@
  */
 public class MimeTypeParseException extends Exception {
 
-    // use serialVersionUID from JDK 1.2.2 for interoperability
+    /**
+     * Use serialVersionUID from JDK 1.2.2 for interoperability.
+     */
+    @Serial
     private static final long serialVersionUID = -5604407764691570741L;
 
     /**
diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
index 17f4a3f2108a4..f1d21b9da8c6b 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package java.awt.datatransfer;
 
+import java.io.Serial;
+
 /**
  * Signals that the requested data is not supported in this flavor.
  *
@@ -34,9 +36,10 @@
  */
 public class UnsupportedFlavorException extends Exception {
 
-    /*
-     * JDK 1.1 serialVersionUID
+    /**
+     * Use serialVersionUID from JDK 1.1 for interoperability.
      */
+    @Serial
     private static final long serialVersionUID = 5383814944251665601L;
 
     /**

From 022bc9f0cb3c8cda3d14aeadd5f8dc08cad2dc54 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <turbanoff@gmail.com>
Date: Mon, 11 Jan 2021 23:30:44 +0000
Subject: [PATCH 125/129] 8258422: Cleanup unnecessary null comparison before
 instanceof check in java.base

Reviewed-by: chegar, aefimov
---
 src/java.base/share/classes/java/io/File.java |  4 +--
 .../java/lang/reflect/Constructor.java        |  3 +--
 .../classes/java/lang/reflect/Field.java      |  3 +--
 .../classes/java/lang/reflect/Method.java     |  3 +--
 .../net/AbstractPlainDatagramSocketImpl.java  | 26 +++++++++----------
 .../java/net/AbstractPlainSocketImpl.java     | 21 +++++++--------
 .../classes/java/net/DatagramPacket.java      |  3 +--
 .../java/net/HttpConnectSocketImpl.java       |  3 +--
 .../share/classes/java/net/Inet4Address.java  |  4 +--
 .../share/classes/java/net/Inet6Address.java  | 10 +++----
 .../classes/java/net/InetSocketAddress.java   | 10 +++----
 .../classes/java/net/NetMulticastSocket.java  | 16 ++++++------
 .../share/classes/java/net/Proxy.java         |  3 +--
 .../classes/java/net/SocksSocketImpl.java     |  3 +--
 .../java/nio/file/attribute/AclEntry.java     |  3 +--
 .../classes/jdk/internal/misc/Signal.java     | 13 +++++-----
 .../sun/net/www/protocol/http/Negotiator.java |  4 +--
 .../net/www/protocol/https/HttpsClient.java   |  2 +-
 .../sun/nio/ch/DatagramSocketAdaptor.java     |  4 +--
 .../sun/nio/fs/PollingWatchService.java       |  4 +--
 .../unix/classes/sun/nio/fs/UnixPath.java     |  4 +--
 .../classes/sun/nio/fs/WindowsPath.java       |  4 +--
 22 files changed, 69 insertions(+), 81 deletions(-)

diff --git a/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java
index ca49cc9d22876..1576b90b0d25e 100644
--- a/src/java.base/share/classes/java/io/File.java
+++ b/src/java.base/share/classes/java/io/File.java
@@ -2190,8 +2190,8 @@ public int compareTo(File pathname) {
      *          {@code false} otherwise
      */
     public boolean equals(Object obj) {
-        if ((obj != null) && (obj instanceof File)) {
-            return compareTo((File)obj) == 0;
+        if (obj instanceof File file) {
+            return compareTo(file) == 0;
         }
         return false;
     }
diff --git a/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java
index 8249c0158fd86..a3070717f4828 100644
--- a/src/java.base/share/classes/java/lang/reflect/Constructor.java
+++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -308,8 +308,7 @@ public Type[] getGenericExceptionTypes() {
      * same formal parameter types.
      */
     public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Constructor) {
-            Constructor<?> other = (Constructor<?>)obj;
+        if (obj instanceof Constructor<?> other) {
             if (getDeclaringClass() == other.getDeclaringClass()) {
                 return equalParamTypes(parameterTypes, other.parameterTypes);
             }
diff --git a/src/java.base/share/classes/java/lang/reflect/Field.java b/src/java.base/share/classes/java/lang/reflect/Field.java
index 28fa076816b4f..eb19e20e1d5e3 100644
--- a/src/java.base/share/classes/java/lang/reflect/Field.java
+++ b/src/java.base/share/classes/java/lang/reflect/Field.java
@@ -279,8 +279,7 @@ public Type getGenericType() {
      * and type.
      */
     public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Field) {
-            Field other = (Field)obj;
+        if (obj instanceof Field other) {
             return (getDeclaringClass() == other.getDeclaringClass())
                 && (getName() == other.getName())
                 && (getType() == other.getType());
diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java
index 080851cc9eeb3..4e28846dc5d8e 100644
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -358,8 +358,7 @@ public Type[] getGenericExceptionTypes() {
      * and formal parameter types and return type.
      */
     public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Method) {
-            Method other = (Method)obj;
+        if (obj instanceof Method other) {
             if ((getDeclaringClass() == other.getDeclaringClass())
                 && (getName() == other.getName())) {
                 if (!returnType.equals(other.getReturnType()))
diff --git a/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java b/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
index 0f21e14cd5576..04544f3fab921 100644
--- a/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
+++ b/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
@@ -235,9 +235,9 @@ protected void leave(InetAddress inetaddr) throws IOException {
 
     protected void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf)
         throws IOException {
-        if (mcastaddr == null || !(mcastaddr instanceof InetSocketAddress))
+        if (!(mcastaddr instanceof InetSocketAddress addr))
             throw new IllegalArgumentException("Unsupported address type");
-        join(((InetSocketAddress)mcastaddr).getAddress(), netIf);
+        join(addr.getAddress(), netIf);
     }
 
     protected abstract void join(InetAddress inetaddr, NetworkInterface netIf)
@@ -253,9 +253,9 @@ protected abstract void join(InetAddress inetaddr, NetworkInterface netIf)
      */
     protected void leaveGroup(SocketAddress mcastaddr, NetworkInterface netIf)
         throws IOException {
-        if (mcastaddr == null || !(mcastaddr instanceof InetSocketAddress))
+        if (!(mcastaddr instanceof InetSocketAddress addr))
             throw new IllegalArgumentException("Unsupported address type");
-        leave(((InetSocketAddress)mcastaddr).getAddress(), netIf);
+        leave(addr.getAddress(), netIf);
     }
 
     protected abstract void leave(InetAddress inetaddr, NetworkInterface netIf)
@@ -292,7 +292,7 @@ public void setOption(int optID, Object o) throws SocketException {
              * PlainSocketImpl.setOption().
              */
          case SO_TIMEOUT:
-             if (o == null || !(o instanceof Integer)) {
+             if (!(o instanceof Integer)) {
                  throw new SocketException("bad argument for SO_TIMEOUT");
              }
              int tmp = ((Integer) o).intValue();
@@ -301,18 +301,18 @@ public void setOption(int optID, Object o) throws SocketException {
              timeout = tmp;
              return;
          case IP_TOS:
-             if (o == null || !(o instanceof Integer)) {
+             if (!(o instanceof Integer)) {
                  throw new SocketException("bad argument for IP_TOS");
              }
              trafficClass = ((Integer)o).intValue();
              break;
          case SO_REUSEADDR:
-             if (o == null || !(o instanceof Boolean)) {
+             if (!(o instanceof Boolean)) {
                  throw new SocketException("bad argument for SO_REUSEADDR");
              }
              break;
          case SO_BROADCAST:
-             if (o == null || !(o instanceof Boolean)) {
+             if (!(o instanceof Boolean)) {
                  throw new SocketException("bad argument for SO_BROADCAST");
              }
              break;
@@ -320,26 +320,26 @@ public void setOption(int optID, Object o) throws SocketException {
              throw new SocketException("Cannot re-bind Socket");
          case SO_RCVBUF:
          case SO_SNDBUF:
-             if (o == null || !(o instanceof Integer) ||
+             if (!(o instanceof Integer) ||
                  ((Integer)o).intValue() < 0) {
                  throw new SocketException("bad argument for SO_SNDBUF or " +
                                            "SO_RCVBUF");
              }
              break;
          case IP_MULTICAST_IF:
-             if (o == null || !(o instanceof InetAddress))
+             if (!(o instanceof InetAddress))
                  throw new SocketException("bad argument for IP_MULTICAST_IF");
              break;
          case IP_MULTICAST_IF2:
-             if (o == null || !(o instanceof NetworkInterface))
+             if (!(o instanceof NetworkInterface))
                  throw new SocketException("bad argument for IP_MULTICAST_IF2");
              break;
          case IP_MULTICAST_LOOP:
-             if (o == null || !(o instanceof Boolean))
+             if (!(o instanceof Boolean))
                  throw new SocketException("bad argument for IP_MULTICAST_LOOP");
              break;
          case SO_REUSEPORT:
-             if (o == null || !(o instanceof Boolean)) {
+             if (!(o instanceof Boolean)) {
                  throw new SocketException("bad argument for SO_REUSEPORT");
              }
              if (!supportedOptions().contains(StandardSocketOptions.SO_REUSEPORT)) {
diff --git a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
index ac6b1002fa5a4..a6d89829dc6c1 100644
--- a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
+++ b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
@@ -213,9 +213,8 @@ protected void connect(SocketAddress address, int timeout)
             throws IOException {
         boolean connected = false;
         try {
-            if (address == null || !(address instanceof InetSocketAddress))
+            if (!(address instanceof InetSocketAddress addr))
                 throw new IllegalArgumentException("unsupported address type");
-            InetSocketAddress addr = (InetSocketAddress) address;
             if (addr.isUnresolved())
                 throw new UnknownHostException(addr.getHostName());
             // recording this.address as supplied by caller before calling connect
@@ -259,7 +258,7 @@ public void setOption(int opt, Object val) throws SocketException {
              * PlainSocketImpl.setOption().
              */
         case SO_LINGER:
-            if (val == null || (!(val instanceof Integer) && !(val instanceof Boolean)))
+            if (!(val instanceof Integer) && !(val instanceof Boolean))
                 throw new SocketException("Bad parameter for option");
             if (val instanceof Boolean) {
                 /* true only if disabling - enabling should be Integer */
@@ -267,7 +266,7 @@ public void setOption(int opt, Object val) throws SocketException {
             }
             break;
         case SO_TIMEOUT:
-            if (val == null || (!(val instanceof Integer)))
+            if (!(val instanceof Integer))
                 throw new SocketException("Bad parameter for SO_TIMEOUT");
             int tmp = ((Integer) val).intValue();
             if (tmp < 0)
@@ -275,7 +274,7 @@ public void setOption(int opt, Object val) throws SocketException {
             timeout = tmp;
             break;
         case IP_TOS:
-             if (val == null || !(val instanceof Integer)) {
+             if (!(val instanceof Integer)) {
                  throw new SocketException("bad argument for IP_TOS");
              }
              trafficClass = ((Integer)val).intValue();
@@ -283,35 +282,35 @@ public void setOption(int opt, Object val) throws SocketException {
         case SO_BINDADDR:
             throw new SocketException("Cannot re-bind socket");
         case TCP_NODELAY:
-            if (val == null || !(val instanceof Boolean))
+            if (!(val instanceof Boolean))
                 throw new SocketException("bad parameter for TCP_NODELAY");
             on = ((Boolean)val).booleanValue();
             break;
         case SO_SNDBUF:
         case SO_RCVBUF:
-            if (val == null || !(val instanceof Integer) ||
+            if (!(val instanceof Integer) ||
                 !(((Integer)val).intValue() > 0)) {
                 throw new SocketException("bad parameter for SO_SNDBUF " +
                                           "or SO_RCVBUF");
             }
             break;
         case SO_KEEPALIVE:
-            if (val == null || !(val instanceof Boolean))
+            if (!(val instanceof Boolean))
                 throw new SocketException("bad parameter for SO_KEEPALIVE");
             on = ((Boolean)val).booleanValue();
             break;
         case SO_OOBINLINE:
-            if (val == null || !(val instanceof Boolean))
+            if (!(val instanceof Boolean))
                 throw new SocketException("bad parameter for SO_OOBINLINE");
             on = ((Boolean)val).booleanValue();
             break;
         case SO_REUSEADDR:
-            if (val == null || !(val instanceof Boolean))
+            if (!(val instanceof Boolean))
                 throw new SocketException("bad parameter for SO_REUSEADDR");
             on = ((Boolean)val).booleanValue();
             break;
         case SO_REUSEPORT:
-            if (val == null || !(val instanceof Boolean))
+            if (!(val instanceof Boolean))
                 throw new SocketException("bad parameter for SO_REUSEPORT");
             if (!supportedOptions().contains(StandardSocketOptions.SO_REUSEPORT))
                 throw new UnsupportedOperationException("unsupported option");
diff --git a/src/java.base/share/classes/java/net/DatagramPacket.java b/src/java.base/share/classes/java/net/DatagramPacket.java
index 88aaffac2d967..1ee2a33da2fd7 100644
--- a/src/java.base/share/classes/java/net/DatagramPacket.java
+++ b/src/java.base/share/classes/java/net/DatagramPacket.java
@@ -352,9 +352,8 @@ public synchronized void setPort(int iport) {
      * @since   1.4
      */
     public synchronized void setSocketAddress(SocketAddress address) {
-        if (address == null || !(address instanceof InetSocketAddress))
+        if (!(address instanceof InetSocketAddress addr))
             throw new IllegalArgumentException("unsupported address type");
-        InetSocketAddress addr = (InetSocketAddress) address;
         if (addr.isUnresolved())
             throw new IllegalArgumentException("unresolved address");
         setAddress(addr.getAddress());
diff --git a/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
index 69baf865585e5..b06254699d597 100644
--- a/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
+++ b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
@@ -102,9 +102,8 @@ protected void connect(InetAddress address, int port) throws IOException {
     protected void connect(SocketAddress endpoint, int timeout)
         throws IOException
     {
-        if (endpoint == null || !(endpoint instanceof InetSocketAddress))
+        if (!(endpoint instanceof InetSocketAddress epoint))
             throw new IllegalArgumentException("Unsupported address type");
-        final InetSocketAddress epoint = (InetSocketAddress)endpoint;
         String destHost = epoint.isUnresolved() ? epoint.getHostName()
                                                 : epoint.getAddress().getHostAddress();
         final int destPort = epoint.getPort();
diff --git a/src/java.base/share/classes/java/net/Inet4Address.java b/src/java.base/share/classes/java/net/Inet4Address.java
index 1c0b47eef9ae7..8f5b50db8b569 100644
--- a/src/java.base/share/classes/java/net/Inet4Address.java
+++ b/src/java.base/share/classes/java/net/Inet4Address.java
@@ -352,8 +352,8 @@ public int hashCode() {
      * @see     java.net.InetAddress#getAddress()
      */
     public boolean equals(Object obj) {
-        return (obj != null) && (obj instanceof Inet4Address) &&
-            (((InetAddress)obj).holder().getAddress() == holder().getAddress());
+        return (obj instanceof Inet4Address inet4Address) &&
+            inet4Address.holder().getAddress() == holder().getAddress();
     }
 
     // Utilities
diff --git a/src/java.base/share/classes/java/net/Inet6Address.java b/src/java.base/share/classes/java/net/Inet6Address.java
index f00c9a47bdc4c..be34823d49fa6 100644
--- a/src/java.base/share/classes/java/net/Inet6Address.java
+++ b/src/java.base/share/classes/java/net/Inet6Address.java
@@ -878,12 +878,10 @@ public int hashCode() {
      */
     @Override
     public boolean equals(Object obj) {
-        if (obj == null || !(obj instanceof Inet6Address))
-            return false;
-
-        Inet6Address inetAddr = (Inet6Address)obj;
-
-        return holder6.equals(inetAddr.holder6);
+        if (obj instanceof Inet6Address inetAddr) {
+            return holder6.equals(inetAddr.holder6);
+        }
+        return false;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/net/InetSocketAddress.java b/src/java.base/share/classes/java/net/InetSocketAddress.java
index f9f475a6cc644..7eb0273448a76 100644
--- a/src/java.base/share/classes/java/net/InetSocketAddress.java
+++ b/src/java.base/share/classes/java/net/InetSocketAddress.java
@@ -119,9 +119,8 @@ public String toString() {
 
         @Override
         public final boolean equals(Object obj) {
-            if (obj == null || !(obj instanceof InetSocketAddressHolder))
+            if (!(obj instanceof InetSocketAddressHolder that))
                 return false;
-            InetSocketAddressHolder that = (InetSocketAddressHolder)obj;
             boolean sameIP;
             if (addr != null)
                 sameIP = addr.equals(that.addr);
@@ -409,9 +408,10 @@ public String toString() {
      */
     @Override
     public final boolean equals(Object obj) {
-        if (obj == null || !(obj instanceof InetSocketAddress))
-            return false;
-        return holder.equals(((InetSocketAddress) obj).holder);
+        if (obj instanceof InetSocketAddress addr) {
+            return holder.equals(addr.holder);
+        }
+        return false;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/net/NetMulticastSocket.java b/src/java.base/share/classes/java/net/NetMulticastSocket.java
index 4add390600a5c..86969a698daec 100644
--- a/src/java.base/share/classes/java/net/NetMulticastSocket.java
+++ b/src/java.base/share/classes/java/net/NetMulticastSocket.java
@@ -801,19 +801,19 @@ public void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf)
         if (isClosed())
             throw new SocketException("Socket is closed");
 
-        if (mcastaddr == null || !(mcastaddr instanceof InetSocketAddress))
+        if (!(mcastaddr instanceof InetSocketAddress addr))
             throw new IllegalArgumentException("Unsupported address type");
 
         if (oldImpl)
             throw new UnsupportedOperationException();
 
-        checkAddress(((InetSocketAddress)mcastaddr).getAddress(), "joinGroup");
+        checkAddress(addr.getAddress(), "joinGroup");
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
-            security.checkMulticast(((InetSocketAddress)mcastaddr).getAddress());
+            security.checkMulticast(addr.getAddress());
         }
 
-        if (!((InetSocketAddress)mcastaddr).getAddress().isMulticastAddress()) {
+        if (!addr.getAddress().isMulticastAddress()) {
             throw new SocketException("Not a multicast address");
         }
 
@@ -826,19 +826,19 @@ public void leaveGroup(SocketAddress mcastaddr, NetworkInterface netIf)
         if (isClosed())
             throw new SocketException("Socket is closed");
 
-        if (mcastaddr == null || !(mcastaddr instanceof InetSocketAddress))
+        if (!(mcastaddr instanceof InetSocketAddress addr))
             throw new IllegalArgumentException("Unsupported address type");
 
         if (oldImpl)
             throw new UnsupportedOperationException();
 
-        checkAddress(((InetSocketAddress)mcastaddr).getAddress(), "leaveGroup");
+        checkAddress(addr.getAddress(), "leaveGroup");
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
-            security.checkMulticast(((InetSocketAddress)mcastaddr).getAddress());
+            security.checkMulticast(addr.getAddress());
         }
 
-        if (!((InetSocketAddress)mcastaddr).getAddress().isMulticastAddress()) {
+        if (!addr.getAddress().isMulticastAddress()) {
             throw new SocketException("Not a multicast address");
         }
 
diff --git a/src/java.base/share/classes/java/net/Proxy.java b/src/java.base/share/classes/java/net/Proxy.java
index 63658aa82ffb5..eef964038b66c 100644
--- a/src/java.base/share/classes/java/net/Proxy.java
+++ b/src/java.base/share/classes/java/net/Proxy.java
@@ -146,9 +146,8 @@ public String toString() {
      * @see java.net.InetSocketAddress#equals(java.lang.Object)
      */
     public final boolean equals(Object obj) {
-        if (obj == null || !(obj instanceof Proxy))
+        if (!(obj instanceof Proxy p))
             return false;
-        Proxy p = (Proxy) obj;
         if (p.type() == type()) {
             if (address() == null) {
                 return (p.address() == null);
diff --git a/src/java.base/share/classes/java/net/SocksSocketImpl.java b/src/java.base/share/classes/java/net/SocksSocketImpl.java
index 46e117f4c11d1..88e6f0f612909 100644
--- a/src/java.base/share/classes/java/net/SocksSocketImpl.java
+++ b/src/java.base/share/classes/java/net/SocksSocketImpl.java
@@ -272,9 +272,8 @@ protected void connect(SocketAddress endpoint, int timeout) throws IOException {
         }
 
         SecurityManager security = System.getSecurityManager();
-        if (endpoint == null || !(endpoint instanceof InetSocketAddress))
+        if (!(endpoint instanceof InetSocketAddress epoint))
             throw new IllegalArgumentException("Unsupported address type");
-        InetSocketAddress epoint = (InetSocketAddress) endpoint;
         if (security != null) {
             if (epoint.isUnresolved())
                 security.checkConnect(epoint.getHostName(),
diff --git a/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java b/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java
index 01e625aca182b..f2f8fdfcaa735 100644
--- a/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java
+++ b/src/java.base/share/classes/java/nio/file/attribute/AclEntry.java
@@ -342,9 +342,8 @@ public Set<AclEntryFlag> flags() {
     public boolean equals(Object ob) {
         if (ob == this)
             return true;
-        if (ob == null || !(ob instanceof AclEntry))
+        if (!(ob instanceof AclEntry other))
             return false;
-        AclEntry other = (AclEntry)ob;
         if (this.type != other.type)
             return false;
         if (!this.who.equals(other.who))
diff --git a/src/java.base/share/classes/jdk/internal/misc/Signal.java b/src/java.base/share/classes/jdk/internal/misc/Signal.java
index 0002fdcde935a..6d6e590ce8b6b 100644
--- a/src/java.base/share/classes/jdk/internal/misc/Signal.java
+++ b/src/java.base/share/classes/jdk/internal/misc/Signal.java
@@ -95,18 +95,17 @@ public String getName() {
     /**
      * Compares the equality of two <code>Signal</code> objects.
      *
-     * @param other the object to compare with.
+     * @param obj the object to compare with.
      * @return whether two <code>Signal</code> objects are equal.
      */
-    public boolean equals(Object other) {
-        if (this == other) {
+    public boolean equals(Object obj) {
+        if (this == obj) {
             return true;
         }
-        if (other == null || !(other instanceof Signal)) {
-            return false;
+        if (obj instanceof Signal other) {
+            return name.equals(other.name) && (number == other.number);
         }
-        Signal other1 = (Signal)other;
-        return name.equals(other1.name) && (number == other1.number);
+        return false;
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java b/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java
index 7993b9d284d20..8db213fc0cba6 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/Negotiator.java
@@ -66,8 +66,8 @@ static Negotiator getNegotiator(HttpCallerInfo hci) {
         } catch (ReflectiveOperationException roe) {
             finest(roe);
             Throwable t = roe.getCause();
-            if (t != null && t instanceof Exception)
-                finest((Exception)t);
+            if (t instanceof Exception exception)
+                finest(exception);
             return null;
         }
     }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
index 59785590d020d..611a1ce5cd8b9 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
@@ -426,7 +426,7 @@ protected Socket createSocket() throws IOException {
             // unconnected sockets have not been implemented.
             //
             Throwable t = se.getCause();
-            if (t != null && t instanceof UnsupportedOperationException) {
+            if (t instanceof UnsupportedOperationException) {
                 return super.createSocket();
             } else {
                 throw se;
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
index 652252f8dde00..57a53b0f0f6ad 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
@@ -504,9 +504,9 @@ public void leaveGroup(InetAddress group) throws IOException {
      * @throws SocketException if group is not a multicast address
      */
     private static InetAddress checkGroup(SocketAddress mcastaddr) throws SocketException {
-        if (mcastaddr == null || !(mcastaddr instanceof InetSocketAddress))
+        if (!(mcastaddr instanceof InetSocketAddress addr))
             throw new IllegalArgumentException("Unsupported address type");
-        InetAddress group = ((InetSocketAddress) mcastaddr).getAddress();
+        InetAddress group = addr.getAddress();
         if (group == null)
             throw new IllegalArgumentException("Unresolved address");
         if (!group.isMulticastAddress())
diff --git a/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java b/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
index 13c365894c4b6..49c2fb6b8ed5b 100644
--- a/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
+++ b/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
@@ -149,8 +149,8 @@ public PollingWatchKey run() throws IOException {
                 });
         } catch (PrivilegedActionException pae) {
             Throwable cause = pae.getCause();
-            if (cause != null && cause instanceof IOException)
-                throw (IOException)cause;
+            if (cause instanceof IOException ioe)
+                throw ioe;
             throw new AssertionError(pae);
         }
     }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixPath.java b/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
index 92d71c5359116..8695e9ab1a1b2 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
@@ -762,8 +762,8 @@ public int compareTo(Path other) {
 
     @Override
     public boolean equals(Object ob) {
-        if ((ob != null) && (ob instanceof UnixPath)) {
-            return compareTo((Path)ob) == 0;
+        if (ob instanceof UnixPath path) {
+            return compareTo(path) == 0;
         }
         return false;
     }
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java b/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
index 5d4360e105605..4b6e9068f4842 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsPath.java
@@ -798,8 +798,8 @@ public int compareTo(Path obj) {
 
     @Override
     public boolean equals(Object obj) {
-        if ((obj != null) && (obj instanceof WindowsPath)) {
-            return compareTo((Path)obj) == 0;
+        if (obj instanceof WindowsPath path) {
+            return compareTo(path) == 0;
         }
         return false;
     }

From b6d51e15549e11be583625d908192d9f7f049489 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Tue, 12 Jan 2021 00:28:22 +0000
Subject: [PATCH 126/129] 8259585: Accessible actions do not work on mac os x

Reviewed-by: serb
---
 .../native/libawt_lwawt/awt/JavaAccessibilityAction.m      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m
index fd2ab6339b77f..84d31c9e573f1 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,8 @@ - (NSString *)getDescription
 {
     JNIEnv* env = [ThreadUtilities getJNIEnv];
     DECLARE_CLASS_RETURN(sjc_CAccessibility, "sun/lwawt/macosx/CAccessibility", nil);
-    DECLARE_METHOD_RETURN(jm_getAccessibleActionDescription, sjc_CAccessibility, "getAccessibleActionDescription",
+    DECLARE_STATIC_METHOD_RETURN(jm_getAccessibleActionDescription, sjc_CAccessibility,
+                          "getAccessibleActionDescription",
                           "(Ljavax/accessibility/AccessibleAction;ILjava/awt/Component;)Ljava/lang/String;", nil);
 
     jobject fCompLocal = (*env)->NewLocalRef(env, fComponent);
@@ -86,7 +87,7 @@ - (void)perform
 {
     JNIEnv* env = [ThreadUtilities getJNIEnv];
     DECLARE_CLASS(sjc_CAccessibility, "sun/lwawt/macosx/CAccessibility");
-    DECLARE_METHOD(jm_doAccessibleAction, sjc_CAccessibility, "doAccessibleAction",
+    DECLARE_STATIC_METHOD(jm_doAccessibleAction, sjc_CAccessibility, "doAccessibleAction",
                     "(Ljavax/accessibility/AccessibleAction;ILjava/awt/Component;)V");
 
     (*env)->CallStaticVoidMethod(env, sjc_CAccessibility, jm_doAccessibleAction,

From ae0532edc3df39f7c803cbeed87c9c8901a7d890 Mon Sep 17 00:00:00 2001
From: Wang Huang <whuang@openjdk.org>
Date: Tue, 12 Jan 2021 01:40:08 +0000
Subject: [PATCH 127/129] 8259044: JVM lacks data type qualifier when using
 -XX:+PrintAssembly with AArch64-Neon backend

Co-authored-by: He Xuejin <hexuejin2@huawei.com>
Reviewed-by: njian, aph
---
 src/hotspot/cpu/aarch64/aarch64_neon.ad    | 316 ++++++++++-----------
 src/hotspot/cpu/aarch64/aarch64_neon_ad.m4 |  78 ++---
 2 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_neon.ad b/src/hotspot/cpu/aarch64/aarch64_neon.ad
index 309ec4860679c..c3cae2f08029e 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_neon.ad
@@ -1702,7 +1702,7 @@ instruct vcmeq8B(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\t# vector cmp (8B)" %}
+  format %{ "cmeq  $dst, T8B, $src1, $src2\t# vector cmp (8B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T8B,
@@ -1717,7 +1717,7 @@ instruct vcmeq16B(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\t# vector cmp (16B)" %}
+  format %{ "cmeq  $dst, T16B, $src1, $src2\t# vector cmp (16B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T16B,
@@ -1732,7 +1732,7 @@ instruct vcmeq4S(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\t# vector cmp (4S)" %}
+  format %{ "cmeq  $dst, T4H, $src1, $src2\t# vector cmp (4S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T4H,
@@ -1747,7 +1747,7 @@ instruct vcmeq8S(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\t# vector cmp (8S)" %}
+  format %{ "cmeq  $dst, T8H, $src1, $src2\t# vector cmp (8S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T8H,
@@ -1762,7 +1762,7 @@ instruct vcmeq2I(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\t# vector cmp (2I)" %}
+  format %{ "cmeq  $dst, T2S, $src1, $src2\t# vector cmp (2I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T2S,
@@ -1777,7 +1777,7 @@ instruct vcmeq4I(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\t# vector cmp (4I)" %}
+  format %{ "cmeq  $dst, T4S, $src1, $src2\t# vector cmp (4I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T4S,
@@ -1792,7 +1792,7 @@ instruct vcmeq2L(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\t# vector cmp (2L)" %}
+  format %{ "cmeq  $dst, T2D, $src1, $src2\t# vector cmp (2L)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T2D,
@@ -1807,7 +1807,7 @@ instruct vcmeq2F(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmeq  $dst, $src1, $src2\t# vector cmp (2F)" %}
+  format %{ "fcmeq  $dst, T2S, $src1, $src2\t# vector cmp (2F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmeq(as_FloatRegister($dst$$reg), __ T2S,
@@ -1822,7 +1822,7 @@ instruct vcmeq4F(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmeq  $dst, $src1, $src2\t# vector cmp (4F)" %}
+  format %{ "fcmeq  $dst, T4S, $src1, $src2\t# vector cmp (4F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmeq(as_FloatRegister($dst$$reg), __ T4S,
@@ -1837,7 +1837,7 @@ instruct vcmeq2D(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::eq &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmeq  $dst, $src1, $src2\t# vector cmp (2D)" %}
+  format %{ "fcmeq  $dst, T2D, $src1, $src2\t# vector cmp (2D)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmeq(as_FloatRegister($dst$$reg), __ T2D,
@@ -1852,7 +1852,7 @@ instruct vcmgt8B(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src1, $src2\t# vector cmp (8B)" %}
+  format %{ "cmgt  $dst, T8B, $src1, $src2\t# vector cmp (8B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T8B,
@@ -1867,7 +1867,7 @@ instruct vcmgt16B(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src1, $src2\t# vector cmp (16B)" %}
+  format %{ "cmgt  $dst, T16B, $src1, $src2\t# vector cmp (16B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T16B,
@@ -1882,7 +1882,7 @@ instruct vcmgt4S(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src1, $src2\t# vector cmp (4S)" %}
+  format %{ "cmgt  $dst, T4H, $src1, $src2\t# vector cmp (4S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T4H,
@@ -1897,7 +1897,7 @@ instruct vcmgt8S(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src1, $src2\t# vector cmp (8S)" %}
+  format %{ "cmgt  $dst, T8H, $src1, $src2\t# vector cmp (8S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T8H,
@@ -1912,7 +1912,7 @@ instruct vcmgt2I(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src1, $src2\t# vector cmp (2I)" %}
+  format %{ "cmgt  $dst, T2S, $src1, $src2\t# vector cmp (2I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T2S,
@@ -1927,7 +1927,7 @@ instruct vcmgt4I(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src1, $src2\t# vector cmp (4I)" %}
+  format %{ "cmgt  $dst, T4S, $src1, $src2\t# vector cmp (4I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T4S,
@@ -1942,7 +1942,7 @@ instruct vcmgt2L(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src1, $src2\t# vector cmp (2L)" %}
+  format %{ "cmgt  $dst, T2D, $src1, $src2\t# vector cmp (2L)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T2D,
@@ -1957,7 +1957,7 @@ instruct vcmgt2F(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmgt  $dst, $src1, $src2\t# vector cmp (2F)" %}
+  format %{ "fcmgt  $dst, T2S, $src1, $src2\t# vector cmp (2F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmgt(as_FloatRegister($dst$$reg), __ T2S,
@@ -1972,7 +1972,7 @@ instruct vcmgt4F(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmgt  $dst, $src1, $src2\t# vector cmp (4F)" %}
+  format %{ "fcmgt  $dst, T4S, $src1, $src2\t# vector cmp (4F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmgt(as_FloatRegister($dst$$reg), __ T4S,
@@ -1987,7 +1987,7 @@ instruct vcmgt2D(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::gt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmgt  $dst, $src1, $src2\t# vector cmp (2D)" %}
+  format %{ "fcmgt  $dst, T2D, $src1, $src2\t# vector cmp (2D)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmgt(as_FloatRegister($dst$$reg), __ T2D,
@@ -2002,7 +2002,7 @@ instruct vcmge8B(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src1, $src2\t# vector cmp (8B)" %}
+  format %{ "cmge  $dst, T8B, $src1, $src2\t# vector cmp (8B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T8B,
@@ -2017,7 +2017,7 @@ instruct vcmge16B(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src1, $src2\t# vector cmp (16B)" %}
+  format %{ "cmge  $dst, T16B, $src1, $src2\t# vector cmp (16B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T16B,
@@ -2032,7 +2032,7 @@ instruct vcmge4S(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src1, $src2\t# vector cmp (4S)" %}
+  format %{ "cmge  $dst, T4H, $src1, $src2\t# vector cmp (4S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T4H,
@@ -2047,7 +2047,7 @@ instruct vcmge8S(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src1, $src2\t# vector cmp (8S)" %}
+  format %{ "cmge  $dst, T8H, $src1, $src2\t# vector cmp (8S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T8H,
@@ -2062,7 +2062,7 @@ instruct vcmge2I(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src1, $src2\t# vector cmp (2I)" %}
+  format %{ "cmge  $dst, T2S, $src1, $src2\t# vector cmp (2I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T2S,
@@ -2077,7 +2077,7 @@ instruct vcmge4I(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src1, $src2\t# vector cmp (4I)" %}
+  format %{ "cmge  $dst, T4S, $src1, $src2\t# vector cmp (4I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T4S,
@@ -2092,7 +2092,7 @@ instruct vcmge2L(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src1, $src2\t# vector cmp (2L)" %}
+  format %{ "cmge  $dst, T2D, $src1, $src2\t# vector cmp (2L)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T2D,
@@ -2107,7 +2107,7 @@ instruct vcmge2F(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmge  $dst, $src1, $src2\t# vector cmp (2F)" %}
+  format %{ "fcmge  $dst, T2S, $src1, $src2\t# vector cmp (2F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmge(as_FloatRegister($dst$$reg), __ T2S,
@@ -2122,7 +2122,7 @@ instruct vcmge4F(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmge  $dst, $src1, $src2\t# vector cmp (4F)" %}
+  format %{ "fcmge  $dst, T4S, $src1, $src2\t# vector cmp (4F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmge(as_FloatRegister($dst$$reg), __ T4S,
@@ -2137,7 +2137,7 @@ instruct vcmge2D(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ge &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmge  $dst, $src1, $src2\t# vector cmp (2D)" %}
+  format %{ "fcmge  $dst, T2D, $src1, $src2\t# vector cmp (2D)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmge(as_FloatRegister($dst$$reg), __ T2D,
@@ -2152,8 +2152,8 @@ instruct vcmne8B(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\n\t# vector cmp (8B)"
-            "not   $dst, $dst\t" %}
+  format %{ "cmeq  $dst, T8B, $src1, $src2\n\t# vector cmp (8B)"
+            "not   $dst, T8B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T8B,
@@ -2169,8 +2169,8 @@ instruct vcmne16B(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\n\t# vector cmp (16B)"
-            "not   $dst, $dst\t" %}
+  format %{ "cmeq  $dst, T16B, $src1, $src2\n\t# vector cmp (16B)"
+            "not   $dst, T16B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T16B,
@@ -2186,8 +2186,8 @@ instruct vcmne4S(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\n\t# vector cmp (4S)"
-            "not   $dst, $dst\t" %}
+  format %{ "cmeq  $dst, T4H, $src1, $src2\n\t# vector cmp (4S)"
+            "not   $dst, T8B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T4H,
@@ -2203,8 +2203,8 @@ instruct vcmne8S(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\n\t# vector cmp (8S)"
-            "not   $dst, $dst\t" %}
+  format %{ "cmeq  $dst, T8H, $src1, $src2\n\t# vector cmp (8S)"
+            "not   $dst, T16B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T8H,
@@ -2220,8 +2220,8 @@ instruct vcmne2I(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\n\t# vector cmp (2I)"
-            "not   $dst, $dst\t" %}
+  format %{ "cmeq  $dst, T2S, $src1, $src2\n\t# vector cmp (2I)"
+            "not   $dst, T8B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T2S,
@@ -2237,8 +2237,8 @@ instruct vcmne4I(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\n\t# vector cmp (4I)"
-            "not   $dst, $dst\t" %}
+  format %{ "cmeq  $dst, T4S, $src1, $src2\n\t# vector cmp (4I)"
+            "not   $dst, T16B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T4S,
@@ -2254,8 +2254,8 @@ instruct vcmne2L(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmeq  $dst, $src1, $src2\n\t# vector cmp (2L)"
-            "not   $dst, $dst\t" %}
+  format %{ "cmeq  $dst, T2D, $src1, $src2\n\t# vector cmp (2L)"
+            "not   $dst, T16B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmeq(as_FloatRegister($dst$$reg), __ T2D,
@@ -2271,8 +2271,8 @@ instruct vcmne2F(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmeq  $dst, $src1, $src2\n\t# vector cmp (2F)"
-            "not   $dst, $dst\t" %}
+  format %{ "fcmeq  $dst, T2S, $src1, $src2\n\t# vector cmp (2F)"
+            "not   $dst, T8B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmeq(as_FloatRegister($dst$$reg), __ T2S,
@@ -2288,8 +2288,8 @@ instruct vcmne4F(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmeq  $dst, $src1, $src2\n\t# vector cmp (4F)"
-            "not   $dst, $dst\t" %}
+  format %{ "fcmeq  $dst, T4S, $src1, $src2\n\t# vector cmp (4F)"
+            "not   $dst, T16B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmeq(as_FloatRegister($dst$$reg), __ T4S,
@@ -2305,8 +2305,8 @@ instruct vcmne2D(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmeq  $dst, $src1, $src2\n\t# vector cmp (2D)"
-            "not   $dst, $dst\t" %}
+  format %{ "fcmeq  $dst, T2D, $src1, $src2\n\t# vector cmp (2D)"
+            "not   $dst, T16B, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmeq(as_FloatRegister($dst$$reg), __ T2D,
@@ -2322,7 +2322,7 @@ instruct vcmlt8B(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src2, $src1\t# vector cmp (8B)" %}
+  format %{ "cmgt  $dst, T8B, $src2, $src1\t# vector cmp (8B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T8B,
@@ -2337,7 +2337,7 @@ instruct vcmlt16B(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src2, $src1\t# vector cmp (16B)" %}
+  format %{ "cmgt  $dst, T16B, $src2, $src1\t# vector cmp (16B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T16B,
@@ -2352,7 +2352,7 @@ instruct vcmlt4S(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src2, $src1\t# vector cmp (4S)" %}
+  format %{ "cmgt  $dst, T4H, $src2, $src1\t# vector cmp (4S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T4H,
@@ -2367,7 +2367,7 @@ instruct vcmlt8S(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src2, $src1\t# vector cmp (8S)" %}
+  format %{ "cmgt  $dst, T8H, $src2, $src1\t# vector cmp (8S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T8H,
@@ -2382,7 +2382,7 @@ instruct vcmlt2I(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src2, $src1\t# vector cmp (2I)" %}
+  format %{ "cmgt  $dst, T2S, $src2, $src1\t# vector cmp (2I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T2S,
@@ -2397,7 +2397,7 @@ instruct vcmlt4I(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src2, $src1\t# vector cmp (4I)" %}
+  format %{ "cmgt  $dst, T4S, $src2, $src1\t# vector cmp (4I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T4S,
@@ -2412,7 +2412,7 @@ instruct vcmlt2L(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmgt  $dst, $src2, $src1\t# vector cmp (2L)" %}
+  format %{ "cmgt  $dst, T2D, $src2, $src1\t# vector cmp (2L)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T2D,
@@ -2427,7 +2427,7 @@ instruct vcmlt2F(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmgt  $dst, $src2, $src1\t# vector cmp (2F)" %}
+  format %{ "fcmgt  $dst, T2S, $src2, $src1\t# vector cmp (2F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmgt(as_FloatRegister($dst$$reg), __ T2S,
@@ -2442,7 +2442,7 @@ instruct vcmlt4F(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmgt  $dst, $src2, $src1\t# vector cmp (4F)" %}
+  format %{ "fcmgt  $dst, T4S, $src2, $src1\t# vector cmp (4F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmgt(as_FloatRegister($dst$$reg), __ T4S,
@@ -2457,7 +2457,7 @@ instruct vcmlt2D(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::lt &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmgt  $dst, $src2, $src1\t# vector cmp (2D)" %}
+  format %{ "fcmgt  $dst, T2D, $src2, $src1\t# vector cmp (2D)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmgt(as_FloatRegister($dst$$reg), __ T2D,
@@ -2472,7 +2472,7 @@ instruct vcmle8B(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src2, $src1\t# vector cmp (8B)" %}
+  format %{ "cmge  $dst, T8B, $src2, $src1\t# vector cmp (8B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T8B,
@@ -2487,7 +2487,7 @@ instruct vcmle16B(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src2, $src1\t# vector cmp (16B)" %}
+  format %{ "cmge  $dst, T16B, $src2, $src1\t# vector cmp (16B)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T16B,
@@ -2502,7 +2502,7 @@ instruct vcmle4S(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src2, $src1\t# vector cmp (4S)" %}
+  format %{ "cmge  $dst, T4H, $src2, $src1\t# vector cmp (4S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T4H,
@@ -2517,7 +2517,7 @@ instruct vcmle8S(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src2, $src1\t# vector cmp (8S)" %}
+  format %{ "cmge  $dst, T8H, $src2, $src1\t# vector cmp (8S)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T8H,
@@ -2532,7 +2532,7 @@ instruct vcmle2I(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src2, $src1\t# vector cmp (2I)" %}
+  format %{ "cmge  $dst, T2S, $src2, $src1\t# vector cmp (2I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T2S,
@@ -2547,7 +2547,7 @@ instruct vcmle4I(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src2, $src1\t# vector cmp (4I)" %}
+  format %{ "cmge  $dst, T4S, $src2, $src1\t# vector cmp (4I)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T4S,
@@ -2562,7 +2562,7 @@ instruct vcmle2L(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "cmge  $dst, $src2, $src1\t# vector cmp (2L)" %}
+  format %{ "cmge  $dst, T2D, $src2, $src1\t# vector cmp (2L)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ cmge(as_FloatRegister($dst$$reg), __ T2D,
@@ -2577,7 +2577,7 @@ instruct vcmle2F(vecD dst, vecD src1, vecD src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmge  $dst, $src2, $src1\t# vector cmp (2F)" %}
+  format %{ "fcmge  $dst, T2S, $src2, $src1\t# vector cmp (2F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmge(as_FloatRegister($dst$$reg), __ T2S,
@@ -2592,7 +2592,7 @@ instruct vcmle4F(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmge  $dst, $src2, $src1\t# vector cmp (4F)" %}
+  format %{ "fcmge  $dst, T4S, $src2, $src1\t# vector cmp (4F)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmge(as_FloatRegister($dst$$reg), __ T4S,
@@ -2607,7 +2607,7 @@ instruct vcmle2D(vecX dst, vecX src1, vecX src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::le &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "fcmge  $dst, $src2, $src1\t# vector cmp (2D)" %}
+  format %{ "fcmge  $dst, T2D, $src2, $src1\t# vector cmp (2D)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ fcmge(as_FloatRegister($dst$$reg), __ T2D,
@@ -2655,7 +2655,7 @@ instruct vnot2I(vecD dst, vecD src, immI_M1 m1)
   match(Set dst (XorV src (ReplicateS m1)));
   match(Set dst (XorV src (ReplicateI m1)));
   ins_cost(INSN_COST);
-  format %{ "not  $dst, $src\t# vector (8B)" %}
+  format %{ "not  $dst, T8B, $src\t# vector (8B)" %}
   ins_encode %{
     __ notr(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($src$$reg));
@@ -2670,7 +2670,7 @@ instruct vnot4I(vecX dst, vecX src, immI_M1 m1)
   match(Set dst (XorV src (ReplicateS m1)));
   match(Set dst (XorV src (ReplicateI m1)));
   ins_cost(INSN_COST);
-  format %{ "not  $dst, $src\t# vector (16B)" %}
+  format %{ "not  $dst, T16B, $src\t# vector (16B)" %}
   ins_encode %{
     __ notr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($src$$reg));
@@ -2683,7 +2683,7 @@ instruct vnot2L(vecX dst, vecX src, immL_M1 m1)
   predicate(n->as_Vector()->length_in_bytes() == 16);
   match(Set dst (XorV src (ReplicateL m1)));
   ins_cost(INSN_COST);
-  format %{ "not  $dst, $src\t# vector (16B)" %}
+  format %{ "not  $dst, T16B, $src\t# vector (16B)" %}
   ins_encode %{
     __ notr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($src$$reg));
@@ -2699,7 +2699,7 @@ instruct vmax8B(vecD dst, vecD src1, vecD src2)
              n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (MaxV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "maxv  $dst, $src1, $src2\t# vector (8B)" %}
+  format %{ "maxv  $dst, T8B, $src1, $src2\t# vector (8B)" %}
   ins_encode %{
     __ maxv(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($src1$$reg),
@@ -2713,7 +2713,7 @@ instruct vmax16B(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 16 && n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (MaxV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "maxv  $dst, $src1, $src2\t# vector (16B)" %}
+  format %{ "maxv  $dst, T16B, $src1, $src2\t# vector (16B)" %}
   ins_encode %{
     __ maxv(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($src1$$reg),
@@ -2727,7 +2727,7 @@ instruct vmax4S(vecD dst, vecD src1, vecD src2)
   predicate(n->as_Vector()->length() == 4 && n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (MaxV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "maxv  $dst, $src1, $src2\t# vector (4S)" %}
+  format %{ "maxv  $dst, T4H, $src1, $src2\t# vector (4S)" %}
   ins_encode %{
     __ maxv(as_FloatRegister($dst$$reg), __ T4H,
             as_FloatRegister($src1$$reg),
@@ -2741,7 +2741,7 @@ instruct vmax8S(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 8 && n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (MaxV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "maxv  $dst, $src1, $src2\t# vector (8S)" %}
+  format %{ "maxv  $dst, T8H, $src1, $src2\t# vector (8S)" %}
   ins_encode %{
     __ maxv(as_FloatRegister($dst$$reg), __ T8H,
             as_FloatRegister($src1$$reg),
@@ -2755,7 +2755,7 @@ instruct vmax2I(vecD dst, vecD src1, vecD src2)
   predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (MaxV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "maxv  $dst, $src1, $src2\t# vector (2I)" %}
+  format %{ "maxv  $dst, T2S, $src1, $src2\t# vector (2I)" %}
   ins_encode %{
     __ maxv(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src1$$reg),
@@ -2769,7 +2769,7 @@ instruct vmax4I(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 4 && n->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (MaxV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "maxv  $dst, $src1, $src2\t# vector (4I)" %}
+  format %{ "maxv  $dst, T4S, $src1, $src2\t# vector (4I)" %}
   ins_encode %{
     __ maxv(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src1$$reg),
@@ -2784,7 +2784,7 @@ instruct vmin8B(vecD dst, vecD src1, vecD src2)
              n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (MinV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "minv  $dst, $src1, $src2\t# vector (8B)" %}
+  format %{ "minv  $dst, T8B, $src1, $src2\t# vector (8B)" %}
   ins_encode %{
     __ minv(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($src1$$reg),
@@ -2798,7 +2798,7 @@ instruct vmin16B(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 16 && n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (MinV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "minv  $dst, $src1, $src2\t# vector (16B)" %}
+  format %{ "minv  $dst, T16B, $src1, $src2\t# vector (16B)" %}
   ins_encode %{
     __ minv(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($src1$$reg),
@@ -2812,7 +2812,7 @@ instruct vmin4S(vecD dst, vecD src1, vecD src2)
   predicate(n->as_Vector()->length() == 4 && n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (MinV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "minv  $dst, $src1, $src2\t# vector (4S)" %}
+  format %{ "minv  $dst, T4H, $src1, $src2\t# vector (4S)" %}
   ins_encode %{
     __ minv(as_FloatRegister($dst$$reg), __ T4H,
             as_FloatRegister($src1$$reg),
@@ -2826,7 +2826,7 @@ instruct vmin8S(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 8 && n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (MinV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "minv  $dst, $src1, $src2\t# vector (8S)" %}
+  format %{ "minv  $dst, T8H, $src1, $src2\t# vector (8S)" %}
   ins_encode %{
     __ minv(as_FloatRegister($dst$$reg), __ T8H,
             as_FloatRegister($src1$$reg),
@@ -2840,7 +2840,7 @@ instruct vmin2I(vecD dst, vecD src1, vecD src2)
   predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (MinV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "minv  $dst, $src1, $src2\t# vector (2I)" %}
+  format %{ "minv  $dst, T2S, $src1, $src2\t# vector (2I)" %}
   ins_encode %{
     __ minv(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src1$$reg),
@@ -2854,7 +2854,7 @@ instruct vmin4I(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 4 && n->bottom_type()->is_vect()->element_basic_type() == T_INT);
   match(Set dst (MinV src1 src2));
   ins_cost(INSN_COST);
-  format %{ "minv  $dst, $src1, $src2\t# vector (4I)" %}
+  format %{ "minv  $dst, T4S, $src1, $src2\t# vector (4I)" %}
   ins_encode %{
     __ minv(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src1$$reg),
@@ -2870,8 +2870,8 @@ instruct vmax2L(vecX dst, vecX src1, vecX src2)
   match(Set dst (MaxV src1 src2));
   ins_cost(INSN_COST);
   effect(TEMP dst);
-  format %{ "cmgt  $dst, $src1, $src2\t# vector (2L)\n\t"
-            "bsl   $dst, $src1, $src2\t# vector (16B)" %}
+  format %{ "cmgt  $dst, T2D, $src1, $src2\t# vector (2L)\n\t"
+            "bsl   $dst, T16B, $src1, $src2\t# vector (16B)" %}
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
@@ -2887,8 +2887,8 @@ instruct vmin2L(vecX dst, vecX src1, vecX src2)
   match(Set dst (MinV src1 src2));
   ins_cost(INSN_COST);
   effect(TEMP dst);
-  format %{ "cmgt  $dst, $src1, $src2\t# vector (2L)\n\t"
-            "bsl   $dst, $src2, $src1\t# vector (16B)" %}
+  format %{ "cmgt  $dst, T2D, $src1, $src2\t# vector (2L)\n\t"
+            "bsl   $dst, T16B, $src2, $src1\t# vector (16B)" %}
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
@@ -2905,7 +2905,7 @@ instruct vbsl8B(vecD dst, vecD src1, vecD src2)
   predicate(n->as_Vector()->length_in_bytes() == 8);
   match(Set dst (VectorBlend (Binary src1 src2) dst));
   ins_cost(INSN_COST);
-  format %{ "bsl  $dst, $src2, $src1\t# vector (8B)" %}
+  format %{ "bsl  $dst, T8B, $src2, $src1\t# vector (8B)" %}
   ins_encode %{
     __ bsl(as_FloatRegister($dst$$reg), __ T8B,
            as_FloatRegister($src2$$reg), as_FloatRegister($src1$$reg));
@@ -2918,7 +2918,7 @@ instruct vbsl16B(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length_in_bytes() == 16);
   match(Set dst (VectorBlend (Binary src1 src2) dst));
   ins_cost(INSN_COST);
-  format %{ "bsl  $dst, $src2, $src1\t# vector (16B)" %}
+  format %{ "bsl  $dst, T16B, $src2, $src1\t# vector (16B)" %}
   ins_encode %{
     __ bsl(as_FloatRegister($dst$$reg), __ T16B,
            as_FloatRegister($src2$$reg), as_FloatRegister($src1$$reg));
@@ -2933,7 +2933,7 @@ instruct loadmask8B(vecD dst, vecD src  )
   predicate(n->as_Vector()->length() == 8 && n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorLoadMask src ));
   ins_cost(INSN_COST);
-  format %{ "negr  $dst, $src\t# load mask (8B to 8B)" %}
+  format %{ "negr  $dst, T8B, $src\t# load mask (8B to 8B)" %}
   ins_encode %{
     __ negr(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($src$$reg));
   %}
@@ -2945,7 +2945,7 @@ instruct loadmask16B(vecX dst, vecX src  )
   predicate(n->as_Vector()->length() == 16 && n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorLoadMask src ));
   ins_cost(INSN_COST);
-  format %{ "negr  $dst, $src\t# load mask (16B to 16B)" %}
+  format %{ "negr  $dst, T16B, $src\t# load mask (16B to 16B)" %}
   ins_encode %{
     __ negr(as_FloatRegister($dst$$reg), __ T16B, as_FloatRegister($src$$reg));
   %}
@@ -2957,7 +2957,7 @@ instruct storemask8B(vecD dst, vecD src , immI_1 size)
   predicate(n->as_Vector()->length() == 8);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "negr  $dst, $src\t# store mask (8B to 8B)" %}
+  format %{ "negr  $dst, T8B, $src\t# store mask (8B to 8B)" %}
   ins_encode %{
     __ negr(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($src$$reg));
   %}
@@ -2969,7 +2969,7 @@ instruct storemask16B(vecX dst, vecX src , immI_1 size)
   predicate(n->as_Vector()->length() == 16);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "negr  $dst, $src\t# store mask (16B to 16B)" %}
+  format %{ "negr  $dst, T16B, $src\t# store mask (16B to 16B)" %}
   ins_encode %{
     __ negr(as_FloatRegister($dst$$reg), __ T16B, as_FloatRegister($src$$reg));
   %}
@@ -2981,8 +2981,8 @@ instruct loadmask4S(vecD dst, vecD src  )
   predicate(n->as_Vector()->length() == 4 && n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorLoadMask src ));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\n\t"
-            "negr  $dst, $dst\t# load mask (4B to 4H)" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\n\t"
+            "negr  $dst, T8H, $dst\t# load mask (4B to 4H)" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ negr(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($dst$$reg));
@@ -2995,8 +2995,8 @@ instruct loadmask8S(vecX dst, vecD src  )
   predicate(n->as_Vector()->length() == 8 && n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorLoadMask src ));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\n\t"
-            "negr  $dst, $dst\t# load mask (8B to 8H)" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\n\t"
+            "negr  $dst, T8H, $dst\t# load mask (8B to 8H)" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ negr(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($dst$$reg));
@@ -3009,8 +3009,8 @@ instruct storemask4S(vecD dst, vecD src , immI_2 size)
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "xtn  $dst, $src\n\t"
-            "negr  $dst, $dst\t# store mask (4H to 4B)" %}
+  format %{ "xtn  $dst, T8B, $src, T8H\n\t"
+            "negr  $dst, T8B, $dst\t# store mask (4H to 4B)" %}
   ins_encode %{
     __ xtn(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($src$$reg), __ T8H);
     __ negr(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($dst$$reg));
@@ -3023,8 +3023,8 @@ instruct storemask8S(vecD dst, vecX src , immI_2 size)
   predicate(n->as_Vector()->length() == 8);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "xtn  $dst, $src\n\t"
-            "negr  $dst, $dst\t# store mask (8H to 8B)" %}
+  format %{ "xtn  $dst, T8B, $src, T8H\n\t"
+            "negr  $dst, T8B, $dst\t# store mask (8H to 8B)" %}
   ins_encode %{
     __ xtn(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($src$$reg), __ T8H);
     __ negr(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($dst$$reg));
@@ -3039,9 +3039,9 @@ instruct loadmask2I(vecD dst, vecD src  )
              n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT));
   match(Set dst (VectorLoadMask src ));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 2B to 2H\n\t"
-            "uxtl  $dst, $dst\t# 2H to 2S\n\t"
-            "negr   $dst, $dst\t# load mask (2B to 2S)" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 2B to 2H\n\t"
+            "uxtl  $dst, T4S, $dst, T4H\t# 2H to 2S\n\t"
+            "negr   $dst, T4S, $dst\t# load mask (2B to 2S)" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ uxtl(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($dst$$reg), __ T4H);
@@ -3057,9 +3057,9 @@ instruct loadmask4I(vecX dst, vecD src  )
              n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT));
   match(Set dst (VectorLoadMask src ));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 4B to 4H\n\t"
-            "uxtl  $dst, $dst\t# 4H to 4S\n\t"
-            "negr   $dst, $dst\t# load mask (4B to 4S)" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 4B to 4H\n\t"
+            "uxtl  $dst, T4S, $dst, T4H\t# 4H to 4S\n\t"
+            "negr   $dst, T4S, $dst\t# load mask (4B to 4S)" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ uxtl(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($dst$$reg), __ T4H);
@@ -3073,9 +3073,9 @@ instruct storemask2I(vecD dst, vecD src , immI_4 size)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "xtn  $dst, $src\t# 2S to 2H\n\t"
-            "xtn  $dst, $dst\t# 2H to 2B\n\t"
-            "negr   $dst, $dst\t# store mask (2S to 2B)" %}
+  format %{ "xtn  $dst, T4H, $src, T4S\t# 2S to 2H\n\t"
+            "xtn  $dst, T8B, $dst, T8H\t# 2H to 2B\n\t"
+            "negr   $dst, T8B, $dst\t# store mask (2S to 2B)" %}
   ins_encode %{
     __ xtn(as_FloatRegister($dst$$reg), __ T4H, as_FloatRegister($src$$reg), __ T4S);
     __ xtn(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($dst$$reg), __ T8H);
@@ -3089,9 +3089,9 @@ instruct storemask4I(vecD dst, vecX src , immI_4 size)
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "xtn  $dst, $src\t# 4S to 4H\n\t"
-            "xtn  $dst, $dst\t# 4H to 4B\n\t"
-            "negr   $dst, $dst\t# store mask (4S to 4B)" %}
+  format %{ "xtn  $dst, T4H, $src, T4S\t# 4S to 4H\n\t"
+            "xtn  $dst, T8B, $dst, T8H\t# 4H to 4B\n\t"
+            "negr   $dst, T8B, $dst\t# store mask (4S to 4B)" %}
   ins_encode %{
     __ xtn(as_FloatRegister($dst$$reg), __ T4H, as_FloatRegister($src$$reg), __ T4S);
     __ xtn(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($dst$$reg), __ T8H);
@@ -3107,10 +3107,10 @@ instruct loadmask2L(vecX dst, vecD src)
              n->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE));
   match(Set dst (VectorLoadMask src));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 2B to 2S\n\t"
-            "uxtl  $dst, $dst\t# 2S to 2I\n\t"
-            "uxtl  $dst, $dst\t# 2I to 2L\n\t"
-            "neg   $dst, $dst\t# load mask (2B to 2L)" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 2B to 2S\n\t"
+            "uxtl  $dst, T4S, $dst, T4H\t# 2S to 2I\n\t"
+            "uxtl  $dst, T2D, $dst, T2S\t# 2I to 2L\n\t"
+            "neg   $dst, T2D, $dst\t# load mask (2B to 2L)" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ uxtl(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($dst$$reg), __ T4H);
@@ -3125,10 +3125,10 @@ instruct storemask2L(vecD dst, vecX src, immI_8 size)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "xtn  $dst, $src\t# 2L to 2I\n\t"
-            "xtn  $dst, $dst\t# 2I to 2S\n\t"
-            "xtn  $dst, $dst\t# 2S to 2B\n\t"
-            "neg  $dst, $dst\t# store mask (2L to 2B)" %}
+  format %{ "xtn  $dst, T2S, $src, T2D\t# 2L to 2I\n\t"
+            "xtn  $dst, T4H, $dst, T4S\t# 2I to 2S\n\t"
+            "xtn  $dst, T8B, $dst, T8H\t# 2S to 2B\n\t"
+            "neg  $dst, T8B, $dst\t# store mask (2L to 2B)" %}
   ins_encode %{
     __ xtn(as_FloatRegister($dst$$reg), __ T2S, as_FloatRegister($src$$reg), __ T2D);
     __ xtn(as_FloatRegister($dst$$reg), __ T4H, as_FloatRegister($dst$$reg), __ T4S);
@@ -3176,7 +3176,7 @@ instruct loadshuffle8B(vecD dst, vecD src)
             n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "mov  $dst, $src\t# get 8B shuffle" %}
+  format %{ "mov  $dst, T8B, $src\t# get 8B shuffle" %}
   ins_encode %{
     __ orr(as_FloatRegister($dst$$reg), __ T8B,
            as_FloatRegister($src$$reg), as_FloatRegister($src$$reg));
@@ -3190,7 +3190,7 @@ instruct loadshuffle16B(vecX dst, vecX src)
             n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "mov  $dst, $src\t# get 16B shuffle" %}
+  format %{ "mov  $dst, T16B, $src\t# get 16B shuffle" %}
   ins_encode %{
     __ orr(as_FloatRegister($dst$$reg), __ T16B,
            as_FloatRegister($src$$reg), as_FloatRegister($src$$reg));
@@ -3204,7 +3204,7 @@ instruct loadshuffle4S(vecD dst, vecD src)
             n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 4B to 4H" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 4B to 4H" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
   %}
@@ -3217,7 +3217,7 @@ instruct loadshuffle8S(vecX dst, vecD src)
             n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 8B to 8H" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 8B to 8H" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
   %}
@@ -3231,8 +3231,8 @@ instruct loadshuffle4I(vecX dst, vecD src)
             n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT));
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 4B to 4H \n\t"
-            "uxtl  $dst, $dst\t# 4H to 4S" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 4B to 4H \n\t"
+            "uxtl  $dst, T4S, $dst, T4H\t# 4H to 4S" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ uxtl(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($dst$$reg), __ T4H);
@@ -3268,7 +3268,7 @@ instruct rearrange8B(vecD dst, vecD src, vecD shuffle)
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst);
-  format %{ "tbl $dst, {$dst}, $shuffle\t# rearrange 8B" %}
+  format %{ "tbl $dst, T8B, {$dst}, $shuffle\t# rearrange 8B" %}
   ins_encode %{
     __ tbl(as_FloatRegister($dst$$reg), __ T8B,
            as_FloatRegister($src$$reg), 1, as_FloatRegister($shuffle$$reg));
@@ -3283,7 +3283,7 @@ instruct rearrange16B(vecX dst, vecX src, vecX shuffle)
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst);
-  format %{ "tbl $dst, {$dst}, $shuffle\t# rearrange 16B" %}
+  format %{ "tbl $dst, T16B, {$dst}, $shuffle\t# rearrange 16B" %}
   ins_encode %{
     __ tbl(as_FloatRegister($dst$$reg), __ T16B,
            as_FloatRegister($src$$reg), 1, as_FloatRegister($shuffle$$reg));
@@ -3298,11 +3298,11 @@ instruct rearrange4S(vecD dst, vecD src, vecD shuffle, vecD tmp0, vecD tmp1)
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst, TEMP tmp0, TEMP tmp1);
-  format %{ "mov   $tmp0, CONSTANT\t# constant 0x0202020202020202\n\t"
-            "mov   $tmp1, CONSTANT\t# constant 0x0100010001000100\n\t"
-            "mulv  $dst, T4H, $shuffle, $tmp0\n\t"
-            "addv  $dst, T8B, $dst, $tmp1\n\t"
-            "tbl   $dst, {$src}, $dst\t# rearrange 4S" %}
+  format %{ "mov   $tmp0, T8B, CONSTANT\t# constant 0x0202020202020202\n\t"
+            "mov   $tmp1, T4H, CONSTANT\t# constant 0x0100010001000100\n\t"
+            "mulv  $dst, T4H, T4H, $shuffle, $tmp0\n\t"
+            "addv  $dst, T8B, T8B, $dst, $tmp1\n\t"
+            "tbl   $dst, T8B, {$src}, 1, $dst\t# rearrange 4S" %}
   ins_encode %{
     __ mov(as_FloatRegister($tmp0$$reg), __ T8B, 0x02);
     __ mov(as_FloatRegister($tmp1$$reg), __ T4H, 0x0100);
@@ -3323,11 +3323,11 @@ instruct rearrange8S(vecX dst, vecX src, vecX shuffle, vecX tmp0, vecX tmp1)
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst, TEMP tmp0, TEMP tmp1);
-  format %{ "mov   $tmp0, CONSTANT\t# constant 0x0202020202020202\n\t"
-            "mov   $tmp1, CONSTANT\t# constant 0x0100010001000100\n\t"
-            "mulv  $dst, T8H, $shuffle, $tmp0\n\t"
-            "addv  $dst, T16B, $dst, $tmp1\n\t"
-            "tbl   $dst, {$src}, $dst\t# rearrange 8S" %}
+  format %{ "mov   $tmp0, T16B, CONSTANT\t# constant 0x0202020202020202\n\t"
+            "mov   $tmp1, T8H, CONSTANT\t# constant 0x0100010001000100\n\t"
+            "mulv  $dst, T8H, T8H, $shuffle, $tmp0\n\t"
+            "addv  $dst, T16B, T16B, $dst, $tmp1\n\t"
+            "tbl   $dst, T16B, {$src}, 1, $dst\t# rearrange 8S" %}
   ins_encode %{
     __ mov(as_FloatRegister($tmp0$$reg), __ T16B, 0x02);
     __ mov(as_FloatRegister($tmp1$$reg), __ T8H, 0x0100);
@@ -3349,11 +3349,11 @@ instruct rearrange4I(vecX dst, vecX src, vecX shuffle, vecX tmp0, vecX tmp1)
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst, TEMP tmp0, TEMP tmp1);
-  format %{ "mov   $tmp0, CONSTANT\t# constant 0x0404040404040404\n\t"
-            "mov   $tmp1, CONSTANT\t# constant 0x0302010003020100\n\t"
-            "mulv  $dst, T8H, $shuffle, $tmp0\n\t"
+  format %{ "mov   $tmp0, T16B, CONSTANT\t# constant 0x0404040404040404\n\t"
+            "mov   $tmp1, T4S, CONSTANT\t# constant 0x0302010003020100\n\t"
+            "mulv  $dst, T4S, $shuffle, $tmp0\n\t"
             "addv  $dst, T16B, $dst, $tmp1\n\t"
-            "tbl   $dst, {$src}, $dst\t# rearrange 4I" %}
+            "tbl   $dst, T16B, {$src}, 1, $dst\t# rearrange 4I" %}
   ins_encode %{
     __ mov(as_FloatRegister($tmp0$$reg), __ T16B, 0x04);
     __ mov(as_FloatRegister($tmp1$$reg), __ T4S, 0x03020100);
@@ -3462,7 +3462,7 @@ instruct vabs8B(vecD dst, vecD src)
   predicate(n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8);
   match(Set dst (AbsVB src));
   ins_cost(INSN_COST);
-  format %{ "abs  $dst, $src\t# vector (8B)" %}
+  format %{ "abs  $dst, T8B, $src\t# vector (8B)" %}
   ins_encode %{
     __ absr(as_FloatRegister($dst$$reg), __ T8B, as_FloatRegister($src$$reg));
   %}
@@ -3474,7 +3474,7 @@ instruct vabs16B(vecX dst, vecX src)
   predicate(n->as_Vector()->length() == 16);
   match(Set dst (AbsVB src));
   ins_cost(INSN_COST);
-  format %{ "abs  $dst, $src\t# vector (16B)" %}
+  format %{ "abs  $dst, T16B, $src\t# vector (16B)" %}
   ins_encode %{
     __ absr(as_FloatRegister($dst$$reg), __ T16B, as_FloatRegister($src$$reg));
   %}
@@ -3486,7 +3486,7 @@ instruct vabs4S(vecD dst, vecD src)
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AbsVS src));
   ins_cost(INSN_COST);
-  format %{ "abs  $dst, $src\t# vector (4H)" %}
+  format %{ "abs  $dst, T4H, $src\t# vector (4H)" %}
   ins_encode %{
     __ absr(as_FloatRegister($dst$$reg), __ T4H, as_FloatRegister($src$$reg));
   %}
@@ -3498,7 +3498,7 @@ instruct vabs8S(vecX dst, vecX src)
   predicate(n->as_Vector()->length() == 8);
   match(Set dst (AbsVS src));
   ins_cost(INSN_COST);
-  format %{ "abs  $dst, $src\t# vector (8H)" %}
+  format %{ "abs  $dst, T8H, $src\t# vector (8H)" %}
   ins_encode %{
     __ absr(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg));
   %}
@@ -3510,7 +3510,7 @@ instruct vabs2I(vecD dst, vecD src)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AbsVI src));
   ins_cost(INSN_COST);
-  format %{ "abs  $dst, $src\t# vector (2S)" %}
+  format %{ "abs  $dst, T2S, $src\t# vector (2S)" %}
   ins_encode %{
     __ absr(as_FloatRegister($dst$$reg), __ T2S, as_FloatRegister($src$$reg));
   %}
@@ -3522,7 +3522,7 @@ instruct vabs4I(vecX dst, vecX src)
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AbsVI src));
   ins_cost(INSN_COST);
-  format %{ "abs  $dst, $src\t# vector (4S)" %}
+  format %{ "abs  $dst, T4S, $src\t# vector (4S)" %}
   ins_encode %{
     __ absr(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($src$$reg));
   %}
@@ -3534,7 +3534,7 @@ instruct vabs2L(vecX dst, vecX src)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AbsVL src));
   ins_cost(INSN_COST);
-  format %{ "abs  $dst, $src\t# vector (2D)" %}
+  format %{ "abs  $dst, T2D, $src\t# vector (2D)" %}
   ins_encode %{
     __ absr(as_FloatRegister($dst$$reg), __ T2D, as_FloatRegister($src$$reg));
   %}
@@ -3546,7 +3546,7 @@ instruct vabs2F(vecD dst, vecD src)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AbsVF src));
   ins_cost(INSN_COST * 3);
-  format %{ "fabs  $dst, $src\t# vector (2S)" %}
+  format %{ "fabs  $dst, T2S, $src\t# vector (2S)" %}
   ins_encode %{
     __ fabs(as_FloatRegister($dst$$reg), __ T2S, as_FloatRegister($src$$reg));
   %}
@@ -3558,7 +3558,7 @@ instruct vabs4F(vecX dst, vecX src)
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AbsVF src));
   ins_cost(INSN_COST * 3);
-  format %{ "fabs  $dst, $src\t# vector (4S)" %}
+  format %{ "fabs  $dst, T4S, $src\t# vector (4S)" %}
   ins_encode %{
     __ fabs(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($src$$reg));
   %}
@@ -3570,7 +3570,7 @@ instruct vabs2D(vecX dst, vecX src)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AbsVD src));
   ins_cost(INSN_COST * 3);
-  format %{ "fabs  $dst, $src\t# vector (2D)" %}
+  format %{ "fabs  $dst, T2D, $src\t# vector (2D)" %}
   ins_encode %{
     __ fabs(as_FloatRegister($dst$$reg), __ T2D, as_FloatRegister($src$$reg));
   %}
@@ -3584,7 +3584,7 @@ instruct vabd2F(vecD dst, vecD src1, vecD src2)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AbsVF (SubVF src1 src2)));
   ins_cost(INSN_COST * 3);
-  format %{ "fabd  $dst, $src1, $src2\t# vector (2S)" %}
+  format %{ "fabd  $dst, T2S, $src1, $src2\t# vector (2S)" %}
   ins_encode %{
     __ fabd(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
@@ -3597,7 +3597,7 @@ instruct vabd4F(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AbsVF (SubVF src1 src2)));
   ins_cost(INSN_COST * 3);
-  format %{ "fabd  $dst, $src1, $src2\t# vector (4S)" %}
+  format %{ "fabd  $dst, T4S, $src1, $src2\t# vector (4S)" %}
   ins_encode %{
     __ fabd(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
@@ -3610,7 +3610,7 @@ instruct vabd2D(vecX dst, vecX src1, vecX src2)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AbsVD (SubVD src1 src2)));
   ins_cost(INSN_COST * 3);
-  format %{ "fabd  $dst, $src1, $src2\t# vector (2D)" %}
+  format %{ "fabd  $dst, T2D, $src1, $src2\t# vector (2D)" %}
   ins_encode %{
     __ fabd(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
diff --git a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
index 9ac9bad3dc87a..634376e875d66 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
@@ -836,7 +836,7 @@ instruct vcm$1$2$3`'(vec$4 dst, vec$4 src1, vec$4 src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::$1 &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_`'TYPE2DATATYPE($3));
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "$6cm$1  $dst, $src1, $src2\t# vector cmp ($2$3)" %}
+  format %{ "$6cm$1  $dst, T$2$5, $src1, $src2\t# vector cmp ($2$3)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ $6cm$1(as_FloatRegister($dst$$reg), __ T$2$5,
@@ -883,8 +883,8 @@ instruct vcmne$1$2`'(vec$3 dst, vec$3 src1, vec$3 src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::ne &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_`'TYPE2DATATYPE($2));
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "$5cmeq  $dst, $src1, $src2\n\t# vector cmp ($1$2)"
-            "not   $dst, $dst\t" %}
+  format %{ "$5cmeq  $dst, T$1$4, $src1, $src2\n\t# vector cmp ($1$2)"
+            "not   $dst, T$6, $dst\t" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ $5cmeq(as_FloatRegister($dst$$reg), __ T$1$4,
@@ -912,7 +912,7 @@ instruct vcm$1$2$3`'(vec$4 dst, vec$4 src1, vec$4 src2, immI cond)
             n->as_VectorMaskCmp()->get_predicate() == BoolTest::$1 &&
             n->in(1)->in(1)->bottom_type()->is_vect()->element_basic_type() == T_`'TYPE2DATATYPE($3));
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  format %{ "$6cm$7  $dst, $src2, $src1\t# vector cmp ($2$3)" %}
+  format %{ "$6cm$7  $dst, T$2$5, $src2, $src1\t# vector cmp ($2$3)" %}
   ins_cost(INSN_COST);
   ins_encode %{
     __ $6cm$7(as_FloatRegister($dst$$reg), __ T$2$5,
@@ -987,7 +987,7 @@ instruct vnot$1$2`'(vec$3 dst, vec$3 src, imm$2_M1 m1)
   predicate(n->as_Vector()->length_in_bytes() == $4);
   MATCH_RULE($2)
   ins_cost(INSN_COST);
-  format %{ "not  $dst, $src\t# vector ($5)" %}
+  format %{ "not  $dst, T$5, $src\t# vector ($5)" %}
   ins_encode %{
     __ notr(as_FloatRegister($dst$$reg), __ T$5,
             as_FloatRegister($src$$reg));
@@ -1013,7 +1013,7 @@ instruct v$1$2$3`'(vec$4 dst, vec$4 src1, vec$4 src2)
   PREDICATE(`$2$3', $2, TYPE2DATATYPE($3))
   match(Set dst ($5V src1 src2));
   ins_cost(INSN_COST);
-  format %{ "$1v  $dst, $src1, $src2\t# vector ($2$3)" %}
+  format %{ "$1v  $dst, T$2`'iTYPE2SIMD($3), $src1, $src2\t# vector ($2$3)" %}
   ins_encode %{
     __ $1v(as_FloatRegister($dst$$reg), __ T$2`'iTYPE2SIMD($3),
             as_FloatRegister($src1$$reg),
@@ -1043,8 +1043,8 @@ instruct v$1`'2L`'(vecX dst, vecX src1, vecX src2)
   match(Set dst ($2V src1 src2));
   ins_cost(INSN_COST);
   effect(TEMP dst);
-  format %{ "cmgt  $dst, $src1, $src2\t# vector (2L)\n\t"
-            "bsl   $dst, $$3, $$4\t# vector (16B)" %}
+  format %{ "cmgt  $dst, T2D, $src1, $src2\t# vector (2L)\n\t"
+            "bsl   $dst, T16B, $$3, $$4\t# vector (16B)" %}
   ins_encode %{
     __ cmgt(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
@@ -1066,7 +1066,7 @@ instruct vbsl$1B`'(vec$2 dst, vec$2 src1, vec$2 src2)
   predicate(n->as_Vector()->length_in_bytes() == $1);
   match(Set dst (VectorBlend (Binary src1 src2) dst));
   ins_cost(INSN_COST);
-  format %{ "bsl  $dst, $src2, $src1\t# vector ($1B)" %}
+  format %{ "bsl  $dst, T$1B, $src2, $src1\t# vector ($1B)" %}
   ins_encode %{
     __ bsl(as_FloatRegister($dst$$reg), __ T$1B,
            as_FloatRegister($src2$$reg), as_FloatRegister($src1$$reg));
@@ -1090,7 +1090,7 @@ instruct $1mask$2B`'(vec$3 dst, vec$3 src $5 $6)
   PREDICATE($1, $2)
   match(Set dst (Vector$4Mask src $6));
   ins_cost(INSN_COST);
-  format %{ "negr  $dst, $src\t# $1 mask ($2B to $2B)" %}
+  format %{ "negr  $dst, T$2B, $src\t# $1 mask ($2B to $2B)" %}
   ins_encode %{
     __ negr(as_FloatRegister($dst$$reg), __ T$2B, as_FloatRegister($src$$reg));
   %}
@@ -1113,8 +1113,8 @@ instruct $1mask$2S`'(vec$3 dst, vec$4 src $9 $10)
   PREDICATE($1, $2)
   match(Set dst (Vector$5Mask src $10));
   ins_cost(INSN_COST);
-  format %{ "$6  $dst, $src\n\t"
-            "negr  $dst, $dst\t# $1 mask ($2$7 to $2$8)" %}
+  format %{ "$6  $dst, T8$8, $src, T8$7\n\t"
+            "negr  $dst, T8$8, $dst\t# $1 mask ($2$7 to $2$8)" %}
   ins_encode %{
     __ $6(as_FloatRegister($dst$$reg), __ T8$8, as_FloatRegister($src$$reg), __ T8$7);
     __ negr(as_FloatRegister($dst$$reg), __ T8$8, as_FloatRegister($dst$$reg));
@@ -1140,9 +1140,9 @@ instruct $1mask$2I`'(vec$3 dst, vec$4 src $12 $13)
   PREDICATE($1, $2)
   match(Set dst (Vector$5Mask src $13));
   ins_cost(INSN_COST);
-  format %{ "$6  $dst, $src\t# $2$7 to $2$8\n\t"
-            "$6  $dst, $dst\t# $2$8 to $2$9\n\t"
-            "negr   $dst, $dst\t# $1 mask ($2$7 to $2$9)" %}
+  format %{ "$6  $dst, T$10$8, $src, T$10$7\t# $2$7 to $2$8\n\t"
+            "$6  $dst, T$11$9, $dst, T$11$8\t# $2$8 to $2$9\n\t"
+            "negr   $dst, T$11$9, $dst\t# $1 mask ($2$7 to $2$9)" %}
   ins_encode %{
     __ $6(as_FloatRegister($dst$$reg), __ T$10$8, as_FloatRegister($src$$reg), __ T$10$7);
     __ $6(as_FloatRegister($dst$$reg), __ T$11$9, as_FloatRegister($dst$$reg), __ T$11$8);
@@ -1164,10 +1164,10 @@ instruct loadmask2L(vecX dst, vecD src)
              n->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE));
   match(Set dst (VectorLoadMask src));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 2B to 2S\n\t"
-            "uxtl  $dst, $dst\t# 2S to 2I\n\t"
-            "uxtl  $dst, $dst\t# 2I to 2L\n\t"
-            "neg   $dst, $dst\t# load mask (2B to 2L)" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 2B to 2S\n\t"
+            "uxtl  $dst, T4S, $dst, T4H\t# 2S to 2I\n\t"
+            "uxtl  $dst, T2D, $dst, T2S\t# 2I to 2L\n\t"
+            "neg   $dst, T2D, $dst\t# load mask (2B to 2L)" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ uxtl(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($dst$$reg), __ T4H);
@@ -1182,10 +1182,10 @@ instruct storemask2L(vecD dst, vecX src, immI_8 size)
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (VectorStoreMask src size));
   ins_cost(INSN_COST);
-  format %{ "xtn  $dst, $src\t# 2L to 2I\n\t"
-            "xtn  $dst, $dst\t# 2I to 2S\n\t"
-            "xtn  $dst, $dst\t# 2S to 2B\n\t"
-            "neg  $dst, $dst\t# store mask (2L to 2B)" %}
+  format %{ "xtn  $dst, T2S, $src, T2D\t# 2L to 2I\n\t"
+            "xtn  $dst, T4H, $dst, T4S\t# 2I to 2S\n\t"
+            "xtn  $dst, T8B, $dst, T8H\t# 2S to 2B\n\t"
+            "neg  $dst, T8B, $dst\t# store mask (2L to 2B)" %}
   ins_encode %{
     __ xtn(as_FloatRegister($dst$$reg), __ T2S, as_FloatRegister($src$$reg), __ T2D);
     __ xtn(as_FloatRegister($dst$$reg), __ T4H, as_FloatRegister($dst$$reg), __ T4S);
@@ -1230,7 +1230,7 @@ instruct loadshuffle$1B`'(vec$2 dst, vec$2 src)
             n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "mov  $dst, $src\t# get $1B shuffle" %}
+  format %{ "mov  $dst, T$1B, $src\t# get $1B shuffle" %}
   ins_encode %{
     __ orr(as_FloatRegister($dst$$reg), __ T$1B,
            as_FloatRegister($src$$reg), as_FloatRegister($src$$reg));
@@ -1248,7 +1248,7 @@ instruct loadshuffle$1S`'(vec$2 dst, vec$3 src)
             n->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# $1B to $1H" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# $1B to $1H" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
   %}
@@ -1266,8 +1266,8 @@ instruct loadshuffle4I(vecX dst, vecD src)
             n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT));
   match(Set dst (VectorLoadShuffle src));
   ins_cost(INSN_COST);
-  format %{ "uxtl  $dst, $src\t# 4B to 4H \n\t"
-            "uxtl  $dst, $dst\t# 4H to 4S" %}
+  format %{ "uxtl  $dst, T8H, $src, T8B\t# 4B to 4H \n\t"
+            "uxtl  $dst, T4S, $dst, T4H\t# 4H to 4S" %}
   ins_encode %{
     __ uxtl(as_FloatRegister($dst$$reg), __ T8H, as_FloatRegister($src$$reg), __ T8B);
     __ uxtl(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($dst$$reg), __ T4H);
@@ -1303,7 +1303,7 @@ instruct rearrange$1B`'(vec$2 dst, vec$2 src, vec$2 shuffle)
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst);
-  format %{ "tbl $dst, {$dst}, $shuffle\t# rearrange $1B" %}
+  format %{ "tbl $dst, T$1B, {$dst}, $shuffle\t# rearrange $1B" %}
   ins_encode %{
     __ tbl(as_FloatRegister($dst$$reg), __ T$1B,
            as_FloatRegister($src$$reg), 1, as_FloatRegister($shuffle$$reg));
@@ -1322,11 +1322,11 @@ instruct rearrange$1S`'(vec$2 dst, vec$2 src, vec$2 shuffle, vec$2 tmp0, vec$2 t
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst, TEMP tmp0, TEMP tmp1);
-  format %{ "mov   $tmp0, CONSTANT\t# constant 0x0202020202020202\n\t"
-            "mov   $tmp1, CONSTANT\t# constant 0x0100010001000100\n\t"
-            "mulv  $dst, T$1H, $shuffle, $tmp0\n\t"
-            "addv  $dst, T$3B, $dst, $tmp1\n\t"
-            "tbl   $dst, {$src}, $dst\t# rearrange $1S" %}
+  format %{ "mov   $tmp0, T$3B, CONSTANT\t# constant 0x0202020202020202\n\t"
+            "mov   $tmp1, T$1H, CONSTANT\t# constant 0x0100010001000100\n\t"
+            "mulv  $dst, T$1H, T$1H, $shuffle, $tmp0\n\t"
+            "addv  $dst, T$3B, T$3B, $dst, $tmp1\n\t"
+            "tbl   $dst, T$3B, {$src}, 1, $dst\t# rearrange $1S" %}
   ins_encode %{
     __ mov(as_FloatRegister($tmp0$$reg), __ T$3B, 0x02);
     __ mov(as_FloatRegister($tmp1$$reg), __ T$1H, 0x0100);
@@ -1351,11 +1351,11 @@ instruct rearrange4I(vecX dst, vecX src, vecX shuffle, vecX tmp0, vecX tmp1)
   match(Set dst (VectorRearrange src shuffle));
   ins_cost(INSN_COST);
   effect(TEMP_DEF dst, TEMP tmp0, TEMP tmp1);
-  format %{ "mov   $tmp0, CONSTANT\t# constant 0x0404040404040404\n\t"
-            "mov   $tmp1, CONSTANT\t# constant 0x0302010003020100\n\t"
-            "mulv  $dst, T8H, $shuffle, $tmp0\n\t"
+  format %{ "mov   $tmp0, T16B, CONSTANT\t# constant 0x0404040404040404\n\t"
+            "mov   $tmp1, T4S, CONSTANT\t# constant 0x0302010003020100\n\t"
+            "mulv  $dst, T4S, $shuffle, $tmp0\n\t"
             "addv  $dst, T16B, $dst, $tmp1\n\t"
-            "tbl   $dst, {$src}, $dst\t# rearrange 4I" %}
+            "tbl   $dst, T16B, {$src}, 1, $dst\t# rearrange 4I" %}
   ins_encode %{
     __ mov(as_FloatRegister($tmp0$$reg), __ T16B, 0x04);
     __ mov(as_FloatRegister($tmp1$$reg), __ T4S, 0x03020100);
@@ -1430,7 +1430,7 @@ instruct vabs$3$4`'(vec$5 dst, vec$5 src)
   predicate(ifelse($3$4, 8B, n->as_Vector()->length() == 4 || )n->as_Vector()->length() == $3);
   match(Set dst (AbsV$4 src));
   ins_cost(ifelse($4, F, INSN_COST * 3, $4, D, INSN_COST * 3, INSN_COST));
-  format %{ "$1  $dst, $src\t# vector ($3$6)" %}
+  format %{ "$1  $dst, T$3$6, $src\t# vector ($3$6)" %}
   ins_encode %{
     __ $2(as_FloatRegister($dst$$reg), __ T$3$6, as_FloatRegister($src$$reg));
   %}
@@ -1456,7 +1456,7 @@ instruct vabd$3$4`'(vec$5 dst, vec$5 src1, vec$5 src2)
   predicate(n->as_Vector()->length() == $3);
   match(Set dst (AbsV$4 (SubV$4 src1 src2)));
   ins_cost(INSN_COST * 3);
-  format %{ "$1  $dst, $src1, $src2\t# vector ($3$6)" %}
+  format %{ "$1  $dst, T$3$6, $src1, $src2\t# vector ($3$6)" %}
   ins_encode %{
     __ $2(as_FloatRegister($dst$$reg), __ T$3$6,
             as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));

From 2255ab76034d1e67ac7ddaf4d1cee71e29c9cd43 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 12 Jan 2021 03:38:54 +0000
Subject: [PATCH 128/129] 8258810: Improve enum traits

Reviewed-by: ayang, iklam, lfoltan
---
 src/hotspot/share/utilities/enumIterator.hpp  | 85 +++++++++++++------
 .../gtest/utilities/test_enumIterator.cpp     | 41 ++++++++-
 2 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/src/hotspot/share/utilities/enumIterator.hpp b/src/hotspot/share/utilities/enumIterator.hpp
index b2dfa2a201cb8..6fa7f071f4a27 100644
--- a/src/hotspot/share/utilities/enumIterator.hpp
+++ b/src/hotspot/share/utilities/enumIterator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include <limits>
 #include "memory/allStatic.hpp"
 #include "metaprogramming/enableIf.hpp"
+#include "metaprogramming/primitiveConversions.hpp"
 #include "utilities/debug.hpp"
 
 // Iteration support for enums.
@@ -115,8 +116,9 @@ struct EnumeratorRangeImpl : AllStatic {
                          EnumeratorRangeImpl::start_value<T>(First),    \
                          EnumeratorRangeImpl::end_value<T>(Last));
 
-// A helper class for EnumRange and EnumIterator, computing some
-// additional information based on T and EnumeratorRange<T>.
+// An internal helper class for EnumRange and EnumIterator, computing some
+// additional information based on T and EnumeratorRange<T>, and performing
+// or supporting various validity checks.
 template<typename T>
 class EnumIterationTraits : AllStatic {
   using RangeType = EnumeratorRange<T>;
@@ -131,14 +133,29 @@ class EnumIterationTraits : AllStatic {
   // The one-past-the-end value for T.
   static constexpr Underlying _end = RangeType::_end;
 
-  // The first enumerator of T.
-  static constexpr T _first = static_cast<T>(_start);
-
-  // The last enumerator of T.
-  static constexpr T _last = static_cast<T>(_end - 1);
-
   static_assert(_start != _end, "empty range");
   static_assert(_start <= _end, "invalid range"); // <= so only one failure when ==.
+
+  // Verify value is in [start, end].
+  // The values for start and end default to _start and _end, respectively.
+  // The (deduced) type V is expected to be either T or Underlying.
+  template<typename V>
+  static constexpr void assert_in_range(V value,
+                                        V start = PrimitiveConversions::cast<V>(_start),
+                                        V end = PrimitiveConversions::cast<V>(_end)) {
+    assert(start <= value, "out of range");
+    assert(value <= end, "out of range");
+  }
+
+  // Convert an enumerator value to the corresponding underlying type.
+  static constexpr Underlying underlying_value(T value) {
+    return static_cast<Underlying>(value);
+  }
+
+  // Convert a value to the corresponding enumerator.
+  static constexpr T enumerator(Underlying value) {
+    return static_cast<T>(value);
+  }
 };
 
 template<typename T>
@@ -160,10 +177,9 @@ class EnumIterator {
 
   // Return an iterator with the indicated value.
   constexpr explicit EnumIterator(T value) :
-    _value(static_cast<Underlying>(value))
+    _value(Traits::underlying_value(value))
   {
-    assert(_value >= Traits::_start, "out of range");
-    assert(_value <= Traits::_end, "out of range");
+    Traits::assert_in_range(value);
   }
 
   // True if the iterators designate the same enumeration value.
@@ -180,7 +196,7 @@ class EnumIterator {
   // precondition: this is not beyond the last enumerator.
   constexpr T operator*() const {
     assert_in_bounds();
-    return static_cast<T>(_value);
+    return Traits::enumerator(_value);
   }
 
   // Step this iterator to the next value.
@@ -209,52 +225,67 @@ class EnumRange {
   Underlying _start;
   Underlying _end;
 
+  constexpr void assert_not_empty() const {
+    assert(size() > 0, "empty range");
+  }
+
 public:
   using EnumType = T;
   using Iterator = EnumIterator<T>;
 
   // Default constructor gives the full range.
   constexpr EnumRange() :
-    EnumRange(Traits::_first) {}
+    EnumRange(Traits::enumerator(Traits::_start)) {}
 
   // Range from start to the (exclusive) end of the enumerator range.
   constexpr explicit EnumRange(T start) :
-    EnumRange(start, static_cast<T>(Traits::_end)) {}
+    EnumRange(start, Traits::enumerator(Traits::_end)) {}
 
   // Range from start (inclusive) to end (exclusive).
   // precondition: start <= end.
   constexpr EnumRange(T start, T end) :
-    _start(static_cast<Underlying>(start)),
-    _end(static_cast<Underlying>(end))
+    _start(Traits::underlying_value(start)),
+    _end(Traits::underlying_value(end))
   {
-    assert(Traits::_start <= _start, "out of range");
-    assert(_end <= Traits::_end, "out of range");
-    assert(_start <= _end, "invalid range");
+    Traits::assert_in_range(start);
+    Traits::assert_in_range(end);
+    assert(start <= end, "invalid range");
   }
 
   // Return an iterator for the start of the range.
   constexpr Iterator begin() const {
-    return Iterator(static_cast<T>(_start));
+    return Iterator(Traits::enumerator(_start));
   }
 
   // Return an iterator for the end of the range.
   constexpr Iterator end() const {
-    return Iterator(static_cast<T>(_end));
+    return Iterator(Traits::enumerator(_end));
   }
 
+  // Return the number of enumerator values in the range.
   constexpr size_t size() const {
     return static_cast<size_t>(_end - _start); // _end is exclusive
   }
 
-  constexpr T first() const { return static_cast<T>(_start); }
-  constexpr T last() const { return static_cast<T>(_end - 1); }
+  // Return the first enumerator in the range.
+  // precondition: size() > 0
+  constexpr T first() const {
+    assert_not_empty();
+    return Traits::enumerator(_start);
+  }
+
+  // Return the last enumerator in the range.
+  // precondition: size() > 0
+  constexpr T last() const {
+    assert_not_empty();
+    return Traits::enumerator(_end - 1);
+  }
 
   // Convert value to a zero-based index into the range [first(), last()].
   // precondition: first() <= value && value <= last()
   constexpr size_t index(T value) const {
-    assert(first() <= value, "out of bounds");
-    assert(value <= last(), "out of bounds");
-    return static_cast<size_t>(static_cast<Underlying>(value) - _start);
+    Traits::assert_in_range(value, first(), last());
+    return static_cast<size_t>(Traits::underlying_value(value) - _start);
   }
 };
 
diff --git a/test/hotspot/gtest/utilities/test_enumIterator.cpp b/test/hotspot/gtest/utilities/test_enumIterator.cpp
index bf8d0417bf2ca..4d7be67865a8d 100644
--- a/test/hotspot/gtest/utilities/test_enumIterator.cpp
+++ b/test/hotspot/gtest/utilities/test_enumIterator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -178,3 +178,42 @@ TEST(TestEnumIterator, implicit_range_based_for_loop_start_end) {
     ++i;
   }
 }
+
+#ifdef ASSERT
+
+static volatile ExplicitTest empty_range_value = ExplicitTest::value1;
+static volatile size_t empty_range_index =
+  EnumRange<ExplicitTest>().index(empty_range_value);
+
+TEST_VM_ASSERT(TestEnumIterator, empty_range_first) {
+  constexpr ExplicitTest start = ExplicitTest::value2;
+  EXPECT_FALSE(empty_range_value == EnumRange<ExplicitTest>(start, start).first());
+}
+
+TEST_VM_ASSERT(TestEnumIterator, empty_range_last) {
+  constexpr ExplicitTest start = ExplicitTest::value2;
+  EXPECT_FALSE(empty_range_value == EnumRange<ExplicitTest>(start, start).last());
+}
+
+TEST_VM_ASSERT(TestEnumIterator, empty_range_index) {
+  constexpr ExplicitTest start = ExplicitTest::value2;
+  EXPECT_FALSE(empty_range_index == EnumRange<ExplicitTest>(start, start).index(start));
+}
+
+TEST_VM_ASSERT(TestEnumIterator, end_iterator_dereference) {
+  EXPECT_FALSE(empty_range_value == *(EnumRange<ExplicitTest>().end()));
+}
+
+const int invalid_implicit_int = implicit_start - 1;
+static volatile ImplicitTest invalid_implicit_value =
+  static_cast<ImplicitTest>(invalid_implicit_int);
+
+TEST_VM_ASSERT(TestEnumIterator, invalid_range) {
+  EXPECT_TRUE(invalid_implicit_value == EnumRange<ImplicitTest>(invalid_implicit_value).first());
+}
+
+TEST_VM_ASSERT(TestEnumIterator, invalid_iterator) {
+  EXPECT_TRUE(invalid_implicit_value == *EnumIterator<ImplicitTest>(invalid_implicit_value));
+}
+
+#endif // ASSERT

From 77f6290995dc681c55301fd032f642057523094a Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 12 Jan 2021 04:12:31 +0000
Subject: [PATCH 129/129] 8258254: Move PtrQueue flush to PtrQueueSet
 subclasses

Reviewed-by: tschatzl, shade
---
 src/hotspot/share/gc/g1/g1BarrierSet.cpp      | 14 ++++--
 src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp  | 34 +++++++--------
 src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp  | 11 ++---
 src/hotspot/share/gc/g1/g1EvacFailure.cpp     |  4 +-
 .../share/gc/g1/g1ParScanThreadState.cpp      |  4 +-
 .../share/gc/g1/g1RedirtyCardsQueue.cpp       | 12 +++---
 .../share/gc/g1/g1RedirtyCardsQueue.hpp       |  7 ++-
 src/hotspot/share/gc/shared/ptrQueue.cpp      | 43 +++++++------------
 src/hotspot/share/gc/shared/ptrQueue.hpp      | 14 +++---
 src/hotspot/share/gc/shared/satbMarkQueue.cpp | 16 +++----
 src/hotspot/share/gc/shared/satbMarkQueue.hpp |  7 ++-
 .../gc/shenandoah/shenandoahBarrierSet.cpp    |  4 +-
 12 files changed, 78 insertions(+), 92 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
index 200abc2d585e5..aea28cdc37d32 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,6 +158,14 @@ void G1BarrierSet::on_thread_attach(Thread* thread) {
 void G1BarrierSet::on_thread_detach(Thread* thread) {
   // Flush any deferred card marks.
   CardTableBarrierSet::on_thread_detach(thread);
-  G1ThreadLocalData::satb_mark_queue(thread).flush();
-  G1ThreadLocalData::dirty_card_queue(thread).on_thread_detach();
+  {
+    SATBMarkQueue& queue = G1ThreadLocalData::satb_mark_queue(thread);
+    G1BarrierSet::satb_mark_queue_set().flush_queue(queue);
+  }
+  {
+    G1DirtyCardQueue& queue = G1ThreadLocalData::dirty_card_queue(thread);
+    G1DirtyCardQueueSet& qset = G1BarrierSet::dirty_card_queue_set();
+    qset.flush_queue(queue);
+    qset.record_detached_refinement_stats(queue.refinement_stats());
+  }
 }
diff --git a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
index ea9de603169c1..2b952b7a9867e 100644
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,21 +55,10 @@ G1DirtyCardQueue::G1DirtyCardQueue(G1DirtyCardQueueSet* qset) :
 { }
 
 G1DirtyCardQueue::~G1DirtyCardQueue() {
-  flush();
+  G1BarrierSet::dirty_card_queue_set().flush_queue(*this);
   delete _refinement_stats;
 }
 
-void G1DirtyCardQueue::flush() {
-  _refinement_stats->inc_dirtied_cards(size());
-  flush_impl();
-}
-
-void G1DirtyCardQueue::on_thread_detach() {
-  assert(this == &G1ThreadLocalData::dirty_card_queue(Thread::current()), "precondition");
-  flush();
-  dirty_card_qset()->record_detached_refinement_stats(_refinement_stats);
-}
-
 // Assumed to be zero by concurrent threads.
 static uint par_ids_start() { return 0; }
 
@@ -95,6 +84,14 @@ uint G1DirtyCardQueueSet::num_par_ids() {
   return (uint)os::initial_active_processor_count();
 }
 
+void G1DirtyCardQueueSet::flush_queue(G1DirtyCardQueue& queue) {
+  if (queue.buffer() != nullptr) {
+    G1ConcurrentRefineStats* stats = queue.refinement_stats();
+    stats->inc_dirtied_cards(buffer_size() - queue.index());
+  }
+  PtrQueueSet::flush_queue(queue);
+}
+
 void G1DirtyCardQueueSet::enqueue(G1DirtyCardQueue& queue,
                                   volatile CardValue* card_ptr) {
   CardValue* value = const_cast<CardValue*>(card_ptr);
@@ -645,13 +642,16 @@ void G1DirtyCardQueueSet::concatenate_logs() {
   set_max_cards(MaxCardsUnlimited);
 
   struct ConcatenateThreadLogClosure : public ThreadClosure {
+    G1DirtyCardQueueSet& _qset;
+    ConcatenateThreadLogClosure(G1DirtyCardQueueSet& qset) : _qset(qset) {}
     virtual void do_thread(Thread* t) {
-      G1DirtyCardQueue& dcq = G1ThreadLocalData::dirty_card_queue(t);
-      if (!dcq.is_empty()) {
-        dcq.flush();
+      G1DirtyCardQueue& queue = G1ThreadLocalData::dirty_card_queue(t);
+      if ((queue.buffer() != nullptr) &&
+          (queue.index() != _qset.buffer_size())) {
+        _qset.flush_queue(queue);
       }
     }
-  } closure;
+  } closure(*this);
   Threads::threads_do(&closure);
 
   G1BarrierSet::shared_dirty_card_queue().flush();
diff --git a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
index d9fabe034a738..bf4f38375da1e 100644
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,19 +49,12 @@ class G1DirtyCardQueue: public PtrQueue {
   // doing something else, with auto-flush on completion.
   ~G1DirtyCardQueue();
 
-  // Process queue entries and release resources.
-  void flush();
-
   inline G1DirtyCardQueueSet* dirty_card_qset() const;
 
   G1ConcurrentRefineStats* refinement_stats() const {
     return _refinement_stats;
   }
 
-  // To be called by the barrier set's on_thread_detach, to notify this
-  // object of the corresponding state change of its owning thread.
-  void on_thread_detach();
-
   // Compiler support.
   static ByteSize byte_offset_of_index() {
     return PtrQueue::byte_offset_of_index<G1DirtyCardQueue>();
@@ -313,6 +306,8 @@ class G1DirtyCardQueueSet: public PtrQueueSet {
 
   G1BufferNodeList take_all_completed_buffers();
 
+  void flush_queue(G1DirtyCardQueue& queue);
+
   using CardValue = G1CardTable::CardValue;
   void enqueue(G1DirtyCardQueue& queue, volatile CardValue* card_ptr);
 
diff --git a/src/hotspot/share/gc/g1/g1EvacFailure.cpp b/src/hotspot/share/gc/g1/g1EvacFailure.cpp
index f133383169697..382f8f92248df 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailure.cpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailure.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,7 +219,7 @@ class RemoveSelfForwardPtrHRClosure: public HeapRegionClosure {
   }
 
   ~RemoveSelfForwardPtrHRClosure() {
-    _rdcq.flush();
+    _rdc_local_qset.flush_queue(_rdcq);
     _rdc_local_qset.flush();
   }
 
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index b9221ba9d6b1e..c9981acf0b154 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
 }
 
 size_t G1ParScanThreadState::flush(size_t* surviving_young_words) {
-  _rdcq.flush();
+  _rdc_local_qset.flush_queue(_rdcq);
   _rdc_local_qset.flush();
   flush_numa_stats();
   // Update allocation statistics.
diff --git a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp
index 106330709694d..b9a65ba3629a3 100644
--- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp
+++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,6 +68,10 @@ void G1RedirtyCardsLocalQueueSet::flush() {
   _buffers = G1BufferNodeList();
 }
 
+void G1RedirtyCardsLocalQueueSet::flush_queue(G1RedirtyCardsQueue& queue) {
+  PtrQueueSet::flush_queue(queue);
+}
+
 // G1RedirtyCardsQueue
 
 G1RedirtyCardsQueue::G1RedirtyCardsQueue(G1RedirtyCardsLocalQueueSet* qset) :
@@ -76,14 +80,10 @@ G1RedirtyCardsQueue::G1RedirtyCardsQueue(G1RedirtyCardsLocalQueueSet* qset) :
 
 #ifdef ASSERT
 G1RedirtyCardsQueue::~G1RedirtyCardsQueue() {
-  assert(is_empty(), "unflushed queue");
+  assert(buffer() == nullptr, "unflushed queue");
 }
 #endif // ASSERT
 
-void G1RedirtyCardsQueue::flush() {
-  flush_impl();
-}
-
 // G1RedirtyCardsQueueSet
 
 G1RedirtyCardsQueueSet::G1RedirtyCardsQueueSet(BufferNode::Allocator* allocator) :
diff --git a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp
index 5d113499e7ec9..d91288aca9f67 100644
--- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp
+++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,8 @@ class G1RedirtyCardsLocalQueueSet : public PtrQueueSet {
 
   // Transfer all completed buffers to the shared qset.
   void flush();
+
+  void flush_queue(G1RedirtyCardsQueue& queue);
 };
 
 // Worker-local queues of card table entries.
@@ -57,9 +59,6 @@ class G1RedirtyCardsQueue : public PtrQueue {
 public:
   G1RedirtyCardsQueue(G1RedirtyCardsLocalQueueSet* qset);
   ~G1RedirtyCardsQueue() NOT_DEBUG(= default);
-
-  // Flushes all enqueued cards to qset.
-  void flush();
 };
 
 // Card table entries to be redirtied and the cards reprocessed later.
diff --git a/src/hotspot/share/gc/shared/ptrQueue.cpp b/src/hotspot/share/gc/shared/ptrQueue.cpp
index c7f798a5f4306..b583f2c2d3e78 100644
--- a/src/hotspot/share/gc/shared/ptrQueue.cpp
+++ b/src/hotspot/share/gc/shared/ptrQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,32 +46,6 @@ PtrQueue::~PtrQueue() {
   assert(_buf == NULL, "queue must be flushed before delete");
 }
 
-void PtrQueue::flush_impl() {
-  if (_buf != NULL) {
-    BufferNode* node = BufferNode::make_node_from_buffer(_buf, index());
-    if (is_empty()) {
-      // No work to do.
-      qset()->deallocate_buffer(node);
-    } else {
-      qset()->enqueue_completed_buffer(node);
-    }
-    _buf = NULL;
-    set_index(0);
-  }
-}
-
-void PtrQueue::allocate_buffer() {
-  _buf = qset()->allocate_buffer();
-  reset();
-}
-
-void PtrQueue::enqueue_completed_buffer() {
-  assert(_buf != NULL, "precondition");
-  BufferNode* node = BufferNode::make_node_from_buffer(_buf, index());
-  qset()->enqueue_completed_buffer(node);
-  allocate_buffer();
-}
-
 BufferNode* BufferNode::allocate(size_t size) {
   size_t byte_size = size * sizeof(void*);
   void* data = NEW_C_HEAP_ARRAY(char, buffer_offset() + byte_size, mtGC);
@@ -225,6 +199,21 @@ PtrQueueSet::PtrQueueSet(BufferNode::Allocator* allocator) :
 
 PtrQueueSet::~PtrQueueSet() {}
 
+void PtrQueueSet::flush_queue(PtrQueue& queue) {
+  void** buffer = queue.buffer();
+  if (buffer != nullptr) {
+    size_t index = queue.index();
+    queue.set_buffer(nullptr);
+    queue.set_index(0);
+    BufferNode* node = BufferNode::make_node_from_buffer(buffer, index);
+    if (index == buffer_size()) {
+      deallocate_buffer(node);
+    } else {
+      enqueue_completed_buffer(node);
+    }
+  }
+}
+
 bool PtrQueueSet::try_enqueue(PtrQueue& queue, void* value) {
   size_t index = queue.index();
   if (index == 0) return false;
diff --git a/src/hotspot/share/gc/shared/ptrQueue.hpp b/src/hotspot/share/gc/shared/ptrQueue.hpp
index 76cf968084af2..c4611c3f71a4b 100644
--- a/src/hotspot/share/gc/shared/ptrQueue.hpp
+++ b/src/hotspot/share/gc/shared/ptrQueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,14 +79,6 @@ class PtrQueue {
 
   PtrQueueSet* qset() const { return _qset; }
 
-  // Process queue entries and release resources.
-  void flush_impl();
-
-  void allocate_buffer();
-
-  // Enqueue the current buffer in the qset and allocate a new buffer.
-  void enqueue_completed_buffer();
-
   // Initialize this queue to contain a null buffer, and be part of the
   // given PtrQueueSet.
   PtrQueue(PtrQueueSet* qset);
@@ -268,6 +260,10 @@ class PtrQueueSet {
   PtrQueueSet(BufferNode::Allocator* allocator);
   ~PtrQueueSet();
 
+  // If queue has any buffered enqueued data, transfer it to this qset.
+  // Otherwise, deallocate queue's buffer.
+  void flush_queue(PtrQueue& queue);
+
   // Add value to queue's buffer, returning true.  If buffer is full
   // or if queue doesn't have a buffer, does nothing and returns false.
   bool try_enqueue(PtrQueue& queue, void* value);
diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.cpp b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
index dc681ca96e6ef..9e03b43192ab8 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.cpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,13 +47,6 @@ SATBMarkQueue::SATBMarkQueue(SATBMarkQueueSet* qset) :
   _active(false)
 { }
 
-void SATBMarkQueue::flush() {
-  // Filter now to possibly save work later.  If filtering empties the
-  // buffer then flush_impl can deallocate the buffer.
-  filter();
-  flush_impl();
-}
-
 void SATBMarkQueue::apply_closure_and_empty(SATBBufferClosure* cl) {
   assert(SafepointSynchronize::is_at_safepoint(),
          "SATB queues must only be processed at safepoints");
@@ -235,6 +228,13 @@ bool SATBMarkQueueSet::apply_closure_to_completed_buffer(SATBBufferClosure* cl)
   }
 }
 
+void SATBMarkQueueSet::flush_queue(SATBMarkQueue& queue) {
+  // Filter now to possibly save work later.  If filtering empties the
+  // buffer then flush_queue can deallocate the buffer.
+  filter(queue);
+  PtrQueueSet::flush_queue(queue);
+}
+
 void SATBMarkQueueSet::enqueue_known_active(SATBMarkQueue& queue, oop obj) {
   assert(queue.is_active(), "precondition");
   void* value = cast_from_oop<void*>(obj);
diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.hpp b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
index 4430410e55e41..00042db52c2dd 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.hpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,9 +63,6 @@ class SATBMarkQueue: public PtrQueue {
   bool is_active() const { return _active; }
   void set_active(bool value) { _active = value; }
 
-  // Process queue entries and free resources.
-  void flush();
-
   inline SATBMarkQueueSet* satb_qset() const;
 
   // Apply cl to the active part of the buffer.
@@ -150,6 +147,8 @@ class SATBMarkQueueSet: public PtrQueueSet {
   // buffer; the leading entries may be excluded due to filtering.
   bool apply_closure_to_completed_buffer(SATBBufferClosure* cl);
 
+  void flush_queue(SATBMarkQueue& queue);
+
   // When active, add obj to queue by calling enqueue_known_active.
   void enqueue(SATBMarkQueue& queue, oop obj) {
     if (queue.is_active()) enqueue_known_active(queue, obj);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index 4b7193780fa33..1c1d190b4bc0c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2021, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,7 +116,7 @@ void ShenandoahBarrierSet::on_thread_attach(Thread *thread) {
 
 void ShenandoahBarrierSet::on_thread_detach(Thread *thread) {
   SATBMarkQueue& queue = ShenandoahThreadLocalData::satb_mark_queue(thread);
-  queue.flush();
+  _satb_mark_queue_set.flush_queue(queue);
   if (thread->is_Java_thread()) {
     PLAB* gclab = ShenandoahThreadLocalData::gclab(thread);
     if (gclab != NULL) {