Skip to content
Permalink
Browse files

Merge

  • Loading branch information
prsadhuk committed Dec 11, 2019
2 parents 614e78b + 2c54f0f commit c617914eeb3e12d1f54a4a88e461dd4f39ee0f9c
Showing with 55 additions and 99 deletions.
  1. +3 −0 test/hotspot/jtreg/TEST.groups
  2. +1 −2 test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java
  3. +1 −2 test/hotspot/jtreg/compiler/graalunit/ApiTest.java
  4. +1 −2 test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java
  5. +1 −2 test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java
  6. +1 −2 test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java
  7. +1 −2 test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java
  8. +2 −3 test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java
  9. +1 −2 test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java
  10. +2 −3 test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java
  11. +1 −2 test/hotspot/jtreg/compiler/graalunit/CoreTest.java
  12. +1 −2 test/hotspot/jtreg/compiler/graalunit/DebugTest.java
  13. +1 −2 test/hotspot/jtreg/compiler/graalunit/EATest.java
  14. +1 −2 test/hotspot/jtreg/compiler/graalunit/GraphTest.java
  15. +1 −2 test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java
  16. +1 −2 test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java
  17. +1 −2 test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java
  18. +1 −2 test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java
  19. +1 −2 test/hotspot/jtreg/compiler/graalunit/HotspotSparcTest.java
  20. +1 −2 test/hotspot/jtreg/compiler/graalunit/HotspotTest.java
  21. +1 −2 test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java
  22. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java
  23. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java
  24. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java
  25. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java
  26. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java
  27. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java
  28. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java
  29. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java
  30. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java
  31. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java
  32. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java
  33. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java
  34. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java
  35. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java
  36. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java
  37. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java
  38. +1 −2 test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java
  39. +1 −2 test/hotspot/jtreg/compiler/graalunit/LirJttTest.java
  40. +1 −2 test/hotspot/jtreg/compiler/graalunit/LirTest.java
  41. +1 −2 test/hotspot/jtreg/compiler/graalunit/LoopTest.java
  42. +1 −2 test/hotspot/jtreg/compiler/graalunit/NodesTest.java
  43. +1 −2 test/hotspot/jtreg/compiler/graalunit/OptionsTest.java
  44. +1 −2 test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java
  45. +1 −2 test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java
  46. +1 −2 test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java
  47. +1 −2 test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java
  48. +1 −2 test/hotspot/jtreg/compiler/graalunit/UtilTest.java
  49. +3 −3 test/hotspot/jtreg/compiler/graalunit/generateTests.sh
@@ -156,6 +156,9 @@ tier1_compiler_aot_jvmci = \
compiler/aot \
compiler/jvmci

tier1_compiler_graal = \
compiler/graalunit/HotspotTest.java

ctw_1 = \
applications/ctw/modules/ \
-:ctw_2 \
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.sparc.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.sparc.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
* @requires !vm.graal.enabled
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
* @requires vm.graal.enabled
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
* @requires vm.simpleArch == "sparcv9"
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.sparc.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.sparc.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
@@ -24,7 +24,6 @@
/*
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
*
* @modules jdk.internal.vm.compiler
*
@@ -34,7 +33,7 @@
*
* @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
*
* @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
*/

/* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */

0 comments on commit c617914

Please sign in to comment.
You can’t perform that action at this time.