From dc732f5e40fd6a9d6e5ae8b2388624c5f809c050 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 11 Sep 2025 10:31:56 -0700 Subject: [PATCH 1/2] [tablegen][test] Make additional-encoding.td more reliable --- .../FixedLenDecoderEmitter/additional-encoding.td | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td b/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td index ec7e35e1ecac7..b9bf7e462888f 100644 --- a/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td +++ b/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td @@ -35,22 +35,22 @@ class I : Instruction { // CHECK-NEXT: /* 7 */ MCD::OPC_Scope, 8, 0, // Skip to: 18 // CHECK-NEXT: /* 10 */ MCD::OPC_CheckField, 6, 6, 0, // CHECK-NEXT: /* 14 */ MCD::OPC_Decode, {{[0-9]+}}, 2, 0, // Opcode: {{.*}}:NOP, DecodeIdx: 0 -// CHECK-NEXT: /* 18 */ MCD::OPC_TryDecode, 187, 2, 1, +// CHECK-NEXT: /* 18 */ MCD::OPC_TryDecode, {{[0-9]+}}, 2, 1, // CHECK-NEXT: /* 22 */ MCD::OPC_FilterValueOrSkip, 1, 15, 0, // Skip to: 41 // CHECK-NEXT: /* 26 */ MCD::OPC_Scope, 8, 0, // Skip to: 37 // CHECK-NEXT: /* 29 */ MCD::OPC_CheckField, 6, 6, 0, // CHECK-NEXT: /* 33 */ MCD::OPC_Decode, {{[0-9]+}}, 2, 0, // Opcode: {{.*}}:NOP, DecodeIdx: 0 -// CHECK-NEXT: /* 37 */ MCD::OPC_TryDecode, 188, 2, 1, +// CHECK-NEXT: /* 37 */ MCD::OPC_TryDecode, {{0-9]+}}, 2, 1, // CHECK-NEXT: /* 41 */ MCD::OPC_FilterValueOrSkip, 2, 15, 0, // Skip to: 60 // CHECK-NEXT: /* 45 */ MCD::OPC_Scope, 8, 0, // Skip to: 56 // CHECK-NEXT: /* 48 */ MCD::OPC_CheckField, 6, 6, 0, // CHECK-NEXT: /* 52 */ MCD::OPC_Decode, {{[0-9]+}}, 2, 0, // Opcode: {{.*}}:NOP, DecodeIdx: 0 -// CHECK-NEXT: /* 56 */ MCD::OPC_TryDecode, 189, 2, 1, +// CHECK-NEXT: /* 56 */ MCD::OPC_TryDecode, {{[0-9]+}}, 2, 1, // CHECK-NEXT: /* 60 */ MCD::OPC_FilterValue, 3, // CHECK-NEXT: /* 62 */ MCD::OPC_Scope, 8, 0, // Skip to: 73 // CHECK-NEXT: /* 65 */ MCD::OPC_CheckField, 6, 6, 0, // CHECK-NEXT: /* 69 */ MCD::OPC_Decode, {{[0-9]+}}, 2, 0, // Opcode: {{.*}}:NOP, DecodeIdx: 0 -// CHECK-NEXT: /* 73 */ MCD::OPC_TryDecode, 190, 2, 1, +// CHECK-NEXT: /* 73 */ MCD::OPC_TryDecode, {{0-9]+}}, 2, 1, class SHIFT opc> : I<(outs), (ins ShAmtOp:$shamt)>, EncSHIFT; From b359b19982778186cb8e58fa88f48fb91ed05982 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 11 Sep 2025 14:44:15 -0700 Subject: [PATCH 2/2] fix typo --- .../TableGen/FixedLenDecoderEmitter/additional-encoding.td | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td b/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td index b9bf7e462888f..47c9335f6cdf2 100644 --- a/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td +++ b/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td @@ -40,7 +40,7 @@ class I : Instruction { // CHECK-NEXT: /* 26 */ MCD::OPC_Scope, 8, 0, // Skip to: 37 // CHECK-NEXT: /* 29 */ MCD::OPC_CheckField, 6, 6, 0, // CHECK-NEXT: /* 33 */ MCD::OPC_Decode, {{[0-9]+}}, 2, 0, // Opcode: {{.*}}:NOP, DecodeIdx: 0 -// CHECK-NEXT: /* 37 */ MCD::OPC_TryDecode, {{0-9]+}}, 2, 1, +// CHECK-NEXT: /* 37 */ MCD::OPC_TryDecode, {{[0-9]+}}, 2, 1, // CHECK-NEXT: /* 41 */ MCD::OPC_FilterValueOrSkip, 2, 15, 0, // Skip to: 60 // CHECK-NEXT: /* 45 */ MCD::OPC_Scope, 8, 0, // Skip to: 56 // CHECK-NEXT: /* 48 */ MCD::OPC_CheckField, 6, 6, 0, @@ -50,7 +50,7 @@ class I : Instruction { // CHECK-NEXT: /* 62 */ MCD::OPC_Scope, 8, 0, // Skip to: 73 // CHECK-NEXT: /* 65 */ MCD::OPC_CheckField, 6, 6, 0, // CHECK-NEXT: /* 69 */ MCD::OPC_Decode, {{[0-9]+}}, 2, 0, // Opcode: {{.*}}:NOP, DecodeIdx: 0 -// CHECK-NEXT: /* 73 */ MCD::OPC_TryDecode, {{0-9]+}}, 2, 1, +// CHECK-NEXT: /* 73 */ MCD::OPC_TryDecode, {{[0-9]+}}, 2, 1, class SHIFT opc> : I<(outs), (ins ShAmtOp:$shamt)>, EncSHIFT;