Skip to content
Permalink
Browse files

8237800: rewrite vmTestbase/jit/escape/LockCoarsening from shell to java

Reviewed-by: roland, neliasso
  • Loading branch information
iignatev committed Jan 27, 2020
1 parent fc8d71b commit e5a99b29f109ee33e2fea4c3d63a5d908d1d0960
@@ -187,8 +187,8 @@ vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/TestDescription.java 8219

vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8208243,8192647 generic-all

vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java 8148743 generic-all
vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java 8208259 generic-all
vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
vmTestbase/jit/escape/LockCoarsening/LockCoarsening002.java 8208259 generic-all

vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java 8058176 generic-all
@@ -1650,7 +1650,7 @@ vmTestbase_vm_compiler_quick = \
vmTestbase/jit/deoptimization/test08/test08.java \
vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java \
vmTestbase/jit/escape/LockElision/MatMul/MatMul.java \
vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java \
vmTestbase/jit/escape/LockCoarsening/LockCoarsening002.java \
vmTestbase/jit/exception/exception.java \
vmTestbase/jit/graph/cgt0.java \
vmTestbase/jit/graph/cgt1.java \
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@@ -24,7 +24,7 @@

import nsk.share.TestFailure;

class LockCoarsening {
public class LockCoarsening {
// JVM option '-XX:+EliminateLocks' specified
public static boolean eliminateLocks = false;
// Number of chances Thread 2 has to acquire the lock
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@@ -29,10 +29,13 @@
* VM Testbase keywords: [jit, quarantine]
* VM Testbase comments: 8148743
*
* @requires vm.flavor == "server"
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build jit.escape.LockCoarsening.LockCoarsening
* @run shell ../run.sh EliminateLocks
* @run main/othervm
* -XX:+DoEscapeAnalysis -XX:+EliminateLocks
* -Xcomp -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeALot
* jit.escape.LockCoarsening.LockCoarsening -eliminateLocks
*/

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@@ -29,10 +29,13 @@
* VM Testbase keywords: [jit, quick, quarantine]
* VM Testbase comments: 8208259
*
* @requires vm.flavor == "server"
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build jit.escape.LockCoarsening.LockCoarsening
* @run shell ../run.sh
* @run main/othervm
* -XX:-DoEscapeAnalysis -XX:-EliminateLocks
* -Xcomp -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeALot
* jit.escape.LockCoarsening.LockCoarsening
*/

This file was deleted.

0 comments on commit e5a99b2

Please sign in to comment.