Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AVR] Reformat MC tests #107068

Merged
merged 1 commit into from
Sep 6, 2024
Merged

[AVR] Reformat MC tests #107068

merged 1 commit into from
Sep 6, 2024

Conversation

Patryk27
Copy link
Contributor

@Patryk27 Patryk27 commented Sep 3, 2024

This is just a small refactoring extracted from #102936 - it's mostly adjusting the tests to common format, but we're also changing invocations of llvm-objdump from -d to -dr, so that we know when we generate relocations.

(i.e. relative jumps don't generate relocations at the moment, but will start soon™️ and we'll have those tests as proofs)

cc @benshi001

@llvmbot llvmbot added the mc Machine (object) code label Sep 3, 2024
@llvmbot
Copy link
Member

llvmbot commented Sep 3, 2024

@llvm/pr-subscribers-mc

Author: Patryk Wychowaniec (Patryk27)

Changes

This is just a small refactoring extracted from #102936 - it's mostly adjusting the tests to common format, but we're also changing invocations of llvm-objdump from -d to -dr, so that we know when we generate relocations.

(i.e. relative jumps don't generate relocations at the moment, but will start soon™️ and we'll have those tests as proofs)

cc @benshi001

Patch is 58.91 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/107068.diff

110 Files Affected:

  • (modified) llvm/test/MC/AVR/hex-immediates.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-adc.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-add.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-adiw.s (-2)
  • (modified) llvm/test/MC/AVR/inst-and.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-andi.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-asr.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-bld.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-brbc.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brbs.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brcc.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brcs.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-break.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-breq.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brge.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brhc.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brhs.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brid.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brie.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brlo.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brlt.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brmi.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brne.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brpl.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brsh.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brtc.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brts.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brvc.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-brvs.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-bst.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-call.s (-2)
  • (modified) llvm/test/MC/AVR/inst-cbi.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-cbr.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-clr.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-com.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-cp.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-cpc.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-cpi.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-cpse.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-dec.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-des.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-eicall.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-eijmp.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-elpm.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-eor.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-family-set-clr-flag.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-fmul.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-fmuls.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-fmulsu.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-icall.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-ijmp.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-in.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-inc.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-jmp.s (-2)
  • (modified) llvm/test/MC/AVR/inst-lac.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-las.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-lat.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-ld.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-ldd.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-ldi.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-lds.s (-1)
  • (modified) llvm/test/MC/AVR/inst-lpm.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-lsl.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-lsr.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-mov.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-movw.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-mul.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-muls.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-mulsu.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-neg.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-nop.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-or.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-ori.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-out.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-pop.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-push.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-rcall.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-ret.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-reti.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-rjmp.s (+1-1)
  • (modified) llvm/test/MC/AVR/inst-rol.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-ror.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-sbc.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-sbci.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-sbi.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-sbic.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-sbis.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-sbiw.s (-2)
  • (modified) llvm/test/MC/AVR/inst-sbr.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-sbrc.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-sbrs.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-ser.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-sleep.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-spm.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-st.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-std.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-sts.s (-2)
  • (modified) llvm/test/MC/AVR/inst-sub.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-subi.s (+1-2)
  • (modified) llvm/test/MC/AVR/inst-swap.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-tst.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-wdr.s (+1-3)
  • (modified) llvm/test/MC/AVR/inst-xch.s (+1-3)
  • (modified) llvm/test/MC/AVR/modifiers.s (-14)
  • (modified) llvm/test/MC/AVR/registers.s (+1-1)
  • (modified) llvm/test/MC/AVR/relocations-abs.s (+1-1)
  • (modified) llvm/test/MC/AVR/relocations.s (+1)
  • (modified) llvm/test/MC/AVR/separator.s (+1-2)
  • (modified) llvm/test/MC/AVR/syntax-reg-int-literal.s (-1)
  • (modified) llvm/test/MC/AVR/syntax-reg-pair.s (-1)
diff --git a/llvm/test/MC/AVR/hex-immediates.s b/llvm/test/MC/AVR/hex-immediates.s
index a6ff541a9ac947..7819b7f5f6afd6 100644
--- a/llvm/test/MC/AVR/hex-immediates.s
+++ b/llvm/test/MC/AVR/hex-immediates.s
@@ -1,6 +1,6 @@
 ; RUN: llvm-mc -filetype=obj -triple=avr %s -o %t
 ; RUN: llvm-objdump --no-print-imm-hex -d %t | FileCheck %s --check-prefix=DEC
-; RUN: llvm-objdump -d --print-imm-hex %t | FileCheck %s --check-prefix=HEX
+; RUN: llvm-objdump -dr --print-imm-hex %t | FileCheck %s --check-prefix=HEX
 
 ; DEC: ldi r24, 66
 ; HEX: ldi r24, 0x42
diff --git a/llvm/test/MC/AVR/inst-adc.s b/llvm/test/MC/AVR/inst-adc.s
index d1157bc7a9b3ba..6f29577377b27c 100644
--- a/llvm/test/MC/AVR/inst-adc.s
+++ b/llvm/test/MC/AVR/inst-adc.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   adc r0,  r15
   adc r15, r0
   adc r16, r31
diff --git a/llvm/test/MC/AVR/inst-add.s b/llvm/test/MC/AVR/inst-add.s
index 49ad5de80c06b9..828f4cf0cc3bd2 100644
--- a/llvm/test/MC/AVR/inst-add.s
+++ b/llvm/test/MC/AVR/inst-add.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   add r0,  r15
   add r15, r0
   add r16, r31
diff --git a/llvm/test/MC/AVR/inst-adiw.s b/llvm/test/MC/AVR/inst-adiw.s
index 7904965a51d68d..6b83027234c11c 100644
--- a/llvm/test/MC/AVR/inst-adiw.s
+++ b/llvm/test/MC/AVR/inst-adiw.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -mattr=addsubiw -show-encoding < %s | FileCheck %s
 ; RUN: llvm-mc -filetype=obj -triple avr -mattr=addsubiw < %s | llvm-objdump --no-print-imm-hex -dr --mattr=addsubiw - | FileCheck --check-prefix=CHECK-INST %s
 
-
 foo:
-
   adiw r26,  12
   adiw r26,  63
 
diff --git a/llvm/test/MC/AVR/inst-and.s b/llvm/test/MC/AVR/inst-and.s
index c4d90bfba37477..aa62a3114a204b 100644
--- a/llvm/test/MC/AVR/inst-and.s
+++ b/llvm/test/MC/AVR/inst-and.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   and r0,  r15
   and r15, r0
   and r16, r31
diff --git a/llvm/test/MC/AVR/inst-andi.s b/llvm/test/MC/AVR/inst-andi.s
index 96a090173bd786..14f85bbd660100 100644
--- a/llvm/test/MC/AVR/inst-andi.s
+++ b/llvm/test/MC/AVR/inst-andi.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   andi r16, 255
   andi r29, 190
   andi r22, 172
diff --git a/llvm/test/MC/AVR/inst-asr.s b/llvm/test/MC/AVR/inst-asr.s
index 1b59d027dc2bcc..0fedf9b5ac121c 100644
--- a/llvm/test/MC/AVR/inst-asr.s
+++ b/llvm/test/MC/AVR/inst-asr.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck -check-prefix=CHECK-INST %s
 
 foo:
-
   asr r31
   asr r25
   asr r5
diff --git a/llvm/test/MC/AVR/inst-bld.s b/llvm/test/MC/AVR/inst-bld.s
index 71352c5c0abd80..1dbd6815448c4e 100644
--- a/llvm/test/MC/AVR/inst-bld.s
+++ b/llvm/test/MC/AVR/inst-bld.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   bld r3, 5
   bld r1, 1
   bld r0, 0
diff --git a/llvm/test/MC/AVR/inst-brbc.s b/llvm/test/MC/AVR/inst-brbc.s
index 3ef3664cf07bfc..4edbbfd8580248 100644
--- a/llvm/test/MC/AVR/inst-brbc.s
+++ b/llvm/test/MC/AVR/inst-brbc.s
@@ -1,6 +1,6 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - | FileCheck --check-prefix=INST %s
+; RUN:     | llvm-objdump -dr - | FileCheck --check-prefix=INST %s
 
 foo:
   brbc 3, .+8
diff --git a/llvm/test/MC/AVR/inst-brbs.s b/llvm/test/MC/AVR/inst-brbs.s
index f15a779a53654f..3f4b134aef682c 100644
--- a/llvm/test/MC/AVR/inst-brbs.s
+++ b/llvm/test/MC/AVR/inst-brbs.s
@@ -1,6 +1,6 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - | FileCheck --check-prefix=INST %s
+; RUN:     | llvm-objdump -dr - | FileCheck --check-prefix=INST %s
 
 foo:
   brbs 3, .+8
diff --git a/llvm/test/MC/AVR/inst-brcc.s b/llvm/test/MC/AVR/inst-brcc.s
index d9218bc61e787f..dd1b2b11a6d306 100644
--- a/llvm/test/MC/AVR/inst-brcc.s
+++ b/llvm/test/MC/AVR/inst-brcc.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brcs.s b/llvm/test/MC/AVR/inst-brcs.s
index 0012cb31f61269..3fafccdb49257c 100644
--- a/llvm/test/MC/AVR/inst-brcs.s
+++ b/llvm/test/MC/AVR/inst-brcs.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-break.s b/llvm/test/MC/AVR/inst-break.s
index a1bfde93c5a0d7..10e7ea584a3400 100644
--- a/llvm/test/MC/AVR/inst-break.s
+++ b/llvm/test/MC/AVR/inst-break.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -mattr=break -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr -mattr=break < %s | llvm-objdump -d --mattr=break - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr -mattr=break < %s | llvm-objdump -dr --mattr=break - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   break
 
 ; CHECK: break                  ; encoding: [0x98,0x95]
diff --git a/llvm/test/MC/AVR/inst-breq.s b/llvm/test/MC/AVR/inst-breq.s
index f82010f02ba617..7a6eac6f01ad07 100644
--- a/llvm/test/MC/AVR/inst-breq.s
+++ b/llvm/test/MC/AVR/inst-breq.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brge.s b/llvm/test/MC/AVR/inst-brge.s
index 1121284a114689..6cf79db4dbd659 100644
--- a/llvm/test/MC/AVR/inst-brge.s
+++ b/llvm/test/MC/AVR/inst-brge.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brhc.s b/llvm/test/MC/AVR/inst-brhc.s
index eb16ac2ef7a64e..924895e4bf5df1 100644
--- a/llvm/test/MC/AVR/inst-brhc.s
+++ b/llvm/test/MC/AVR/inst-brhc.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brhs.s b/llvm/test/MC/AVR/inst-brhs.s
index 77c49596b3b0b8..9704ce5e7e5ac2 100644
--- a/llvm/test/MC/AVR/inst-brhs.s
+++ b/llvm/test/MC/AVR/inst-brhs.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brid.s b/llvm/test/MC/AVR/inst-brid.s
index 70d0ea83c49b2a..e03c293677887b 100644
--- a/llvm/test/MC/AVR/inst-brid.s
+++ b/llvm/test/MC/AVR/inst-brid.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brie.s b/llvm/test/MC/AVR/inst-brie.s
index 717c686e2ed44e..74b724b20bd9e7 100644
--- a/llvm/test/MC/AVR/inst-brie.s
+++ b/llvm/test/MC/AVR/inst-brie.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brlo.s b/llvm/test/MC/AVR/inst-brlo.s
index 4b56d66ffdfe00..2726d943e0e788 100644
--- a/llvm/test/MC/AVR/inst-brlo.s
+++ b/llvm/test/MC/AVR/inst-brlo.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brlt.s b/llvm/test/MC/AVR/inst-brlt.s
index 8a7c543f9444b1..299a873963e5b3 100644
--- a/llvm/test/MC/AVR/inst-brlt.s
+++ b/llvm/test/MC/AVR/inst-brlt.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brmi.s b/llvm/test/MC/AVR/inst-brmi.s
index 878612d294dd95..96f7e484f465f3 100644
--- a/llvm/test/MC/AVR/inst-brmi.s
+++ b/llvm/test/MC/AVR/inst-brmi.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brne.s b/llvm/test/MC/AVR/inst-brne.s
index 9d6bee4b754d95..ab89d516681d34 100644
--- a/llvm/test/MC/AVR/inst-brne.s
+++ b/llvm/test/MC/AVR/inst-brne.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brpl.s b/llvm/test/MC/AVR/inst-brpl.s
index 393365ee35339e..cd2f697ae8f209 100644
--- a/llvm/test/MC/AVR/inst-brpl.s
+++ b/llvm/test/MC/AVR/inst-brpl.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brsh.s b/llvm/test/MC/AVR/inst-brsh.s
index 0bacd64d3d8d05..b066c917f72aec 100644
--- a/llvm/test/MC/AVR/inst-brsh.s
+++ b/llvm/test/MC/AVR/inst-brsh.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brtc.s b/llvm/test/MC/AVR/inst-brtc.s
index eb4ee211628721..64421df10baf5a 100644
--- a/llvm/test/MC/AVR/inst-brtc.s
+++ b/llvm/test/MC/AVR/inst-brtc.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brts.s b/llvm/test/MC/AVR/inst-brts.s
index ccd794a9225894..bb02b6f3d475dc 100644
--- a/llvm/test/MC/AVR/inst-brts.s
+++ b/llvm/test/MC/AVR/inst-brts.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brvc.s b/llvm/test/MC/AVR/inst-brvc.s
index 573f779c0dcd6a..52b9f3b9b403cf 100644
--- a/llvm/test/MC/AVR/inst-brvc.s
+++ b/llvm/test/MC/AVR/inst-brvc.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-brvs.s b/llvm/test/MC/AVR/inst-brvs.s
index d50a1a9ec5b62f..10382a8e6fd67e 100644
--- a/llvm/test/MC/AVR/inst-brvs.s
+++ b/llvm/test/MC/AVR/inst-brvs.s
@@ -1,7 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
 ;
 ; RUN: llvm-mc -filetype=obj -triple avr < %s \
-; RUN:     | llvm-objdump -d - \
+; RUN:     | llvm-objdump -dr - \
 ; RUN:     | FileCheck --check-prefix=INST %s
 
 foo:
diff --git a/llvm/test/MC/AVR/inst-bst.s b/llvm/test/MC/AVR/inst-bst.s
index e97454c497681d..1f5fccf2db7825 100644
--- a/llvm/test/MC/AVR/inst-bst.s
+++ b/llvm/test/MC/AVR/inst-bst.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   bst r3, 5
   bst r1, 1
   bst r0, 0
diff --git a/llvm/test/MC/AVR/inst-call.s b/llvm/test/MC/AVR/inst-call.s
index 5ded5e1de6a1b1..491a38346bbe0d 100644
--- a/llvm/test/MC/AVR/inst-call.s
+++ b/llvm/test/MC/AVR/inst-call.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -mattr=jmpcall -show-encoding < %s | FileCheck %s
 ; RUN: llvm-mc -filetype=obj -triple avr -mattr=jmpcall < %s | llvm-objdump --no-print-imm-hex -dr --mattr=jmpcall - | FileCheck -check-prefix=CHECK-INST %s
 
-
 foo:
-
   call  4096
   call  -124
   call   -12
diff --git a/llvm/test/MC/AVR/inst-cbi.s b/llvm/test/MC/AVR/inst-cbi.s
index f92435347f310a..6fa9c46960fcd3 100644
--- a/llvm/test/MC/AVR/inst-cbi.s
+++ b/llvm/test/MC/AVR/inst-cbi.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -d - | FileCheck -check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -dr - | FileCheck -check-prefix=CHECK-INST %s
 
 foo:
-
   cbi 3, 5
   cbi 1, 1
   cbi 7, 2
diff --git a/llvm/test/MC/AVR/inst-cbr.s b/llvm/test/MC/AVR/inst-cbr.s
index 12e9a9d10d2871..dc07bc0b3e9421 100644
--- a/llvm/test/MC/AVR/inst-cbr.s
+++ b/llvm/test/MC/AVR/inst-cbr.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   cbr r17, 208
   cbr r24, 190
   cbr r20, 173
diff --git a/llvm/test/MC/AVR/inst-clr.s b/llvm/test/MC/AVR/inst-clr.s
index d5966ae8e0953d..65b1a0604bf801 100644
--- a/llvm/test/MC/AVR/inst-clr.s
+++ b/llvm/test/MC/AVR/inst-clr.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   clr r2
   clr r12
   clr r5
diff --git a/llvm/test/MC/AVR/inst-com.s b/llvm/test/MC/AVR/inst-com.s
index 43e3b0a96ccd76..a2b6f211d19938 100644
--- a/llvm/test/MC/AVR/inst-com.s
+++ b/llvm/test/MC/AVR/inst-com.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck -check-prefix=CHECK-INST %s
 
 foo:
-
   com r30
   com r17
   com r4
diff --git a/llvm/test/MC/AVR/inst-cp.s b/llvm/test/MC/AVR/inst-cp.s
index 68c363046bb9d2..97c2b94fe21e93 100644
--- a/llvm/test/MC/AVR/inst-cp.s
+++ b/llvm/test/MC/AVR/inst-cp.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   cp r12, r2
   cp r19, r0
   cp r15, r31
diff --git a/llvm/test/MC/AVR/inst-cpc.s b/llvm/test/MC/AVR/inst-cpc.s
index 04c96b1d814177..b7e696c720cc81 100644
--- a/llvm/test/MC/AVR/inst-cpc.s
+++ b/llvm/test/MC/AVR/inst-cpc.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   cp r13, r12
   cp r20, r0
   cp r10, r31
diff --git a/llvm/test/MC/AVR/inst-cpi.s b/llvm/test/MC/AVR/inst-cpi.s
index f0ef2c4aa43d73..e17b505e791c54 100644
--- a/llvm/test/MC/AVR/inst-cpi.s
+++ b/llvm/test/MC/AVR/inst-cpi.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump --no-print-imm-hex -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   cpi r16, 241
   cpi r29, 190
   cpi r22, 172
diff --git a/llvm/test/MC/AVR/inst-cpse.s b/llvm/test/MC/AVR/inst-cpse.s
index 209491ec70c676..4a9f2a7ece1a12 100644
--- a/llvm/test/MC/AVR/inst-cpse.s
+++ b/llvm/test/MC/AVR/inst-cpse.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   cpse r2, r13
   cpse r9, r0
   cpse r5, r31
diff --git a/llvm/test/MC/AVR/inst-dec.s b/llvm/test/MC/AVR/inst-dec.s
index c419f7f97ee46e..57140ede17481a 100644
--- a/llvm/test/MC/AVR/inst-dec.s
+++ b/llvm/test/MC/AVR/inst-dec.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -dr - | FileCheck -check-prefix=CHECK-INST %s
 
 foo:
-
   dec r26
   dec r3
   dec r24
diff --git a/llvm/test/MC/AVR/inst-des.s b/llvm/test/MC/AVR/inst-des.s
index 746e6f2e07f33e..14576f994e4851 100644
--- a/llvm/test/MC/AVR/inst-des.s
+++ b/llvm/test/MC/AVR/inst-des.s
@@ -1,9 +1,7 @@
 ; RUN: llvm-mc -triple avr -mattr=des -show-encoding < %s | FileCheck %s
-; RUN: llvm-mc -filetype=obj -triple avr -mattr=des < %s | llvm-objdump --no-print-imm-hex -d --mattr=des - | FileCheck --check-prefix=CHECK-INST %s
-
+; RUN: llvm-mc -filetype=obj -triple avr -mattr=des < %s | llvm-objdump --no-print-imm-hex -dr --mattr=des - | FileCheck --check-prefix=CHECK-INST %s
 
 foo:
-
   des 0
   des 6
   des 1
diff --git a/llvm/test/MC/AVR/inst-eicall.s b/llvm/...
[truncated]

@benshi001 benshi001 self-requested a review September 6, 2024 07:12
benshi001
benshi001 approved these changes Sep 6, 2024
View reviewed changes
Copy link
Member

@benshi001 benshi001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM！

@benshi001 benshi001 merged commit 6fb39e4 into llvm:main Sep 6, 2024
10 checks passed
@Patryk27 Patryk27 deleted the fix-102436-reformat branch September 6, 2024 23:07
VitaNuo pushed a commit to VitaNuo/llvm-project that referenced this pull request Sep 12, 2024
@Patryk27 @VitaNuo
[AVR][NFC] Reformat MC tests (llvm#107068)
78c10ec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benshi001 benshi001 benshi001 approved these changes

Assignees
No one assigned
Labels
mc Machine (object) code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Patryk27 @llvmbot @benshi001