[PATCH] D75437: [AVR] Fix incorrect register state for LDRdPtr

[Jim Lin via Phabricator via llvm-commits]

Jim created this revision.
Jim added a reviewer: dylanmckay.
Herald added subscribers: llvm-commits, hiraditya.
Herald added a project: LLVM.

LDRdPtr expanded from LDWRdPtr shouldn't define its second operand(SrcReg).
The second operand is its source register.
Add -verify-machineinstrs into command line of testcases can trigger this error.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D75437

Files:
  llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp
  llvm/test/CodeGen/AVR/PR37143.ll
  llvm/test/CodeGen/AVR/load.ll
  llvm/test/CodeGen/AVR/pseudo/LDWRdPtr.mir


Index: llvm/test/CodeGen/AVR/pseudo/LDWRdPtr.mir
===================================================================
--- llvm/test/CodeGen/AVR/pseudo/LDWRdPtr.mir
+++ llvm/test/CodeGen/AVR/pseudo/LDWRdPtr.mir
@@ -17,7 +17,7 @@
 
     ; CHECK-LABEL: test_ldwrdptr
 
-    ; CHECK:      $r0, $r31r30 = LDRdPtr
+    ; CHECK:               $r0 = LDRdPtr $r31r30
     ; CHECK-NEXT:          $r1 = LDDRdPtrQ $r31r30, 1
 
     $r1r0 = LDWRdPtr $r31r30
Index: llvm/test/CodeGen/AVR/load.ll
===================================================================
--- llvm/test/CodeGen/AVR/load.ll
+++ llvm/test/CodeGen/AVR/load.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mattr=avr6,sram < %s -march=avr | FileCheck %s
+; RUN: llc -mattr=avr6,sram < %s -march=avr -verify-machineinstrs | FileCheck %s
 
 define i8 @load8(i8* %x) {
 ; CHECK-LABEL: load8:
Index: llvm/test/CodeGen/AVR/PR37143.ll
===================================================================
--- llvm/test/CodeGen/AVR/PR37143.ll
+++ llvm/test/CodeGen/AVR/PR37143.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mattr=avr6,sram < %s -march=avr | FileCheck %s
+; RUN: llc -mattr=avr6,sram < %s -march=avr -verify-machineinstrs | FileCheck %s
 
 ; CHECK: ld {{r[0-9]+}}, [[PTR:[XYZ]]]
 ; CHECK: ldd {{r[0-9]+}}, [[PTR]]+1
Index: llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp
===================================================================
--- llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp
+++ llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp
@@ -598,7 +598,7 @@
   // Load low byte.
   auto MIBLO = buildMI(MBB, MBBI, OpLo)
     .addReg(CurDstLoReg, RegState::Define)
-    .addReg(SrcReg, RegState::Define);
+    .addReg(SrcReg);
 
   // Push low byte onto stack if necessary.
   if (TmpReg)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75437.247563.patch
Type: text/x-patch
Size: 1715 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200302/2392e4be/attachment.bin>