git: openjdk/jdk: 8280378: [IR Framework] Support IR matching for different compile phases

Christian Hagedorn chagedorn at openjdk.org
Tue Nov 1 15:42:25 UTC 2022


Changeset: f829b5a7
Author:    Christian Hagedorn <chagedorn at openjdk.org>
Date:      2022-11-01 15:41:09 +0000
URL:       https://git.openjdk.org/jdk/commit/f829b5a73f699ca7fc513f491f77daae6c8f4ed9

8280378: [IR Framework] Support IR matching for different compile phases

Reviewed-by: kvn, rcastanedalo

! src/hotspot/share/opto/output.cpp
! src/hotspot/share/opto/phasetype.hpp
! test/hotspot/jtreg/compiler/c2/irTests/MaxMinINodeIdealizationTests.java
! test/hotspot/jtreg/compiler/c2/irTests/TestCountedLoopPhiValue.java
! test/hotspot/jtreg/compiler/c2/irTests/TestCountedLoopSafepoint.java
! test/hotspot/jtreg/compiler/c2/irTests/TestDuplicateBackedge.java
! test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
! test/hotspot/jtreg/compiler/c2/irTests/TestFewIterationsCountedLoop.java
! test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
! test/hotspot/jtreg/compiler/c2/irTests/TestSkeletonPredicates.java
! test/hotspot/jtreg/compiler/c2/irTests/TestStripMiningDropsSafepoint.java
! test/hotspot/jtreg/compiler/c2/irTests/TestUnsignedComparison.java
! test/hotspot/jtreg/compiler/c2/irTests/TestVectorConditionalMove.java
! test/hotspot/jtreg/compiler/c2/irTests/loopOpts/LoopIdealizationTests.java
! test/hotspot/jtreg/compiler/intrinsics/TestBitShuffleOpers.java
! test/hotspot/jtreg/compiler/intrinsics/TestDoubleIsFinite.java
! test/hotspot/jtreg/compiler/intrinsics/TestDoubleIsInfinite.java
! test/hotspot/jtreg/compiler/intrinsics/TestFloatIsFinite.java
! test/hotspot/jtreg/compiler/intrinsics/TestFloatIsInfinite.java
! test/hotspot/jtreg/compiler/intrinsics/TestIntegerUnsignedDivMod.java
! test/hotspot/jtreg/compiler/intrinsics/TestLongUnsignedDivMod.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
! test/hotspot/jtreg/compiler/lib/ir_framework/IR.java
! test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
! test/hotspot/jtreg/compiler/lib/ir_framework/README.md
+ test/hotspot/jtreg/compiler/lib/ir_framework/RegexType.java
! test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/Compilation.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/CompilationOutputBuilder.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/IRMatcher.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/IRMatcherFailureMessageBuilder.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/MatchResult.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/Matchable.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/MatchableMatcher.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/NonIRTestClass.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/OutputMatch.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/TestClass.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/TestClassMatchResult.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/FailureMessageBuilder.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/IRMethod.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/IRMethodMatchResult.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/IRMethodMatchable.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/MatchedCompilationOutputBuilder.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/MissingCompilationMessageBuilder.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/MissingCompilationResult.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NormalFailureMessageBuilder.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NormalMatchResult.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompiledIRMethod.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompiledIRMethodMatchResult.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/CheckAttribute.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/CheckAttributeMatchResult.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/Counts.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/CountsMatchResult.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/CountsRegexFailure.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/FailOn.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/FailOnMatchResult.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/FailOnRegexFailure.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/IRRule.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/IRRuleMatchResult.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/RegexFailure.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/CheckAttribute.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/CheckAttributeMatchResult.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/CheckAttributeType.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/Counts.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/FailOn.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/CheckAttributeReader.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/CheckAttributeString.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/CheckAttributeStrings.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/RawCheckAttribute.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/RawCounts.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/RawFailOn.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/RawIRNode.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/ConstraintAction.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/CountString.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/CreateRawConstraintAction.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/CreateRawCountsConstraintAction.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/CreateRawFailOnConstraintAction.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/DefaultPhaseConstraintAction.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/DefaultPhaseCountsConstraintAction.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/checkattribute/parsing/action/DefaultPhaseFailOnConstraintAction.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/Constraint.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/ConstraintCheck.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/ConstraintFailure.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/CountsConstraintCheck.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/CountsConstraintFailure.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/FailOnConstraintCheck.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/FailOnConstraintFailure.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/SuccessResult.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/raw/RawConstraint.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/raw/RawCountsConstraint.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/constraint/raw/RawFailOnConstraint.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/phase/CompilePhaseIRRule.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/phase/CompilePhaseIRRuleBuilder.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/phase/CompilePhaseIRRuleMatchResult.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/phase/CompilePhaseIRRuleMatchable.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/phase/CompilePhaseNoCompilationIRRule.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/phase/CompilePhaseNoCompilationIRRuleMatchResult.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irrule/phase/DefaultPhaseRawConstraintParser.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/IRNodeMapEntry.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/MultiPhaseRangeEntry.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/OverlappingPhaseRangesException.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/PhaseInterval.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/RegexTypeEntry.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/SinglePhaseEntry.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/SinglePhaseRangeEntry.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/mapping/SingleRegexEntry.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/HotSpotPidFileParser.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IREncodingParser.java
- test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodParser.java
! test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/Line.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/MethodCompilationParser.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethod.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/CompilationOutputBuilder.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/ConstraintFailureMessageBuilder.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/CountsConstraintFailureMessageBuilder.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailCountVisitor.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/Indentation.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/visitor/AcceptChildren.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/visitor/MatchResultVisitor.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/flag/CompilePhaseCollector.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/flag/CompilerDirectivesFlagBuilder.java
! test/hotspot/jtreg/compiler/lib/ir_framework/flag/FlagVM.java
+ test/hotspot/jtreg/compiler/lib/ir_framework/flag/MethodCompilePhaseCollector.java
! test/hotspot/jtreg/compiler/lib/ir_framework/shared/Comparison.java
! test/hotspot/jtreg/compiler/lib/ir_framework/shared/ComparisonConstraintParser.java
! test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFormat.java
- test/hotspot/jtreg/compiler/lib/ir_framework/shared/UnreachableCodeException.java
! test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
! test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
! test/hotspot/jtreg/compiler/vectorapi/AllBitsSetVectorMatchRuleTest.java
! test/hotspot/jtreg/compiler/vectorapi/TestMaskedMacroLogicVector.java
! test/hotspot/jtreg/compiler/vectorapi/TestVectorMulAddSub.java
! test/hotspot/jtreg/compiler/vectorapi/VectorAbsDiffTest.java
! test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java
! test/hotspot/jtreg/compiler/vectorapi/VectorGatherScatterTest.java
! test/hotspot/jtreg/compiler/vectorapi/VectorMaskedNotTest.java
! test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java
! test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
! test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java
! test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
! test/hotspot/jtreg/compiler/vectorization/TestRoundVectAArch64.java
! test/hotspot/jtreg/compiler/vectorization/TestRoundVectDouble.java
! test/hotspot/jtreg/compiler/vectorization/TestSignumVector.java
! test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/IRExample.java
! test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
! test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestDIgnoreCompilerControls.java
! test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
+ test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
! test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestScenarios.java
! test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/Utils.java
+ test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompileCommandFileWriter.java
+ test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java



More information about the jdk-changes mailing list