This is an archive of the discontinued LLVM Phabricator instance.

Differential D90918

[Arm][MC] Remove unused prefixes in .arch_extension fp tests
ClosedPublic

Authored by DavidSpickett on Nov 6 2020, 2:23 AM.

Details

Reviewers
ostannard
Commits
rG90f0e8765378: [Arm][MC] Remove unused prefixes in .arch_extension fp tests
Summary

idiv: There is no difference between Armv7m and Thumbv7M
behaviour so the specific CHECKs are not needed.
The errors for Armv7-a and Thumbv7-a will always
include "ARM" or "THUMB" respectively so they need their
own CHECK prefix, making CHECK-V7 redundant.

mp: Behaviour is dependent on whether the triple is v6/v7/v7M
regardless of being Arm or Thumb. So we don't need the more
specific CHECK-ARMv7M etc.

simd: Errors are either v7 only, or v7 and v8 so CHECK-V8
is not needed.

fp: Same as simd

Diff Detail

Event Timeline

DavidSpickett created this revision.Nov 6 2020, 2:23 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 6 2020, 2:23 AM
Herald added subscribers: llvm-commits, danielkiss, kristof.beyls. · View Herald Transcript
DavidSpickett requested review of this revision.Nov 6 2020, 2:23 AM
DavidSpickett added a reviewer: ostannard.EditedNov 6 2020, 2:25 AM

I suspect the other directive-arch_extension-*.s might have the same thing so I'll update this if that's the case.

Edit: it is, will update with the rest.

DavidSpickett updated this revision to Diff 303386.Nov 6 2020, 2:45 AM
  • Remove unused prefixes from idiv, simd and mp tests as well.

We could remove --check-prefix CHECK since it's implicit
but I think it helps comprehension a bit here.

Harbormaster completed remote builds in B77849: Diff 303382.Nov 6 2020, 2:49 AM
Harbormaster completed remote builds in B77851: Diff 303386.Nov 6 2020, 3:12 AM
DavidSpickett retitled this revision from [Arm][MC] Remove unused prefix in .arch_extension fp test to [Arm][MC] Remove unused prefixes in .arch_extension fp tests.Nov 6 2020, 6:16 AM
DavidSpickett edited the summary of this revision. (Show Details)
ostannard accepted this revision.Nov 6 2020, 6:28 AM

LGTM

This revision is now accepted and ready to land.Nov 6 2020, 6:28 AM
This revision was landed with ongoing or failed builds.Nov 6 2020, 7:13 AM
Closed by commit rG90f0e8765378: [Arm][MC] Remove unused prefixes in .arch_extension fp tests (authored by DavidSpickett). · Explain Why
This revision was automatically updated to reflect the committed changes.
DavidSpickett added a commit: rG90f0e8765378: [Arm][MC] Remove unused prefixes in .arch_extension fp tests.

Revision Contents

Diff 303446

llvm/test/MC/ARM/directive-arch_extension-fp.s

@ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
@ RUN: not llvm-mc -triple armv8-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv8-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK
@ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
@ RUN: not llvm-mc -triple thumbv8-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv8-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK
.syntax unified .syntax unified
.arch_extension fp .arch_extension fp
@ CHECK-V7: error: architectural extension 'fp' is not allowed for the current base architecture @ CHECK-V7: error: architectural extension 'fp' is not allowed for the current base architecture
@ CHECK-V7-NEXT: .arch_extension fp @ CHECK-V7-NEXT: .arch_extension fp
@ CHECK-V7-NEXT: ^ @ CHECK-V7-NEXT: ^
▲ Show 20 Lines • Show All 267 Lines • Show Last 20 Lines

llvm/test/MC/ARM/directive-arch_extension-idiv.s

@ RUN: not llvm-mc -triple armv6-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv6-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ARMv6 -check-prefix CHECK-V6 @ RUN: | FileCheck %s -check-prefix CHECK-ARMv6 -check-prefix CHECK-V6
@ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ARMv7 -check-prefix CHECK-V7 @ RUN: | FileCheck %s -check-prefix CHECK-ARMv7
@ RUN: not llvm-mc -triple armv7m-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ARMv7M -check-prefix CHECK-V7M @ RUN: | FileCheck %s -check-prefix CHECK-V7M
@ RUN: not llvm-mc -triple thumbv6-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv6-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-THUMBv6 -check-prefix CHECK-V6 @ RUN: | FileCheck %s -check-prefix CHECK-THUMBv6 -check-prefix CHECK-V6
@ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-THUMBv7 -check-prefix CHECK-V7 @ RUN: | FileCheck %s -check-prefix CHECK-THUMBv7
@ RUN: not llvm-mc -triple thumbv7m-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-THUMBv7M -check-prefix CHECK-V7M @ RUN: | FileCheck %s -check-prefix CHECK-V7M
.syntax unified .syntax unified
.arch_extension idiv .arch_extension idiv
@ CHECK-V6: error: architectural extension 'idiv' is not allowed for the current base architecture @ CHECK-V6: error: architectural extension 'idiv' is not allowed for the current base architecture
@ CHECK-V6-NEXT: .arch_extension idiv @ CHECK-V6-NEXT: .arch_extension idiv
@ CHECK-V6-NEXT: ^ @ CHECK-V6-NEXT: ^
@ CHECK-V7M: error: architectural extension 'idiv' is not allowed for the current base architecture @ CHECK-V7M: error: architectural extension 'idiv' is not allowed for the current base architecture
Show All 33 Lines

llvm/test/MC/ARM/directive-arch_extension-mp.s

@ RUN: not llvm-mc -triple armv6-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv6-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ARMv6 -check-prefix CHECK-V6 @ RUN: | FileCheck %s -check-prefix CHECK-V6
@ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ARMv7 -check-prefix CHECK-V7 @ RUN: | FileCheck %s -check-prefix CHECK-V7
@ RUN: not llvm-mc -triple armv7m-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ARMv7M -check-prefix CHECK-V7M @ RUN: | FileCheck %s -check-prefix CHECK-V7M
@ RUN: not llvm-mc -triple thumbv6-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv6-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-THUMBv6 -check-prefix CHECK-V6 @ RUN: | FileCheck %s -check-prefix CHECK-V6
@ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-THUMBv7 -check-prefix CHECK-V7 @ RUN: | FileCheck %s -check-prefix CHECK-V7
@ RUN: not llvm-mc -triple thumbv7m-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-THUMBv7M -check-prefix CHECK-V7M @ RUN: | FileCheck %s -check-prefix CHECK-V7M
.syntax unified .syntax unified
.arch_extension mp .arch_extension mp
@ CHECK-V6: error: architectural extension 'mp' is not allowed for the current base architecture @ CHECK-V6: error: architectural extension 'mp' is not allowed for the current base architecture
@ CHECK-V6-NEXT: .arch_extension mp @ CHECK-V6-NEXT: .arch_extension mp
@ CHECK-V6-NEXT: ^ @ CHECK-V6-NEXT: ^
Show All 18 Lines

llvm/test/MC/ARM/directive-arch_extension-simd.s

@ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
@ RUN: not llvm-mc -triple armv8-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple armv8-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK
@ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
@ RUN: not llvm-mc -triple thumbv8-eabi -filetype asm -o /dev/null 2>&1 %s \ @ RUN: not llvm-mc -triple thumbv8-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK @ RUN: | FileCheck %s -check-prefix CHECK
.syntax unified .syntax unified
.arch_extension simd .arch_extension simd
@ CHECK-V7: error: architectural extension 'simd' is not allowed for the current base architecture @ CHECK-V7: error: architectural extension 'simd' is not allowed for the current base architecture
@ CHECK-V7-NEXT: .arch_extension simd @ CHECK-V7-NEXT: .arch_extension simd
@ CHECK-V7-NEXT: ^ @ CHECK-V7-NEXT: ^
▲ Show 20 Lines • Show All 211 Lines • Show Last 20 Lines