8299970: Speed up compiler/arraycopy/TestArrayCopyConjoint.java

Backport-of: 5d39d14522df5dc35a5f4c9934d2cf8da4fecaa6
openjdk · Feb 21, 2023 · da62b2b · da62b2b · openjdk-notifier · Feb 21, 2023
1 parent fcd9110
commit da62b2b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +232,7 @@ public static void main(String [] args) {
 
       setup();
 
-      try {
-        for (int i = 0 ; i < 1000000 ; i++ ) {
+      for (int i = 0 ; i < 30_000 ; i++ ) {
           int index = r.nextInt(2048);
           testByte(lengths[i % lengths.length], index , index+2);
           reinit(byte.class);
@@ -262,10 +261,6 @@ public static void main(String [] args) {
           reinit(long.class);
           testLong_constant_LT64B (index , index+2);
           reinit(long.class);
-        }
-        System.out.println("PASS : " + validate_ctr);
-      } catch (Exception e) {
-        System.out.println(e.getMessage());
       }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java
@@ -202,27 +202,22 @@ public static void main(String [] args) {
 
       setup();
 
-      try {
-        for (int i = 0 ; i < 1000000 ; i++ ) {
-          testByte(lengths[i % lengths.length], r.nextInt(2048) , r.nextInt(2048));
-          testByte_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
-          testByte_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
-
-          testChar(lengths[i % lengths.length] >> 1, r.nextInt(2048) , r.nextInt(2048));
-          testChar_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
-          testChar_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
-
-          testInt(lengths[i % lengths.length]  >> 2, r.nextInt(2048) , r.nextInt(2048));
-          testInt_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
-          testInt_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
-
-          testLong(lengths[i % lengths.length] >> 3, r.nextInt(2048) , r.nextInt(2048));
-          testLong_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
-          testLong_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
-        }
-        System.out.println("PASS : " + validate_ctr);
-      } catch (Exception e) {
-         System.out.println(e.getMessage());
+      for (int i = 0 ; i < 30_000 ; i++ ) {
+        testByte(lengths[i % lengths.length], r.nextInt(2048) , r.nextInt(2048));
+        testByte_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
+        testByte_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
+
+        testChar(lengths[i % lengths.length] >> 1, r.nextInt(2048) , r.nextInt(2048));
+        testChar_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
+        testChar_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
+
+        testInt(lengths[i % lengths.length]  >> 2, r.nextInt(2048) , r.nextInt(2048));
+        testInt_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
+        testInt_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
+
+        testLong(lengths[i % lengths.length] >> 3, r.nextInt(2048) , r.nextInt(2048));
+        testLong_constant_LT32B (r.nextInt(2048) , r.nextInt(2048));
+        testLong_constant_LT64B (r.nextInt(2048) , r.nextInt(2048));
       }
     }
 }