Skip to content

Commit 4cfbd49

Browse files
authored
[GlobalISel][TableGen] Fix match-table-variadics tests label checking (#101625)
We don't really care about the precise label values for specific tests like this, so just match any number. The comments are enough to say where we jump in every case, and we have plenty of tests that check basic match table features (on top of being just tested by the fact GlobalISel CodeGen isn't broken).
1 parent 1fa7f05 commit 4cfbd49

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

llvm/test/TableGen/GlobalISelCombinerEmitter/match-table-variadics.td

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ def MyCombiner: GICombiner<"GenMyCombiner", [
6666

6767
// CHECK: const uint8_t *GenMyCombiner::getMatchTable() const {
6868
// CHECK-NEXT: constexpr static uint8_t MatchTable0[] = {
69-
// CHECK-NEXT: GIM_SwitchOpcode, /*MI*/0, /*[*/GIMT_Encode2(70), GIMT_Encode2(74), /*)*//*default:*//*Label 2*/ GIMT_Encode4(127),
70-
// CHECK-NEXT: /*TargetOpcode::G_UNMERGE_VALUES*//*Label 0*/ GIMT_Encode4(26), GIMT_Encode4(0), GIMT_Encode4(0),
71-
// CHECK-NEXT: /*TargetOpcode::G_BUILD_VECTOR*//*Label 1*/ GIMT_Encode4(55),
72-
// CHECK-NEXT: // Label 0: @26
73-
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 3*/ GIMT_Encode4(40), // Rule ID 2 //
69+
// CHECK-NEXT: GIM_SwitchOpcode, /*MI*/0, /*[*/GIMT_Encode2({{[0-9]+}}), GIMT_Encode2({{[0-9]+}}), /*)*//*default:*//*Label 2*/ GIMT_Encode4({{[0-9]+}}),
70+
// CHECK-NEXT: /*TargetOpcode::G_UNMERGE_VALUES*//*Label 0*/ GIMT_Encode4({{[0-9]+}}), GIMT_Encode4(0), GIMT_Encode4(0),
71+
// CHECK-NEXT: /*TargetOpcode::G_BUILD_VECTOR*//*Label 1*/ GIMT_Encode4({{[0-9]+}}),
72+
// CHECK-NEXT: // Label 0: @{{[0-9]+}}
73+
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 3*/ GIMT_Encode4({{[0-9]+}}), // Rule ID 2 //
7474
// CHECK-NEXT: GIM_CheckSimplePredicate, GIMT_Encode2(GICXXPred_Simple_IsRule2Enabled),
7575
// CHECK-NEXT: GIM_CheckNumOperands, /*MI*/0, /*Expected*/2,
7676
// CHECK-NEXT: // MIs[0] a
@@ -79,8 +79,8 @@ def MyCombiner: GICombiner<"GenMyCombiner", [
7979
// CHECK-NEXT: // No operand predicates
8080
// CHECK-NEXT: // Combiner Rule #2: InstTest2
8181
// CHECK-NEXT: GIR_DoneWithCustomAction, /*Fn*/GIMT_Encode2(GICXXCustomAction_GICombiner0),
82-
// CHECK-NEXT: // Label 3: @40
83-
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 4*/ GIMT_Encode4(54), // Rule ID 3 //
82+
// CHECK-NEXT: // Label 3: @{{[0-9]+}}
83+
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 4*/ GIMT_Encode4({{[0-9]+}}), // Rule ID 3 //
8484
// CHECK-NEXT: GIM_CheckSimplePredicate, GIMT_Encode2(GICXXPred_Simple_IsRule3Enabled),
8585
// CHECK-NEXT: GIM_CheckNumOperands, /*MI*/0, /*Expected*/4,
8686
// CHECK-NEXT: // MIs[0] a
@@ -93,10 +93,10 @@ def MyCombiner: GICombiner<"GenMyCombiner", [
9393
// CHECK-NEXT: // No operand predicates
9494
// CHECK-NEXT: // Combiner Rule #3: InstTest3
9595
// CHECK-NEXT: GIR_DoneWithCustomAction, /*Fn*/GIMT_Encode2(GICXXCustomAction_GICombiner0),
96-
// CHECK-NEXT: // Label 4: @54
96+
// CHECK-NEXT: // Label 4: @{{[0-9]+}}
9797
// CHECK-NEXT: GIM_Reject,
98-
// CHECK-NEXT: // Label 1: @55
99-
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 5*/ GIMT_Encode4(69), // Rule ID 1 //
98+
// CHECK-NEXT: // Label 1: @{{[0-9]+}}
99+
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 5*/ GIMT_Encode4({{[0-9]+}}), // Rule ID 1 //
100100
// CHECK-NEXT: GIM_CheckSimplePredicate, GIMT_Encode2(GICXXPred_Simple_IsRule1Enabled),
101101
// CHECK-NEXT: GIM_CheckNumOperands, /*MI*/0, /*Expected*/2,
102102
// CHECK-NEXT: // MIs[0] a
@@ -105,8 +105,8 @@ def MyCombiner: GICombiner<"GenMyCombiner", [
105105
// CHECK-NEXT: // No operand predicates
106106
// CHECK-NEXT: // Combiner Rule #1: InstTest1
107107
// CHECK-NEXT: GIR_DoneWithCustomAction, /*Fn*/GIMT_Encode2(GICXXCustomAction_GICombiner0),
108-
// CHECK-NEXT: // Label 5: @69
109-
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 6*/ GIMT_Encode4(86), // Rule ID 4 //
108+
// CHECK-NEXT: // Label 5: @{{[0-9]+}}
109+
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 6*/ GIMT_Encode4({{[0-9]+}}), // Rule ID 4 //
110110
// CHECK-NEXT: GIM_CheckSimplePredicate, GIMT_Encode2(GICXXPred_Simple_IsRule4Enabled),
111111
// CHECK-NEXT: GIM_CheckNumOperandsGE, /*MI*/0, /*Expected*/3,
112112
// CHECK-NEXT: GIM_CheckNumOperandsLE, /*MI*/0, /*Expected*/5,
@@ -116,8 +116,8 @@ def MyCombiner: GICombiner<"GenMyCombiner", [
116116
// CHECK-NEXT: // No operand predicates
117117
// CHECK-NEXT: // Combiner Rule #4: VariadicTypeTestCxx
118118
// CHECK-NEXT: GIR_DoneWithCustomAction, /*Fn*/GIMT_Encode2(GICXXCustomAction_GICombiner1),
119-
// CHECK-NEXT: // Label 6: @86
120-
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 7*/ GIMT_Encode4(112), // Rule ID 5 //
119+
// CHECK-NEXT: // Label 6: @{{[0-9]+}}
120+
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 7*/ GIMT_Encode4({{[0-9]+}}), // Rule ID 5 //
121121
// CHECK-NEXT: GIM_CheckSimplePredicate, GIMT_Encode2(GICXXPred_Simple_IsRule5Enabled),
122122
// CHECK-NEXT: GIM_CheckNumOperandsGE, /*MI*/0, /*Expected*/4,
123123
// CHECK-NEXT: GIM_CheckNumOperandsLE, /*MI*/0, /*Expected*/6,
@@ -133,8 +133,8 @@ def MyCombiner: GICombiner<"GenMyCombiner", [
133133
// CHECK-NEXT: GIR_CopyRemaining, /*NewInsnID*/0, /*OldInsnID*/0, /*OpIdx*/2, // b
134134
// CHECK-NEXT: GIR_RootToRootCopy, /*OpIdx*/1, // c
135135
// CHECK-NEXT: GIR_EraseRootFromParent_Done,
136-
// CHECK-NEXT: // Label 7: @112
137-
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 8*/ GIMT_Encode4(126), // Rule ID 0 //
136+
// CHECK-NEXT: // Label 7: @{{[0-9]+}}
137+
// CHECK-NEXT: GIM_Try, /*On fail goto*//*Label 8*/ GIMT_Encode4({{[0-9]+}}), // Rule ID 0 //
138138
// CHECK-NEXT: GIM_CheckSimplePredicate, GIMT_Encode2(GICXXPred_Simple_IsRule0Enabled),
139139
// CHECK-NEXT: GIM_CheckNumOperands, /*MI*/0, /*Expected*/4,
140140
// CHECK-NEXT: // MIs[0] a
@@ -147,9 +147,9 @@ def MyCombiner: GICombiner<"GenMyCombiner", [
147147
// CHECK-NEXT: // No operand predicates
148148
// CHECK-NEXT: // Combiner Rule #0: InstTest0
149149
// CHECK-NEXT: GIR_DoneWithCustomAction, /*Fn*/GIMT_Encode2(GICXXCustomAction_GICombiner0),
150-
// CHECK-NEXT: // Label 8: @126
150+
// CHECK-NEXT: // Label 8: @{{[0-9]+}}
151151
// CHECK-NEXT: GIM_Reject,
152-
// CHECK-NEXT: // Label 2: @127
152+
// CHECK-NEXT: // Label 2: @{{[0-9]+}}
153153
// CHECK-NEXT: GIM_Reject,
154154
// CHECK-NEXT: }; // Size: 128 bytes
155155
// CHECK-NEXT: return MatchTable0;

0 commit comments

Comments
 (0)