[PATCH] D136073: [LoongArch] Modify ParserMethod for the simm26_b operand type

[wanglei via Phabricator via llvm-commits]

wangleiat updated this revision to Diff 468397.
wangleiat added a comment.

Address xen0n's comments.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D136073/new/

https://reviews.llvm.org/D136073

Files:
  llvm/lib/Target/LoongArch/LoongArchInstrInfo.td
  llvm/test/CodeGen/LoongArch/blockaddress-symbol.ll


Index: llvm/test/CodeGen/LoongArch/blockaddress-symbol.ll
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/LoongArch/blockaddress-symbol.ll
@@ -0,0 +1,25 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc --mtriple=loongarch32 < %s | FileCheck %s
+; RUN: llc --mtriple=loongarch64 < %s | FileCheck %s
+; RUN: llc --mtriple=loongarch32 --no-integrated-as < %s | FileCheck %s
+; RUN: llc --mtriple=loongarch64 --no-integrated-as < %s | FileCheck %s
+
+;; This regression test is for ensuring the AsmParser does not use the
+;; getOrCreateSymbol interface to create blockaddress symbols.
+;; Otherwise incorrect symbols will be created:
+;; `.Ltmp0` -> `.Ltmp00`.
+
+define void @operand_block_address() nounwind {
+; CHECK-LABEL: operand_block_address:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    #APP
+; CHECK-NEXT:    b .Ltmp0
+; CHECK-NEXT:    #NO_APP
+; CHECK-NEXT:  .Ltmp0: # Block address taken
+; CHECK-NEXT:  # %bb.1: # %bb
+; CHECK-NEXT:    ret
+  call void asm sideeffect "b $0", "i"(i8* blockaddress(@operand_block_address, %bb))
+  br label %bb
+bb:
+  ret void
+}
Index: llvm/lib/Target/LoongArch/LoongArchInstrInfo.td
===================================================================
--- llvm/lib/Target/LoongArch/LoongArchInstrInfo.td
+++ llvm/lib/Target/LoongArch/LoongArchInstrInfo.td
@@ -202,24 +202,32 @@
   let DecoderMethod = "decodeSImmOperand<21, 2>";
 }
 
-// TODO: Need split the ParserMethod/PredicateMethod for call/jump/tailcall.
-def SImm26Operand: AsmOperandClass {
-  let Name = "SImm26Operand";
+def SImm26OperandB: AsmOperandClass {
+  let Name = "SImm26OperandB";
+  let PredicateMethod = "isSImm26Operand";
   let RenderMethod = "addImmOperands";
   let DiagnosticType = "InvalidSImm26Operand";
-  let ParserMethod = "parseSImm26Operand";
+  let ParserMethod = "parseImmediate";
 }
 
 // A symbol or an imm used in B/PseudoBR.
 def simm26_b : Operand<OtherVT> {
-  let ParserMatchClass = SImm26Operand;
+  let ParserMatchClass = SImm26OperandB;
   let EncoderMethod = "getImmOpValueAsr2";
   let DecoderMethod = "decodeSImmOperand<26, 2>";
 }
 
+def SImm26OperandBL: AsmOperandClass {
+  let Name = "SImm26OperandBL";
+  let PredicateMethod = "isSImm26Operand";
+  let RenderMethod = "addImmOperands";
+  let DiagnosticType = "InvalidSImm26Operand";
+  let ParserMethod = "parseSImm26Operand";
+}
+
 // A symbol or an imm used in BL/PseudoCALL.
 def simm26_bl : Operand<GRLenVT> {
-  let ParserMatchClass = SImm26Operand;
+  let ParserMatchClass = SImm26OperandBL;
   let EncoderMethod = "getImmOpValueAsr2";
   let DecoderMethod = "decodeSImmOperand<26, 2>";
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D136073.468397.patch
Type: text/x-patch
Size: 2695 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221018/23db364c/attachment.bin>