Skip to content

Commit

Permalink
8314923: [lworld] AllocationMergesTests.java fails IR verification
Browse files Browse the repository at this point in the history
Reviewed-by: chagedorn
  • Loading branch information
TobiHartmann committed Aug 25, 2023
1 parent ae8b7db commit ffb2830
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion test/hotspot/jtreg/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all

compiler/gcbarriers/TestZGCBarrierElision.java#ZGen 8313737 generic-all
compiler/valhalla/inlinetypes/TestArrays.java 8313667 generic-all
compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java 8314923 generic-all

#############################################################################

Expand Down
8 changes: 4 additions & 4 deletions test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -198,25 +198,25 @@ public class IRNode {

public static final String ALLOC = PREFIX + "ALLOC" + POSTFIX;
static {
String optoRegex = "(.*precise .*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
String optoRegex = "(.*precise .*\\R((.*(?i:mov|mv|xorl|nop|spill|pushq|popq).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
allocNodes(ALLOC, "Allocate", optoRegex);
}

public static final String ALLOC_OF = COMPOSITE_PREFIX + "ALLOC_OF" + POSTFIX;
static {
String regex = "(.*precise .*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
String regex = "(.*precise .*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill|pushq|popq).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
optoOnly(ALLOC_OF, regex);
}

public static final String ALLOC_ARRAY = PREFIX + "ALLOC_ARRAY" + POSTFIX;
static {
String optoRegex = "(.*precise \\[.*\\R((.*(?i:mov|mv|xor|nop|spill).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
String optoRegex = "(.*precise \\[.*\\R((.*(?i:mov|mv|xor|nop|spill|pushq|popq).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
allocNodes(ALLOC_ARRAY, "AllocateArray", optoRegex);
}

public static final String ALLOC_ARRAY_OF = COMPOSITE_PREFIX + "ALLOC_ARRAY_OF" + POSTFIX;
static {
String regex = "(.*precise \\[.*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
String regex = "(.*precise \\[.*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill|pushq|popq).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
optoOnly(ALLOC_ARRAY_OF, regex);
}

Expand Down

0 comments on commit ffb2830

Please sign in to comment.