archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8078593: [TESTBUG] ppc: Enable jtreg tests for new features

Browse source 
Also fix a ppc issue in test_env.sh

Reviewed-by: kvn
This commit is contained in:
Goetz Lindenmaier 2015-04-24 10:49:38 +02:00
parent a880f3d139
commit 6d705e6978
5 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -145,7 +145,8 @@ public abstract class IntrinsicBase extends CompilerWhiteBoxTest {
@Override @Override
protected boolean isIntrinsicSupported() { protected boolean isIntrinsicSupported() {
return isServerVM() && Boolean.valueOf(useMathExactIntrinsics) && Platform.isX64(); return isServerVM() && Boolean.valueOf(useMathExactIntrinsics) &&
(Platform.isX64() || Platform.isPPC());
} }
@Override @Override

6
hotspot/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -88,7 +88,7 @@ public abstract class RTMGenericCommandLineOptionTest
@Override @Override
public void runTestCases() throws Throwable { public void runTestCases() throws Throwable {
if (Platform.isX86() || Platform.isX64()) { if (Platform.isX86() || Platform.isX64() || Platform.isPPC()) {
if (Platform.isServer() && !Platform.isEmbedded()) { if (Platform.isServer() && !Platform.isEmbedded()) {
runX86SupportedVMTestCases(); runX86SupportedVMTestCases();
} else { } else {
@ -108,7 +108,7 @@ public abstract class RTMGenericCommandLineOptionTest
} }
/** /**
* Runs test cases on non-X86 CPU if VM does not support RTM locking. * Runs test cases on X86 CPU if VM does not support RTM locking.
* @throws Throwable * @throws Throwable
*/ */
protected void runX86UnsupportedVMTestCases() throws Throwable { protected void runX86UnsupportedVMTestCases() throws Throwable {

2
hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
View file

@ -60,7 +60,7 @@ public class TestUseRTMLockingOptionOnUnsupportedCPU
"UseRTMLocking"); "UseRTMLocking");
String errorMessage = RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR; String errorMessage = RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR;
if (Platform.isX86() || Platform.isX64()) { if (Platform.isX86() || Platform.isX64() || Platform.isPPC()) {
String shouldFailMessage = "JVM startup should fail with option " String shouldFailMessage = "JVM startup should fail with option "
+ "-XX:+UseRTMLocking on unsupported CPU"; + "-XX:+UseRTMLocking on unsupported CPU";
// verify that we get an error when use +UseRTMLocking // verify that we get an error when use +UseRTMLocking

5
hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -28,9 +28,12 @@ import sun.hotspot.cpuinfo.CPUInfo;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
import com.oracle.java.testlibrary.Platform;
public class SupportedCPU implements BooleanSupplier { public class SupportedCPU implements BooleanSupplier {
@Override @Override
public boolean getAsBoolean() { public boolean getAsBoolean() {
if (Platform.isPPC()) { return CPUInfo.hasFeature("tcheck"); }
return CPUInfo.hasFeature("rtm"); return CPUInfo.hasFeature("rtm");
} }
} }

4
hotspot/test/test_env.sh
View file

@ -188,6 +188,10 @@ grep "ppc" vm_version.out > ${NULL}
if [ $? = 0 ] if [ $? = 0 ]
then then
VM_CPU="ppc" VM_CPU="ppc"
if [ $VM_BITS = "64" ]
then
VM_CPU="ppc64"
fi
fi fi
grep "ia64" vm_version.out > ${NULL} grep "ia64" vm_version.out > ${NULL}
if [ $? = 0 ] if [ $? = 0 ]