--- old/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 2020-05-01 02:26:59.557265885 -0700 +++ new/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 2020-05-01 02:26:59.181258652 -0700 @@ -48,10 +48,8 @@ protected void runTestCases() throws Throwable { testUseAES(); testUseAESUseSSE2(); - testUseAESUseVIS2(); testNoUseAES(); testNoUseAESUseSSE2(); - testNoUseAESUseVIS2(); testNoUseAESIntrinsic(); } @@ -150,65 +148,6 @@ outputAnalyzer); } } - - /** - * Test checks following situation:
- * UseAES flag is set to true, UseVIS flag is set to 2, - * Platform should support UseVIS (sparc)
- * TestAESMain is executed
- * Expected result: UseAESIntrinsics flag is set to false
- * Output shouldn't contain intrinsics usage
- * - * @throws Throwable - */ - private void testUseAESUseVIS2() throws Throwable { - if (Platform.isSparc()) { - OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm( - prepareArguments(prepareBooleanFlag(AESIntrinsicsBase - .USE_AES_INTRINSICS, true), - prepareNumericFlag(AESIntrinsicsBase.USE_VIS, 2))); - final String errorMessage = "Case testUseAESUseVIS2 failed"; - verifyOutput(null, new String[]{AESIntrinsicsBase.CIPHER_INTRINSIC, - AESIntrinsicsBase.AES_INTRINSIC}, - errorMessage, outputAnalyzer); - verifyOptionValue(AESIntrinsicsBase.USE_AES, "true", errorMessage, - outputAnalyzer); - verifyOptionValue(AESIntrinsicsBase.USE_AES_INTRINSICS, "false", - errorMessage, outputAnalyzer); - verifyOptionValue(AESIntrinsicsBase.USE_VIS, "2", errorMessage, - outputAnalyzer); - } - } - - - /** - * Test checks following situation:
- * UseAES flag is set to false, UseVIS flag is set to 2, - * Platform should support UseVIS (sparc)
- * TestAESMain is executed
- * Expected result: UseAESIntrinsics flag is set to false
- * Output shouldn't contain intrinsics usage
- * - * @throws Throwable - */ - private void testNoUseAESUseVIS2() throws Throwable { - if (Platform.isSparc()) { - OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm( - prepareArguments(prepareBooleanFlag(AESIntrinsicsBase - .USE_AES, false), - prepareNumericFlag(AESIntrinsicsBase.USE_VIS, 2))); - final String errorMessage = "Case testNoUseAESUseVIS2 failed"; - verifyOutput(null, new String[]{AESIntrinsicsBase.CIPHER_INTRINSIC, - AESIntrinsicsBase.AES_INTRINSIC}, - errorMessage, outputAnalyzer); - verifyOptionValue(AESIntrinsicsBase.USE_AES, "false", errorMessage, - outputAnalyzer); - verifyOptionValue(AESIntrinsicsBase.USE_AES_INTRINSICS, "false", - errorMessage, outputAnalyzer); - verifyOptionValue(AESIntrinsicsBase.USE_VIS, "2", errorMessage, - outputAnalyzer); - } - } /** * Test checks following situation: