Skip to content

Commit c5d68ca

Browse files
committed
[AArch64] Fix subtarget features for tests. NFC
These tests were using instructions that require feature predicates that were not enabled.
1 parent a4b6c28 commit c5d68ca

20 files changed

+25
-25
lines changed

llvm/test/CodeGen/AArch64/GlobalISel/arm64-atomic.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
; RUN: llc < %s -mtriple=arm64-apple-ios -global-isel -global-isel-abort=1 -O0 -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-NOLSE,CHECK-NOLSE-O0
44
; RUN: llc < %s -mtriple=arm64-apple-ios -global-isel -global-isel-abort=1 -mcpu=apple-a13 -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-LSE-O1
55
; RUN: llc < %s -mtriple=arm64-apple-ios -global-isel -global-isel-abort=1 -mcpu=apple-a13 -O0 -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-LSE-O0
6-
; RUN: llc < %s -mtriple=arm64-apple-ios -global-isel -global-isel-abort=1 -mattr=+ldapr -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-LDAPR-O1
7-
; RUN: llc < %s -mtriple=arm64-apple-ios -global-isel -global-isel-abort=1 -mattr=+ldapr -O0 -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-LDAPR-O0
6+
; RUN: llc < %s -mtriple=arm64-apple-ios -global-isel -global-isel-abort=1 -mattr=+rcpc,+ldapr -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-LDAPR-O1
7+
; RUN: llc < %s -mtriple=arm64-apple-ios -global-isel -global-isel-abort=1 -mattr=+rcpc,+ldapr -O0 -verify-machineinstrs | FileCheck %s --check-prefixes=CHECK-LDAPR-O0
88

99
define i32 @val_compare_and_swap(i32* %p, i32 %cmp, i32 %new) #0 {
1010
; CHECK-NOLSE-O1-LABEL: val_compare_and_swap:

llvm/test/CodeGen/AArch64/GlobalISel/regbank-extract.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
2-
# RUN: llc -mtriple=aarch64-unknown-unknown -verify-machineinstrs -O0 -run-pass=regbankselect %s -o - | FileCheck %s
2+
# RUN: llc -mtriple=aarch64-unknown-unknown -mattr=+lse -verify-machineinstrs -O0 -run-pass=regbankselect %s -o - | FileCheck %s
33
---
44
name: extract_s64_s128
55
alignment: 4

llvm/test/CodeGen/AArch64/GlobalISel/select-intrinsic-crypto-aesmc.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
2-
# RUN: llc -mtriple=aarch64-- -mattr=+fuse-aes -run-pass=instruction-select -verify-machineinstrs %s -o - | FileCheck %s
2+
# RUN: llc -mtriple=aarch64-- -mattr=+aes,+fuse-aes -run-pass=instruction-select -verify-machineinstrs %s -o - | FileCheck %s
33

44
---
55
# Check that we select the aarch64_crypto_aesmc and aarch64_crypto_aese

llvm/test/CodeGen/AArch64/addg_subg.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -mtriple=aarch64 -run-pass=prologepilog,aarch64-expand-pseudo %s -o - | FileCheck %s
1+
# RUN: llc -mtriple=aarch64 -mattr=+mte -run-pass=prologepilog,aarch64-expand-pseudo %s -o - | FileCheck %s
22

33
# CHECK: renamable $x8 = IRG $sp, $xzr
44

llvm/test/CodeGen/AArch64/arm64-neon-3vdiff.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2-
; RUN: llc < %s -verify-machineinstrs -mtriple=arm64-none-linux-gnu -mattr=+neon | FileCheck %s
2+
; RUN: llc < %s -verify-machineinstrs -mtriple=arm64-none-linux-gnu -mattr=+neon,+aes | FileCheck %s
33

44
declare <8 x i16> @llvm.aarch64.neon.pmull.v8i16(<8 x i8>, <8 x i8>)
55
declare <16 x i8> @llvm.aarch64.neon.pmull64(i64, i64) #5

llvm/test/CodeGen/AArch64/arm64-vmul.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2-
; RUN: llc < %s -mtriple=arm64-eabi -aarch64-neon-syntax=apple | FileCheck %s
2+
; RUN: llc < %s -mtriple=arm64-eabi -aarch64-neon-syntax=apple -mattr=+aes | FileCheck %s
33

44
define <8 x i16> @smull8h(<8 x i8>* %A, <8 x i8>* %B) nounwind {
55
; CHECK-LABEL: smull8h:

llvm/test/CodeGen/AArch64/atomic-ops-ldapr.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2-
; RUN: llc -mtriple=aarch64-none-linux-gnu -mattr=+ldapr -fast-isel=0 -global-isel=false -verify-machineinstrs < %s | FileCheck %s
3-
; RUN: llc -mtriple=aarch64-none-linux-gnu -mattr=+ldapr -fast-isel=1 -global-isel=false -verify-machineinstrs < %s | FileCheck %s --check-prefix=FAST-ISEL
2+
; RUN: llc -mtriple=aarch64-none-linux-gnu -mattr=+rcpc,+ldapr -fast-isel=0 -global-isel=false -verify-machineinstrs < %s | FileCheck %s
3+
; RUN: llc -mtriple=aarch64-none-linux-gnu -mattr=+rcpc,+ldapr -fast-isel=1 -global-isel=false -verify-machineinstrs < %s | FileCheck %s --check-prefix=FAST-ISEL
44

55
define i8 @test_load_8_acq(i8* %addr) {
66
; CHECK-LABEL: test_load_8_acq:

llvm/test/CodeGen/AArch64/branch-target-enforcement.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -run-pass=aarch64-branch-targets %s -o - | FileCheck %s
1+
# RUN: llc -run-pass=aarch64-branch-targets -mattr=+pauth %s -o - | FileCheck %s
22
--- |
33
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
44
target triple = "aarch64-arm-none-eabi"

llvm/test/CodeGen/AArch64/dag-combine-lifetime-end-store-typesize.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: llc -mtriple=aarch64-- < %s
1+
; RUN: llc -mtriple=aarch64-- -mattr=+sve < %s
22

33
; This regression test is defending against using the wrong interface for TypeSize.
44
; This issue appeared in DAGCombiner::visitLIFETIME_END when visiting a LIFETIME_END

llvm/test/CodeGen/AArch64/ldst-opt-mte-with-dbg.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Strip out debug info, then run ldst-opt with limit=1.
2-
# RUN: llc -aarch64-load-store-scan-limit=1 -mtriple=aarch64-none-linux-gnu -run-pass mir-strip-debug,aarch64-ldst-opt -mir-strip-debugify-only=0 -verify-machineinstrs -o - %s | FileCheck %s
2+
# RUN: llc -aarch64-load-store-scan-limit=1 -mtriple=aarch64-none-linux-gnu -mattr=+mte -run-pass mir-strip-debug,aarch64-ldst-opt -mir-strip-debugify-only=0 -verify-machineinstrs -o - %s | FileCheck %s
33
#
44
# Run ldst-opt with limit=1, then strip out debug info.
5-
# RUN: llc -aarch64-load-store-scan-limit=1 -mtriple=aarch64-none-linux-gnu -run-pass aarch64-ldst-opt,mir-strip-debug -mir-strip-debugify-only=0 -verify-machineinstrs -o - %s | FileCheck %s
5+
# RUN: llc -aarch64-load-store-scan-limit=1 -mtriple=aarch64-none-linux-gnu -mattr=+mte -run-pass aarch64-ldst-opt,mir-strip-debug -mir-strip-debugify-only=0 -verify-machineinstrs -o - %s | FileCheck %s
66
---
77

88
### STG and its offset limits

llvm/test/CodeGen/AArch64/ldst-opt-mte.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# RUN: llc -mtriple=aarch64-none-linux-gnu -run-pass aarch64-ldst-opt -verify-machineinstrs -o - %s | FileCheck %s
2-
# RUN: llc -debugify-and-strip-all-safe -mtriple=aarch64-none-linux-gnu -run-pass aarch64-ldst-opt -verify-machineinstrs -o - %s | FileCheck %s
1+
# RUN: llc -mtriple=aarch64-none-linux-gnu -mattr=+mte -run-pass aarch64-ldst-opt -verify-machineinstrs -o - %s | FileCheck %s
2+
# RUN: llc -debugify-and-strip-all-safe -mtriple=aarch64-none-linux-gnu -mattr=+mte -run-pass aarch64-ldst-opt -verify-machineinstrs -o - %s | FileCheck %s
33
---
44

55
### STG and its offset limits

llvm/test/CodeGen/AArch64/neon-vmull-high-p64.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: llc < %s -verify-machineinstrs -mtriple=aarch64-none-linux-gnu -mattr=+neon | FileCheck %s
1+
; RUN: llc < %s -verify-machineinstrs -mtriple=aarch64-none-linux-gnu -mattr=+neon,+aes | FileCheck %s
22

33
; This test checks that pmull2 instruction is used for vmull_high_p64 intrinsic.
44
; There are two extraction operations located in different basic blocks:

llvm/test/CodeGen/AArch64/speculation-hardening-sls.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# RUN: llc -verify-machineinstrs -mtriple=aarch64-none-linux-gnu \
22
# RUN: -start-before aarch64-sls-hardening -o - %s \
3-
# RUN: -mattr=harden-sls-retbr \
3+
# RUN: -mattr=+pauth,+harden-sls-retbr \
44
# RUN: | FileCheck %s --check-prefixes=CHECK,ISBDSB
55
# RUN: llc -verify-machineinstrs -mtriple=aarch64-none-linux-gnu \
66
# RUN: -start-before aarch64-sls-hardening -o - %s \
7-
# RUN: -mattr=harden-sls-retbr -mattr=+sb \
7+
# RUN: -mattr=+pauth,+harden-sls-retbr -mattr=+sb \
88
# RUN: | FileCheck %s --check-prefixes=CHECK,SB
99

1010
# Check that the SLS hardening pass also protects BRA* indirect branches that

llvm/test/CodeGen/AArch64/sve-ptest-removal-whilege.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
1+
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve2 -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
22

33
# Test instruction sequences where PTEST is redundant and thus gets removed.
44
---

llvm/test/CodeGen/AArch64/sve-ptest-removal-whilegt.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
1+
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve2 -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
22

33
# Test instruction sequences where PTEST is redundant and thus gets removed.
44
---

llvm/test/CodeGen/AArch64/sve-ptest-removal-whilehi.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
1+
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve2 -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
22

33
# Test instruction sequences where PTEST is redundant and thus gets removed.
44
---

llvm/test/CodeGen/AArch64/sve-ptest-removal-whilehs.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
1+
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve2 -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
22

33
# Test instruction sequences where PTEST is redundant and thus gets removed.
44
---

llvm/test/CodeGen/AArch64/sve-ptest-removal-whilerw.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
1+
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve2 -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
22

33
# Test instruction sequences where PTEST is redundant and thus gets removed.
44
---

llvm/test/CodeGen/AArch64/sve-ptest-removal-whilewr.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
1+
# RUN: llc -mtriple=aarch64--linux-gnu -mattr=+sve2 -run-pass=peephole-opt -verify-machineinstrs %s -o - | FileCheck %s
22

33
# Test instruction sequences where PTEST is redundant and thus gets removed.
44
---

llvm/unittests/Target/AArch64/InstSizes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace {
1414
std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
1515
auto TT(Triple::normalize("aarch64--"));
1616
std::string CPU("generic");
17-
std::string FS("");
17+
std::string FS("+pauth,+mops,+mte");
1818

1919
LLVMInitializeAArch64TargetInfo();
2020
LLVMInitializeAArch64Target();

0 commit comments

Comments
 (0)