Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64 #515

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -7521,7 +7521,7 @@ instruct loadConP(iRegPNoSp dst, immP con)

ins_cost(INSN_COST * 4);
format %{
"mov $dst, $con\t# ptr\n\t"
"mov $dst, $con\t# ptr"
%}

ins_encode(aarch64_enc_mov_p(dst, con));
@@ -111,11 +111,12 @@ public static TestFramework getFramework() {
protected static final String MID = ".*)+ ===.*";
protected static final String END = ")";
// Generic allocation
protected static final String ALLOC_G = "(.*call,static wrapper for: _new_instance_Java" + END;
protected static final String ALLOCA_G = "(.*call,static wrapper for: _new_array_Java" + END;
protected static final String ALLOC_G = "(.*call,static.*wrapper for: _new_instance_Java" + END;
protected static final String ALLOCA_G = "(.*call,static.*wrapper for: _new_array_Java" + END;
// Inline type allocation
protected static final String ALLOC = "(.*precise klass compiler/valhalla/inlinetypes/MyValue.*\\R(.*(movl|xorl|nop|spill).*\\R)*.*_new_instance_Java" + END;
protected static final String ALLOCA = "(.*precise klass \\[(L|Q)compiler/valhalla/inlinetypes/MyValue.*\\R(.*(movl|xorl|nop|spill).*\\R)*.*_new_array_Java" + END;
protected static final String MYVALUE_ARRAY_KLASS = "precise klass \\[(L|Q)compiler/valhalla/inlinetypes/MyValue";
protected static final String ALLOC = "(.*precise klass compiler/valhalla/inlinetypes/MyValue.*\\R(.*(?i:mov|xorl|nop|spill).*\\R)*.*_new_instance_Java" + END;
protected static final String ALLOCA = "(.*" + MYVALUE_ARRAY_KLASS + ".*\\R(.*(?i:mov|xorl|nop|spill).*\\R)*.*_new_array_Java" + END;
protected static final String LOAD = START + "Load(B|S|I|L|F|D|P|N)" + MID + "@compiler/valhalla/inlinetypes/MyValue.*" + END;
protected static final String LOADK = START + "LoadK" + MID + END;
protected static final String STORE = START + "Store(B|C|S|I|L|F|D|P|N)" + MID + "@compiler/valhalla/inlinetypes/MyValue.*" + END;
@@ -126,12 +127,14 @@ public static TestFramework getFramework() {
protected static final String LINKTOSTATIC = START + "CallStaticJava" + MID + "linkToStatic" + END;
protected static final String NPE = START + "CallStaticJava" + MID + "null_check" + END;
protected static final String CALL = START + "CallStaticJava" + MID + END;
protected static final String CALL_LEAF = "(CALL, runtime leaf|call_leaf,runtime)";
protected static final String CALL_LEAF_NOFP = "(CALL, runtime leaf nofp|call_leaf_nofp,runtime)";
protected static final String STORE_INLINE_FIELDS = START + "CallStaticJava" + MID + "store_inline_type_fields" + END;
protected static final String SCOBJ = "(.*# ScObj.*" + END;
protected static final String LOAD_UNKNOWN_INLINE = "(.*call_leaf,runtime load_unknown_inline.*" + END;
protected static final String STORE_UNKNOWN_INLINE = "(.*call_leaf,runtime store_unknown_inline.*" + END;
protected static final String INLINE_ARRAY_NULL_GUARD = "(.*call,static wrapper for: uncommon_trap.*reason='null_check' action='none'.*" + END;
protected static final String INTRINSIC_SLOW_PATH = "(.*call,static wrapper for: uncommon_trap.*reason='intrinsic_or_type_checked_inlining'.*" + END;
protected static final String LOAD_UNKNOWN_INLINE = "(.*" + CALL_LEAF + ".*load_unknown_inline.*" + END;
protected static final String STORE_UNKNOWN_INLINE = "(.*" + CALL_LEAF + ".*store_unknown_inline.*" + END;
protected static final String INLINE_ARRAY_NULL_GUARD = "(.*call,static.*wrapper for: uncommon_trap.*reason='null_check' action='none'.*" + END;
protected static final String INTRINSIC_SLOW_PATH = "(.*call,static.*wrapper for: uncommon_trap.*reason='intrinsic_or_type_checked_inlining'.*" + END;
protected static final String CLONE_INTRINSIC_SLOW_PATH = "(.*call,static.*java.lang.Object::clone.*" + END;
protected static final String CLASS_CHECK_TRAP = START + "CallStaticJava" + MID + "uncommon_trap.*class_check" + END;
protected static final String NULL_CHECK_TRAP = START + "CallStaticJava" + MID + "uncommon_trap.*null_check" + END;
@@ -140,9 +143,9 @@ public static TestFramework getFramework() {
protected static final String UNHANDLED_TRAP = START + "CallStaticJava" + MID + "uncommon_trap.*unhandled" + END;
protected static final String PREDICATE_TRAP = START + "CallStaticJava" + MID + "uncommon_trap.*predicate" + END;
protected static final String MEMBAR = START + "MemBar" + MID + END;
protected static final String CHECKCAST_ARRAY = "(cmp.*precise klass \\[(L|Q)compiler/valhalla/inlinetypes/MyValue.*" + END;
protected static final String CHECKCAST_ARRAYCOPY = "(.*call_leaf_nofp,runtime checkcast_arraycopy.*" + END;
protected static final String JLONG_ARRAYCOPY = "(.*call_leaf_nofp,runtime jlong_disjoint_arraycopy.*" + END;
protected static final String CHECKCAST_ARRAY = "(((?i:cmp|CLFI|CLR).*" + MYVALUE_ARRAY_KLASS + ".*;:|.*(?i:mov|or).*" + MYVALUE_ARRAY_KLASS + ".*;:.*\\R.*(cmp|CMP|CLR))" + END;
protected static final String CHECKCAST_ARRAYCOPY = "(.*" + CALL_LEAF_NOFP + ".*checkcast_arraycopy.*" + END;
protected static final String JLONG_ARRAYCOPY = "(.*" + CALL_LEAF_NOFP + ".*jlong_disjoint_arraycopy.*" + END;
protected static final String FIELD_ACCESS = "(.*Field: *" + END;
protected static final String SUBSTITUTABILITY_TEST = START + "CallStaticJava" + MID + "java.lang.invoke.ValueBootstrapMethods::isSubstitutable" + END;
}
@@ -36,7 +36,7 @@
* @key randomness
* @summary Test the handling of fields of unloaded inline classes.
* @library /test/lib /
* @requires os.simpleArch == "x64"
* @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64")
* @compile hack/GetUnresolvedInlineFieldWrongSignature.java
* @compile TestUnloadedInlineTypeField.java
* @run driver/timeout=300 compiler.valhalla.inlinetypes.TestUnloadedInlineTypeField