From 5d39d14522df5dc35a5f4c9934d2cf8da4fecaa6 Mon Sep 17 00:00:00 2001 From: Emanuel Peter Date: Mon, 13 Feb 2023 08:13:13 +0000 Subject: [PATCH] 8299970: Speed up compiler/arraycopy/TestArrayCopyConjoint.java Reviewed-by: chagedorn, kvn, thartmann --- .../arraycopy/TestArrayCopyConjoint.java | 9 ++---- .../arraycopy/TestArrayCopyDisjoint.java | 31 ++++++++----------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java index c297e302b09..8d98628c074 100644 --- 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 class TestArrayCopyConjoint { 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 class TestArrayCopyConjoint { 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 index f8bcf1cc08a..162ba20048d 100644 --- a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java +++ b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java @@ -202,27 +202,22 @@ public class TestArrayCopyDisjoint { 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)); + 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)); + 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)); + 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()); + 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)); } } }