[llvm] c5037db - [BPF,test] Change llc -march= to -mtriple=

Sun Dec 15 11:04:30 PST 2024

Author: Fangrui Song
Date: 2024-12-15T11:04:24-08:00
New Revision: c5037db4acd95790a0ca5061c8fa79c5c291607e

URL: https://github.com/llvm/llvm-project/commit/c5037db4acd95790a0ca5061c8fa79c5c291607e
DIFF: https://github.com/llvm/llvm-project/commit/c5037db4acd95790a0ca5061c8fa79c5c291607e.diff

LOG: [BPF,test] Change llc -march= to -mtriple=

Similar to 806761a7629df268c8aed49657aeccffa6bca449

-mtriple= specifies the full target triple while -march= merely sets the
architecture part of the default target triple (e.g. Windows, macOS),
leaving a target triple which may not make sense.

Therefore, -march= is error-prone and not recommended for tests without
a target triple. The issue has been benign as we recognize
bpf*-apple-darwin as ELF instead of rejecting it outrightly.

Added: 
    

Modified: 
    llvm/test/CodeGen/BPF/32-bit-subreg-alu.ll
    llvm/test/CodeGen/BPF/32-bit-subreg-cond-select.ll
    llvm/test/CodeGen/BPF/32-bit-subreg-load-store.ll
    llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-1.ll
    llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-2.ll
    llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-3.ll
    llvm/test/CodeGen/BPF/32-bit-subreg-peephole.ll
    llvm/test/CodeGen/BPF/32-bit-subreg-zext.ll
    llvm/test/CodeGen/BPF/BTF/array-1d-char.ll
    llvm/test/CodeGen/BPF/BTF/array-1d-int.ll
    llvm/test/CodeGen/BPF/BTF/array-2d-int.ll
    llvm/test/CodeGen/BPF/BTF/array-size-0.ll
    llvm/test/CodeGen/BPF/BTF/array-typedef.ll
    llvm/test/CodeGen/BPF/BTF/atomics.ll
    llvm/test/CodeGen/BPF/BTF/char-no-debuginfo.ll
    llvm/test/CodeGen/BPF/BTF/char.ll
    llvm/test/CodeGen/BPF/BTF/double.ll
    llvm/test/CodeGen/BPF/BTF/empty-btf.ll
    llvm/test/CodeGen/BPF/BTF/enum-basic.ll
    llvm/test/CodeGen/BPF/BTF/extern-builtin.ll
    llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll
    llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll
    llvm/test/CodeGen/BPF/BTF/extern-global-var.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-func.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-func2.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-section.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll
    llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll
    llvm/test/CodeGen/BPF/BTF/filename.ll
    llvm/test/CodeGen/BPF/BTF/float.ll
    llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
    llvm/test/CodeGen/BPF/BTF/func-non-void.ll
    llvm/test/CodeGen/BPF/BTF/func-source.ll
    llvm/test/CodeGen/BPF/BTF/func-typedef.ll
    llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
    llvm/test/CodeGen/BPF/BTF/func-void.ll
    llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll
    llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll
    llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll
    llvm/test/CodeGen/BPF/BTF/global-var-inited.ll
    llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll
    llvm/test/CodeGen/BPF/BTF/global-var-sec.ll
    llvm/test/CodeGen/BPF/BTF/incomplete-debuginfo.ll
    llvm/test/CodeGen/BPF/BTF/int.ll
    llvm/test/CodeGen/BPF/BTF/local-var-readonly-1.ll
    llvm/test/CodeGen/BPF/BTF/local-var-readonly-2.ll
    llvm/test/CodeGen/BPF/BTF/local-var.ll
    llvm/test/CodeGen/BPF/BTF/longlong.ll
    llvm/test/CodeGen/BPF/BTF/map-def-2.ll
    llvm/test/CodeGen/BPF/BTF/map-def-3.ll
    llvm/test/CodeGen/BPF/BTF/map-def.ll
    llvm/test/CodeGen/BPF/BTF/pruning-const.ll
    llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll
    llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll
    llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll
    llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll
    llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll
    llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll
    llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll
    llvm/test/CodeGen/BPF/BTF/ptr-int.ll
    llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll
    llvm/test/CodeGen/BPF/BTF/ptr-void.ll
    llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll
    llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll
    llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll
    llvm/test/CodeGen/BPF/BTF/short.ll
    llvm/test/CodeGen/BPF/BTF/static-func.ll
    llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll
    llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll
    llvm/test/CodeGen/BPF/BTF/static-var-inited.ll
    llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll
    llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll
    llvm/test/CodeGen/BPF/BTF/static-var-sec.ll
    llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll
    llvm/test/CodeGen/BPF/BTF/static-var.ll
    llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll
    llvm/test/CodeGen/BPF/BTF/struct-anon.ll
    llvm/test/CodeGen/BPF/BTF/struct-basic.ll
    llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll
    llvm/test/CodeGen/BPF/BTF/struct-enum.ll
    llvm/test/CodeGen/BPF/BTF/tag-1.ll
    llvm/test/CodeGen/BPF/BTF/tag-2.ll
    llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll
    llvm/test/CodeGen/BPF/BTF/tag-typedef.ll
    llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll
    llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll
    llvm/test/CodeGen/BPF/BTF/type-tag-var.ll
    llvm/test/CodeGen/BPF/BTF/uchar.ll
    llvm/test/CodeGen/BPF/BTF/uint.ll
    llvm/test/CodeGen/BPF/BTF/ulonglong.ll
    llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll
    llvm/test/CodeGen/BPF/BTF/ushort.ll
    llvm/test/CodeGen/BPF/BTF/weak-global-2.ll
    llvm/test/CodeGen/BPF/BTF/weak-global-3.ll
    llvm/test/CodeGen/BPF/BTF/weak-global.ll
    llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll
    llvm/test/CodeGen/BPF/CORE/simplifypatable-nullptr.ll
    llvm/test/CodeGen/BPF/addr-space-cast.ll
    llvm/test/CodeGen/BPF/addr-space-globals.ll
    llvm/test/CodeGen/BPF/addr-space-globals2.ll
    llvm/test/CodeGen/BPF/alu8.ll
    llvm/test/CodeGen/BPF/atomics.ll
    llvm/test/CodeGen/BPF/atomics_2.ll
    llvm/test/CodeGen/BPF/atomics_mem_order_v1.ll
    llvm/test/CodeGen/BPF/atomics_mem_order_v3.ll
    llvm/test/CodeGen/BPF/atomics_sub64_relaxed_v1.ll
    llvm/test/CodeGen/BPF/basictest.ll
    llvm/test/CodeGen/BPF/bpf-fastcall-1.ll
    llvm/test/CodeGen/BPF/bpf-fastcall-2.ll
    llvm/test/CodeGen/BPF/bpf-fastcall-3.ll
    llvm/test/CodeGen/BPF/bpf-fastcall-4.ll
    llvm/test/CodeGen/BPF/bpf-fastcall-5.ll
    llvm/test/CodeGen/BPF/bpf-fastcall-regmask-1.ll
    llvm/test/CodeGen/BPF/bswap.ll
    llvm/test/CodeGen/BPF/byval.ll
    llvm/test/CodeGen/BPF/callx.ll
    llvm/test/CodeGen/BPF/cc_args.ll
    llvm/test/CodeGen/BPF/cc_args_be.ll
    llvm/test/CodeGen/BPF/cc_ret.ll
    llvm/test/CodeGen/BPF/cmp.ll
    llvm/test/CodeGen/BPF/cttz-ctlz.ll
    llvm/test/CodeGen/BPF/dwarfdump.ll
    llvm/test/CodeGen/BPF/ex1.ll
    llvm/test/CodeGen/BPF/fi_ri.ll
    llvm/test/CodeGen/BPF/gotol.ll
    llvm/test/CodeGen/BPF/i128.ll
    llvm/test/CodeGen/BPF/inline_asm.ll
    llvm/test/CodeGen/BPF/inlineasm-wreg.ll
    llvm/test/CodeGen/BPF/intrinsics.ll
    llvm/test/CodeGen/BPF/is_trunc_free.ll
    llvm/test/CodeGen/BPF/is_zext_free.ll
    llvm/test/CodeGen/BPF/ldsx.ll
    llvm/test/CodeGen/BPF/load.ll
    llvm/test/CodeGen/BPF/loops.ll
    llvm/test/CodeGen/BPF/many_args1.ll
    llvm/test/CodeGen/BPF/many_args2.ll
    llvm/test/CodeGen/BPF/mem_offset.ll
    llvm/test/CodeGen/BPF/mem_offset_be.ll
    llvm/test/CodeGen/BPF/memcmp.ll
    llvm/test/CodeGen/BPF/memcpy-expand-in-order.ll
    llvm/test/CodeGen/BPF/movsx.ll
    llvm/test/CodeGen/BPF/no-merge-attr.ll
    llvm/test/CodeGen/BPF/optnone-1.ll
    llvm/test/CodeGen/BPF/optnone-2.ll
    llvm/test/CodeGen/BPF/remove_truncate_1.ll
    llvm/test/CodeGen/BPF/remove_truncate_2.ll
    llvm/test/CodeGen/BPF/remove_truncate_3.ll
    llvm/test/CodeGen/BPF/remove_truncate_4.ll
    llvm/test/CodeGen/BPF/remove_truncate_5.ll
    llvm/test/CodeGen/BPF/remove_truncate_6.ll
    llvm/test/CodeGen/BPF/remove_truncate_7.ll
    llvm/test/CodeGen/BPF/remove_truncate_8.ll
    llvm/test/CodeGen/BPF/remove_truncate_9.ll
    llvm/test/CodeGen/BPF/rodata_1.ll
    llvm/test/CodeGen/BPF/rodata_2.ll
    llvm/test/CodeGen/BPF/rodata_3.ll
    llvm/test/CodeGen/BPF/rodata_4.ll
    llvm/test/CodeGen/BPF/rodata_5.ll
    llvm/test/CodeGen/BPF/rodata_6.ll
    llvm/test/CodeGen/BPF/rodata_7.ll
    llvm/test/CodeGen/BPF/sdiv_smod.ll
    llvm/test/CodeGen/BPF/sdiv_to_mul.ll
    llvm/test/CodeGen/BPF/select_ri.ll
    llvm/test/CodeGen/BPF/selectiondag-bug.ll
    llvm/test/CodeGen/BPF/setcc.ll
    llvm/test/CodeGen/BPF/shifts.ll
    llvm/test/CodeGen/BPF/sockex2.ll
    llvm/test/CodeGen/BPF/spill-alu32.ll
    llvm/test/CodeGen/BPF/store_imm.ll
    llvm/test/CodeGen/BPF/struct-arg.ll
    llvm/test/CodeGen/BPF/struct_ret1.ll
    llvm/test/CodeGen/BPF/struct_ret2.ll
    llvm/test/CodeGen/BPF/undef.ll
    llvm/test/CodeGen/BPF/vararg1.ll
    llvm/test/CodeGen/BPF/warn-call.ll
    llvm/test/CodeGen/BPF/warn-stack.ll
    llvm/test/CodeGen/BPF/xadd.ll
    llvm/test/CodeGen/BPF/xadd_legal.ll
    llvm/test/CodeGen/BPF/xaddd_v1.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-alu.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-alu.ll
index abec34990044a3..85d419000c658c 100644

--- a/llvm/test/CodeGen/BPF/32-bit-subreg-alu.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-alu.ll
@@ -1,5 +1,5 @@
-; RUN: llc -O2 -march=bpfel -mattr=+alu32 < %s | FileCheck %s
-; RUN: llc -O2 -march=bpfel -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mcpu=v3 < %s | FileCheck %s
 ;
 ; int mov(int a)
 ; {

diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-cond-select.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-cond-select.ll
index a60d39e5d6c1e3..35d4441638663a 100644
--- a/llvm/test/CodeGen/BPF/32-bit-subreg-cond-select.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-cond-select.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=bpfel -mcpu=v1 -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mcpu=v1 -mattr=+alu32 < %s | FileCheck %s
 ;
 ; unsigned int select_cc_32 (unsigned a, unsigned b, int c, int d)
 ; {

diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-load-store.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-load-store.ll
index 4b9af62fb3d65d..71be7806a5517d 100644
--- a/llvm/test/CodeGen/BPF/32-bit-subreg-load-store.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-load-store.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=bpfel -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mattr=+alu32 < %s | FileCheck %s
 ;
 ; unsigned char loadu8(unsigned char *p)
 ; {

diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-1.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-1.ll
index 2fc1e6c2783b32..fd751c733fa232 100644
--- a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-1.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
 ;
 ; For the below test case, 'b' in 'ret == b' needs SLL/SLR.
 ; 'ret' in 'ret == b' does not need SLL/SLR as all 'ret' values

diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-2.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-2.ll
index da69657d02d009..6e79602f45f0dc 100644
--- a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-2.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
 ;
 ; For the below test case, both 'ret' and 'b' at 'ret == b'
 ; need SLL/SLR. For 'ret', 'ret = a' may receive the value

diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-3.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-3.ll
index 3f3f9c8c4a55fa..314d63e60aa618 100644
--- a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-3.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole-phi-3.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
 ;
 ; For the below example, two phi node in the loop may depend on
 ; each other. So implementation must handle recursion properly.

diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole.ll
index f491eeee37d85f..18ae3b75c45153 100644
--- a/llvm/test/CodeGen/BPF/32-bit-subreg-peephole.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-peephole.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mcpu=v2 -mattr=+alu32 < %s | FileCheck %s
 ;
 ; long long select_u(unsigned a, unsigned b, long long c, long long d)
 ; {

diff  --git a/llvm/test/CodeGen/BPF/32-bit-subreg-zext.ll b/llvm/test/CodeGen/BPF/32-bit-subreg-zext.ll
index 57ea93a8fe6e68..d6e5a1aad57a7f 100644
--- a/llvm/test/CodeGen/BPF/32-bit-subreg-zext.ll
+++ b/llvm/test/CodeGen/BPF/32-bit-subreg-zext.ll
@@ -1,7 +1,7 @@
-; RUN: llc -O2 -march=bpfel -mattr=+alu32 < %s | FileCheck %s
-; RUN: llc -O2 -march=bpfel -mcpu=v3 < %s | FileCheck %s
-; RUN: llc -O2 -march=bpfeb -mattr=+alu32 < %s | FileCheck %s
-; RUN: llc -O2 -march=bpfeb -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfel -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfeb -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpfeb -mcpu=v3 < %s | FileCheck %s
 ;
 ; long zext(unsigned int a)
 ; {

diff  --git a/llvm/test/CodeGen/BPF/BTF/array-1d-char.ll b/llvm/test/CodeGen/BPF/BTF/array-1d-char.ll
index c4d3e531af2611..49e3663d8c5f4a 100644
--- a/llvm/test/CodeGen/BPF/BTF/array-1d-char.ll
+++ b/llvm/test/CodeGen/BPF/BTF/array-1d-char.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   char a[10];

diff  --git a/llvm/test/CodeGen/BPF/BTF/array-1d-int.ll b/llvm/test/CodeGen/BPF/BTF/array-1d-int.ll
index 578b7db7ad4f55..a38a45b713fdfd 100644
--- a/llvm/test/CodeGen/BPF/BTF/array-1d-int.ll
+++ b/llvm/test/CodeGen/BPF/BTF/array-1d-int.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int a[10];

diff  --git a/llvm/test/CodeGen/BPF/BTF/array-2d-int.ll b/llvm/test/CodeGen/BPF/BTF/array-2d-int.ll
index 70bc2cdc02f72d..dbca7c57fff663 100644
--- a/llvm/test/CodeGen/BPF/BTF/array-2d-int.ll
+++ b/llvm/test/CodeGen/BPF/BTF/array-2d-int.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int a[10][10];

diff  --git a/llvm/test/CodeGen/BPF/BTF/array-size-0.ll b/llvm/test/CodeGen/BPF/BTF/array-size-0.ll
index 65a0841873433d..fc4f0e41a4c32e 100644
--- a/llvm/test/CodeGen/BPF/BTF/array-size-0.ll
+++ b/llvm/test/CodeGen/BPF/BTF/array-size-0.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct t {};

diff  --git a/llvm/test/CodeGen/BPF/BTF/array-typedef.ll b/llvm/test/CodeGen/BPF/BTF/array-typedef.ll
index 7f434627de0e88..e5298e84a6cbed 100644
--- a/llvm/test/CodeGen/BPF/BTF/array-typedef.ll
+++ b/llvm/test/CodeGen/BPF/BTF/array-typedef.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   typedef unsigned _int;

diff  --git a/llvm/test/CodeGen/BPF/BTF/atomics.ll b/llvm/test/CodeGen/BPF/BTF/atomics.ll
index 2c02110f24c0d1..4b7a0310ae85f9 100644
--- a/llvm/test/CodeGen/BPF/BTF/atomics.ll
+++ b/llvm/test/CodeGen/BPF/BTF/atomics.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v3 -filetype=obj -o %t1 %s
+; RUN: llc -mtriple=bpfel -mcpu=v3 -filetype=obj -o %t1 %s
 ; RUN: llvm-objcopy --dump-section='.BTF'=%t2 %t1
 ; RUN: %python %p/print_btf.py %t2 | FileCheck -check-prefixes=CHECK %s
 ;

diff  --git a/llvm/test/CodeGen/BPF/BTF/char-no-debuginfo.ll b/llvm/test/CodeGen/BPF/BTF/char-no-debuginfo.ll
index c6a6d1209fb82b..cc14a32b9811f5 100644
--- a/llvm/test/CodeGen/BPF/BTF/char-no-debuginfo.ll
+++ b/llvm/test/CodeGen/BPF/BTF/char-no-debuginfo.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int g __attribute__((section("maps"))) = 5;

diff  --git a/llvm/test/CodeGen/BPF/BTF/char.ll b/llvm/test/CodeGen/BPF/BTF/char.ll
index 26ef59c82d813b..fde6525c2a2539 100644
--- a/llvm/test/CodeGen/BPF/BTF/char.ll
+++ b/llvm/test/CodeGen/BPF/BTF/char.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   char a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/double.ll b/llvm/test/CodeGen/BPF/BTF/double.ll
index 655c3710d59773..7f5698f4da160d 100644
--- a/llvm/test/CodeGen/BPF/BTF/double.ll
+++ b/llvm/test/CodeGen/BPF/BTF/double.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   double a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/empty-btf.ll b/llvm/test/CodeGen/BPF/BTF/empty-btf.ll
index b54df9ff765e0e..890618f1cc6c14 100644
--- a/llvm/test/CodeGen/BPF/BTF/empty-btf.ll
+++ b/llvm/test/CodeGen/BPF/BTF/empty-btf.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int test(int arg) { return arg; }

diff  --git a/llvm/test/CodeGen/BPF/BTF/enum-basic.ll b/llvm/test/CodeGen/BPF/BTF/enum-basic.ll
index 9a82a36c897500..afb4d83ce6d494 100644
--- a/llvm/test/CodeGen/BPF/BTF/enum-basic.ll
+++ b/llvm/test/CodeGen/BPF/BTF/enum-basic.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   enum { A = -1, B = 2 } a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-builtin.ll b/llvm/test/CodeGen/BPF/BTF/extern-builtin.ll
index c8a5d3bda050d9..a8550167de1823 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-builtin.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-builtin.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ; Source code:
 ;   unsigned long long load_byte(ptr skb,
 ;       unsigned long long off) asm("llvm.bpf.load.byte");

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll b/llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll
index cda24835907f08..b7cbb48fc1f491 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-func-arg.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int global_func(char arg);

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll b/llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll
index aba36e94461ece..70d5b87283fa9d 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-func-ptr.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int do_work(int) __attribute__((section(".callback_fn")));

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-global-var.ll b/llvm/test/CodeGen/BPF/BTF/extern-global-var.ll
index 6d520f0f781353..299aa1d94fdd82 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-global-var.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-global-var.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   extern char a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll
index d47a9d6c504a49..d11addd3874750 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak-section.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int global_func(char c) __attribute__((weak, section("abc")));

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll
index 984a936553a41a..9e82295812530d 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-func-weak.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int global_func(char c) __attribute__((weak));

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-func.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-func.ll
index 61239befe36c05..262abb39ca7a9d 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-func.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-func.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int global_func(char c);

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-func2.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-func2.ll
index 700486d9f3515c..ffb05fb4e42e1c 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-func2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-func2.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int elsewhere(void);

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-section.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-section.ll
index 05bb10c1bbeef0..b6e14fcd569002 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-section.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-section.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int global_func(char c) __attribute__((section("abc")));

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll
index 570de14536a150..63ab5785971469 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-struct-weak.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   typedef struct t1 { int f1; } __t1;

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll
index 5825e3967b5e83..3ecda4f513b9b6 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-struct.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   typedef struct t1 { int f1; } __t1;

diff  --git a/llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll b/llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll
index d5b3eb6cb8786e..57ca18cdf12aae 100644
--- a/llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll
+++ b/llvm/test/CodeGen/BPF/BTF/extern-var-weak-section.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int global_func(char c) __attribute__((weak, section("abc")));

diff  --git a/llvm/test/CodeGen/BPF/BTF/filename.ll b/llvm/test/CodeGen/BPF/BTF/filename.ll
index 2ae03a64770e9c..ae08aea71b2cbb 100644
--- a/llvm/test/CodeGen/BPF/BTF/filename.ll
+++ b/llvm/test/CodeGen/BPF/BTF/filename.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int test() { return 0; }

diff  --git a/llvm/test/CodeGen/BPF/BTF/float.ll b/llvm/test/CodeGen/BPF/BTF/float.ll
index a061263eed7d4e..8de7c1d1f8032c 100644
--- a/llvm/test/CodeGen/BPF/BTF/float.ll
+++ b/llvm/test/CodeGen/BPF/BTF/float.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   float a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll b/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
index ea93225e8d588e..b700be9fd1be0b 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   void (*a1)(int p1);

diff  --git a/llvm/test/CodeGen/BPF/BTF/func-non-void.ll b/llvm/test/CodeGen/BPF/BTF/func-non-void.ll
index 428dfac2e53d54..2f562b20970229 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-non-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-non-void.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int f1(int a1) { return a1; }

diff  --git a/llvm/test/CodeGen/BPF/BTF/func-source.ll b/llvm/test/CodeGen/BPF/BTF/func-source.ll
index 63814d766e6a2f..a485d2cf4a98d8 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-source.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-source.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   void f(void) { }

diff  --git a/llvm/test/CodeGen/BPF/BTF/func-typedef.ll b/llvm/test/CodeGen/BPF/BTF/func-typedef.ll
index ac0813f8a342fb..25705366089d0e 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-typedef.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-typedef.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   typedef int _int;

diff  --git a/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll b/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
index 95c2f9d4e1c8f1..f9439e606ae87b 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int f1(int a1) { return 0; }

diff  --git a/llvm/test/CodeGen/BPF/BTF/func-void.ll b/llvm/test/CodeGen/BPF/BTF/func-void.ll
index 94770dba455e09..bf70b6a9d065cf 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-void.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   void f1(void) {}

diff  --git a/llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll b/llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll
index 7ca91d99f013a5..34b4aa45de472c 100644
--- a/llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll
+++ b/llvm/test/CodeGen/BPF/BTF/fwd-no-define.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct t1;

diff  --git a/llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll b/llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll
index ac2f841f7ba1e8..7505141b5ac608 100644
--- a/llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll
+++ b/llvm/test/CodeGen/BPF/BTF/fwd-with-define.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct t1;

diff  --git a/llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll b/llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll
index 7beaaee9fb4d04..8d162132b1519b 100644
--- a/llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll
+++ b/llvm/test/CodeGen/BPF/BTF/global-var-bss-and-data.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck %s
 
 ; Source code:
 ;   struct s { int i; } __attribute__((aligned(16)));

diff  --git a/llvm/test/CodeGen/BPF/BTF/global-var-inited.ll b/llvm/test/CodeGen/BPF/BTF/global-var-inited.ll
index d5f745076d660f..dae0557e617ce4 100644
--- a/llvm/test/CodeGen/BPF/BTF/global-var-inited.ll
+++ b/llvm/test/CodeGen/BPF/BTF/global-var-inited.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int a = 3;

diff  --git a/llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll b/llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll
index 79416711ffe35e..b631790c08a5ce 100644
--- a/llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll
+++ b/llvm/test/CodeGen/BPF/BTF/global-var-sec-readonly.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   const int gv1 __attribute__((section("maps")));

diff  --git a/llvm/test/CodeGen/BPF/BTF/global-var-sec.ll b/llvm/test/CodeGen/BPF/BTF/global-var-sec.ll
index ff7da2f33fe14a..59f96d5518623a 100644
--- a/llvm/test/CodeGen/BPF/BTF/global-var-sec.ll
+++ b/llvm/test/CodeGen/BPF/BTF/global-var-sec.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int gv1 __attribute__((section("maps")));

diff  --git a/llvm/test/CodeGen/BPF/BTF/incomplete-debuginfo.ll b/llvm/test/CodeGen/BPF/BTF/incomplete-debuginfo.ll
index aa5167b6284f9c..dd52999a6342cd 100644
--- a/llvm/test/CodeGen/BPF/BTF/incomplete-debuginfo.ll
+++ b/llvm/test/CodeGen/BPF/BTF/incomplete-debuginfo.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   unsigned long foo(void) {

diff  --git a/llvm/test/CodeGen/BPF/BTF/int.ll b/llvm/test/CodeGen/BPF/BTF/int.ll
index 08cbaed80e7bee..698032241831e8 100644
--- a/llvm/test/CodeGen/BPF/BTF/int.ll
+++ b/llvm/test/CodeGen/BPF/BTF/int.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/local-var-readonly-1.ll b/llvm/test/CodeGen/BPF/BTF/local-var-readonly-1.ll
index d814ee9ee4ed21..6ef7a30883105c 100644
--- a/llvm/test/CodeGen/BPF/BTF/local-var-readonly-1.ll
+++ b/llvm/test/CodeGen/BPF/BTF/local-var-readonly-1.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source:
 ;   void foo(const ptr);

diff  --git a/llvm/test/CodeGen/BPF/BTF/local-var-readonly-2.ll b/llvm/test/CodeGen/BPF/BTF/local-var-readonly-2.ll
index 798f3d615aebda..0e183a5c142792 100644
--- a/llvm/test/CodeGen/BPF/BTF/local-var-readonly-2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/local-var-readonly-2.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source:
 ;   void foo(const ptr);

diff  --git a/llvm/test/CodeGen/BPF/BTF/local-var.ll b/llvm/test/CodeGen/BPF/BTF/local-var.ll
index c1064cbfff308f..dd79923b6b7bae 100644
--- a/llvm/test/CodeGen/BPF/BTF/local-var.ll
+++ b/llvm/test/CodeGen/BPF/BTF/local-var.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int foo(char a) { volatile short b = 0;  return b; }

diff  --git a/llvm/test/CodeGen/BPF/BTF/longlong.ll b/llvm/test/CodeGen/BPF/BTF/longlong.ll
index 3e8c76da389351..59fefdb3677fc7 100644
--- a/llvm/test/CodeGen/BPF/BTF/longlong.ll
+++ b/llvm/test/CodeGen/BPF/BTF/longlong.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   long long a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/map-def-2.ll b/llvm/test/CodeGen/BPF/BTF/map-def-2.ll
index 71069b436e3599..5f971ec1314d9e 100644
--- a/llvm/test/CodeGen/BPF/BTF/map-def-2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/map-def-2.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   struct key_type {

diff  --git a/llvm/test/CodeGen/BPF/BTF/map-def-3.ll b/llvm/test/CodeGen/BPF/BTF/map-def-3.ll
index e05470782ec26a..6aa8af98493ecc 100644
--- a/llvm/test/CodeGen/BPF/BTF/map-def-3.ll
+++ b/llvm/test/CodeGen/BPF/BTF/map-def-3.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   struct key_type {

diff  --git a/llvm/test/CodeGen/BPF/BTF/map-def.ll b/llvm/test/CodeGen/BPF/BTF/map-def.ll
index d72e2462d2cd23..a3835f1dae4b55 100644
--- a/llvm/test/CodeGen/BPF/BTF/map-def.ll
+++ b/llvm/test/CodeGen/BPF/BTF/map-def.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct key_type {

diff  --git a/llvm/test/CodeGen/BPF/BTF/pruning-const.ll b/llvm/test/CodeGen/BPF/BTF/pruning-const.ll
index f41c9dddcd57e6..8fef9c2ad89913 100644
--- a/llvm/test/CodeGen/BPF/BTF/pruning-const.ll
+++ b/llvm/test/CodeGen/BPF/BTF/pruning-const.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ; Source:
 ;   struct tt;
 ;   struct s1 { const struct tt *mp; };

diff  --git a/llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll b/llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll
index 1d9993727a6f6b..2817b9a30f028e 100644
--- a/llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll
+++ b/llvm/test/CodeGen/BPF/BTF/pruning-dup-ptr-struct.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -o - %s | FileCheck %s
-; RUN: llc -march=bpfeb -o - %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -o - %s | FileCheck %s
+; RUN: llc -mtriple=bpfeb -o - %s | FileCheck %s
 ; Source:
 ;   struct t1 {
 ;     int a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll b/llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll
index 4d5e9f61f91c41..213f810e6f6e41 100644
--- a/llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll
+++ b/llvm/test/CodeGen/BPF/BTF/pruning-multi-derived-type.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ; Source:
 ;   struct t1 {
 ;     int a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll b/llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll
index c12a40f8247d50..4c8aa1fbed6142 100644
--- a/llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll
+++ b/llvm/test/CodeGen/BPF/BTF/pruning-typedef.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ; Source:
 ;   struct tt;
 ;   typedef struct tt _tt;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll b/llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll
index 8b107283a0a547..b07694989a556a 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-const-void.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   const ptr a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll b/llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll
index 52da3cbd7915fe..70b8e35b0558b4 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-func-1.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   void (*a)(void);

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll b/llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll
index 7976bfa1e2802d..6a93edac59ed81 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-func-2.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int (*a)(int a, char b);

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll b/llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll
index ff3b04a600d698..bf716e13d7cd63 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-func-3.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   typedef int __int;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-int.ll b/llvm/test/CodeGen/BPF/BTF/ptr-int.ll
index 4e25dd5a1a9002..c02047f7d019a9 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-int.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-int.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int *a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll b/llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll
index 2443eaecce29ca..7b36e01c99082e 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-prune-type.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct t {

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-void.ll b/llvm/test/CodeGen/BPF/BTF/ptr-void.ll
index 7ea2c26464d356..0d8abafbcca220 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-void.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   ptr a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll b/llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll
index 8cb7c683b29f05..58b25cba1025ac 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-volatile-const-void.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   volatile const ptr p;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll b/llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll
index 120b54a0bdd372..a0f59be6015f1f 100644
--- a/llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ptr-volatile-void.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   volatile ptr a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll b/llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll
index 9536f63974532e..03f454894280cd 100644
--- a/llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll
+++ b/llvm/test/CodeGen/BPF/BTF/restrict-ptr.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   int * restrict p;

diff  --git a/llvm/test/CodeGen/BPF/BTF/short.ll b/llvm/test/CodeGen/BPF/BTF/short.ll
index 899f149ffcd6e3..e487249f24e99a 100644
--- a/llvm/test/CodeGen/BPF/BTF/short.ll
+++ b/llvm/test/CodeGen/BPF/BTF/short.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   short a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-func.ll b/llvm/test/CodeGen/BPF/BTF/static-func.ll
index 9227cf0667c66d..fc79dbf4dbaf0c 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-func.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-func.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   extern int foo(void);

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll b/llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll
index aa8ae5d681e400..1827c97c9e29c1 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var-derived-type.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   typedef int * int_ptr;

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll b/llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll
index cfea2b7a51b848..cc785b78c5df9b 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var-inited-sec.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   static volatile char a __attribute__((section("maps"))) = 3;

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var-inited.ll b/llvm/test/CodeGen/BPF/BTF/static-var-inited.ll
index 4dac018336e203..2b62882b322455 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var-inited.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var-inited.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   static volatile char a = 3;

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll b/llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll
index 90f9c766e1d8c1..a4ae9482736904 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var-readonly-sec.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   static volatile const char __attribute__((section("maps"))) a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll b/llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll
index 78a0149a362515..a9d60ce8d413ba 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var-readonly.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   static volatile const char a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var-sec.ll b/llvm/test/CodeGen/BPF/BTF/static-var-sec.ll
index 77f818f58471a9..ac27b2bbe19b2c 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var-sec.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var-sec.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   static volatile char a __attribute__((section("maps")));

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll b/llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll
index 1ee1a174e6a5d7..28da203409eab3 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var-zerolen-array.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct t {

diff  --git a/llvm/test/CodeGen/BPF/BTF/static-var.ll b/llvm/test/CodeGen/BPF/BTF/static-var.ll
index 0d6a229218e589..461bd27a366d9d 100644
--- a/llvm/test/CodeGen/BPF/BTF/static-var.ll
+++ b/llvm/test/CodeGen/BPF/BTF/static-var.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   static volatile char a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll b/llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll
index 8cb168ce88a250..5b125ea8673eb0 100644
--- a/llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/struct-anon-2.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source:
 ;   struct s1 {

diff  --git a/llvm/test/CodeGen/BPF/BTF/struct-anon.ll b/llvm/test/CodeGen/BPF/BTF/struct-anon.ll
index 1728b2cfe10e32..d2cbe7e8c419a3 100644
--- a/llvm/test/CodeGen/BPF/BTF/struct-anon.ll
+++ b/llvm/test/CodeGen/BPF/BTF/struct-anon.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct { struct {int m;}; } a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/struct-basic.ll b/llvm/test/CodeGen/BPF/BTF/struct-basic.ll
index bdeadc27a4eaed..0ec66633606425 100644
--- a/llvm/test/CodeGen/BPF/BTF/struct-basic.ll
+++ b/llvm/test/CodeGen/BPF/BTF/struct-basic.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   struct t1 {char m1; int n1;} a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll b/llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll
index ae246b59855aa9..00ef752c7b7d99 100644
--- a/llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll
+++ b/llvm/test/CodeGen/BPF/BTF/struct-bitfield-typedef.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   typedef int _int;

diff  --git a/llvm/test/CodeGen/BPF/BTF/struct-enum.ll b/llvm/test/CodeGen/BPF/BTF/struct-enum.ll
index cf667c781599e3..6160edfdc04612 100644
--- a/llvm/test/CodeGen/BPF/BTF/struct-enum.ll
+++ b/llvm/test/CodeGen/BPF/BTF/struct-enum.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   enum t1 { A , B };

diff  --git a/llvm/test/CodeGen/BPF/BTF/tag-1.ll b/llvm/test/CodeGen/BPF/BTF/tag-1.ll
index c2d9eb967d0ba5..67060cd0e547ea 100644
--- a/llvm/test/CodeGen/BPF/BTF/tag-1.ll
+++ b/llvm/test/CodeGen/BPF/BTF/tag-1.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   #define __tag1 __attribute__((btf_decl_tag("tag1")))

diff  --git a/llvm/test/CodeGen/BPF/BTF/tag-2.ll b/llvm/test/CodeGen/BPF/BTF/tag-2.ll
index eaf6f234a2fb83..3393df0c4de0bc 100644
--- a/llvm/test/CodeGen/BPF/BTF/tag-2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/tag-2.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   #define __tag1 __attribute__((btf_decl_tag("tag1")))

diff  --git a/llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll b/llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll
index f10063c5569e67..19a9c0f88dfdef 100644
--- a/llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll
+++ b/llvm/test/CodeGen/BPF/BTF/tag-extern-func.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   #define __tag(x) __attribute__((btf_decl_tag(x)))

diff  --git a/llvm/test/CodeGen/BPF/BTF/tag-typedef.ll b/llvm/test/CodeGen/BPF/BTF/tag-typedef.ll
index 80031410c2bca5..45b03a7e7d1003 100644
--- a/llvm/test/CodeGen/BPF/BTF/tag-typedef.ll
+++ b/llvm/test/CodeGen/BPF/BTF/tag-typedef.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   #define __tag1 __attribute__((btf_decl_tag("tag1")))

diff  --git a/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll b/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll
index b03d23383a0ed8..25bcc46d9afcb5 100644
--- a/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll
+++ b/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-fwd.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source:
 ;   #define __tag1 __attribute__((btf_type_tag("tag1")))

diff  --git a/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll b/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll
index 21c74afeaa96e8..139a6a65f4ceea 100644
--- a/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll
+++ b/llvm/test/CodeGen/BPF/BTF/type-tag-fixup-resolved.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source:
 ;   #define __tag1 __attribute__((btf_type_tag("tag1")))

diff  --git a/llvm/test/CodeGen/BPF/BTF/type-tag-var.ll b/llvm/test/CodeGen/BPF/BTF/type-tag-var.ll
index 61d3705ff34d22..c909444023a7dc 100644
--- a/llvm/test/CodeGen/BPF/BTF/type-tag-var.ll
+++ b/llvm/test/CodeGen/BPF/BTF/type-tag-var.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source:
 ;   #define __tag1 __attribute__((btf_type_tag("tag1")))

diff  --git a/llvm/test/CodeGen/BPF/BTF/uchar.ll b/llvm/test/CodeGen/BPF/BTF/uchar.ll
index 2e31f2c388b4b8..2bdcb3d3821817 100644
--- a/llvm/test/CodeGen/BPF/BTF/uchar.ll
+++ b/llvm/test/CodeGen/BPF/BTF/uchar.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   unsigned char a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/uint.ll b/llvm/test/CodeGen/BPF/BTF/uint.ll
index e97d5f54001f11..d8bb0eca858cb1 100644
--- a/llvm/test/CodeGen/BPF/BTF/uint.ll
+++ b/llvm/test/CodeGen/BPF/BTF/uint.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   unsigned a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ulonglong.ll b/llvm/test/CodeGen/BPF/BTF/ulonglong.ll
index 93a8c221ba0d87..12820db48ededf 100644
--- a/llvm/test/CodeGen/BPF/BTF/ulonglong.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ulonglong.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   unsigned long long a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll b/llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll
index 056489ea62d22d..a46b9de6c70458 100644
--- a/llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll
+++ b/llvm/test/CodeGen/BPF/BTF/union-array-typedef.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   typedef int _int;

diff  --git a/llvm/test/CodeGen/BPF/BTF/ushort.ll b/llvm/test/CodeGen/BPF/BTF/ushort.ll
index dd4ccdf5a679cc..f4853fd61c3ee9 100644
--- a/llvm/test/CodeGen/BPF/BTF/ushort.ll
+++ b/llvm/test/CodeGen/BPF/BTF/ushort.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ;   unsigned short a;

diff  --git a/llvm/test/CodeGen/BPF/BTF/weak-global-2.ll b/llvm/test/CodeGen/BPF/BTF/weak-global-2.ll
index 314058439dcab4..4b3b55789f8d08 100644
--- a/llvm/test/CodeGen/BPF/BTF/weak-global-2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/weak-global-2.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   char g __attribute__((weak)) = 2;

diff  --git a/llvm/test/CodeGen/BPF/BTF/weak-global-3.ll b/llvm/test/CodeGen/BPF/BTF/weak-global-3.ll
index e019775f11cec4..8178c92fb34c6a 100644
--- a/llvm/test/CodeGen/BPF/BTF/weak-global-3.ll
+++ b/llvm/test/CodeGen/BPF/BTF/weak-global-3.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   const volatile char g __attribute__((weak)) = 2;

diff  --git a/llvm/test/CodeGen/BPF/BTF/weak-global.ll b/llvm/test/CodeGen/BPF/BTF/weak-global.ll
index 7d92d606650de4..ea0a887410373c 100644
--- a/llvm/test/CodeGen/BPF/BTF/weak-global.ll
+++ b/llvm/test/CodeGen/BPF/BTF/weak-global.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
-; RUN: llc -march=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfeb -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source code:
 ;   char g __attribute__((weak));

diff  --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll
index 73a8903298a1b1..ac4d9d628bad51 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 < %s | FileCheck %s
 
 ; Make sure that CO-RE relocations had been generated correctly for
 ; BPF_ST (store immediate) instructions and that

diff  --git a/llvm/test/CodeGen/BPF/CORE/simplifypatable-nullptr.ll b/llvm/test/CodeGen/BPF/CORE/simplifypatable-nullptr.ll
index 85eda30add85a4..93c05077fe5b01 100644
--- a/llvm/test/CodeGen/BPF/CORE/simplifypatable-nullptr.ll
+++ b/llvm/test/CodeGen/BPF/CORE/simplifypatable-nullptr.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -march=bpf -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -O2 -mtriple=bpf -mcpu=v3 < %s | FileCheck %s
 ; Source code:
 ;   struct t3 {
 ;     int i;

diff  --git a/llvm/test/CodeGen/BPF/addr-space-cast.ll b/llvm/test/CodeGen/BPF/addr-space-cast.ll
index ad2860d8038ea7..5cf2a68fc91ccb 100644
--- a/llvm/test/CodeGen/BPF/addr-space-cast.ll
+++ b/llvm/test/CodeGen/BPF/addr-space-cast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; RUN: llc -march=bpfel -mcpu=v4 -filetype=asm -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 -filetype=asm -show-mc-encoding < %s | FileCheck %s
 
 define ptr addrspace(1) @foo(ptr %p) {
 ; CHECK-LABEL: foo:

diff  --git a/llvm/test/CodeGen/BPF/addr-space-globals.ll b/llvm/test/CodeGen/BPF/addr-space-globals.ll
index 73e80b7a0400b3..6db2d265810d42 100644
--- a/llvm/test/CodeGen/BPF/addr-space-globals.ll
+++ b/llvm/test/CodeGen/BPF/addr-space-globals.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 < %s | FileCheck %s
 
 ; Generated from the following C code:
 ;

diff  --git a/llvm/test/CodeGen/BPF/addr-space-globals2.ll b/llvm/test/CodeGen/BPF/addr-space-globals2.ll
index 5944cb27ee18a8..0d7f3958256c3e 100644
--- a/llvm/test/CodeGen/BPF/addr-space-globals2.ll
+++ b/llvm/test/CodeGen/BPF/addr-space-globals2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 < %s | FileCheck %s
 
 ; Generated from the following C code:
 ;

diff  --git a/llvm/test/CodeGen/BPF/alu8.ll b/llvm/test/CodeGen/BPF/alu8.ll
index 21a1dd37253f23..5a0b0008ae09f0 100644
--- a/llvm/test/CodeGen/BPF/alu8.ll
+++ b/llvm/test/CodeGen/BPF/alu8.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v1 -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v1 -show-mc-encoding < %s | FileCheck %s
 
 define i8 @mov(i8 %a, i8 %b) nounwind {
 ; CHECK-LABEL: mov:

diff  --git a/llvm/test/CodeGen/BPF/atomics.ll b/llvm/test/CodeGen/BPF/atomics.ll
index bc466c23c26236..a149037f897473 100644
--- a/llvm/test/CodeGen/BPF/atomics.ll
+++ b/llvm/test/CodeGen/BPF/atomics.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -verify-machineinstrs -show-mc-encoding -mcpu=v1 | FileCheck %s
-; RUN: llc < %s -march=bpfel -verify-machineinstrs -show-mc-encoding -mcpu=v3 | FileCheck --check-prefix=CHECK-V3 %s
+; RUN: llc < %s -mtriple=bpfel -verify-machineinstrs -show-mc-encoding -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -verify-machineinstrs -show-mc-encoding -mcpu=v3 | FileCheck --check-prefix=CHECK-V3 %s
 
 ; CHECK-LABEL: test_load_add_32
 ; CHECK: lock *(u32 *)(r1 + 0) += r2

diff  --git a/llvm/test/CodeGen/BPF/atomics_2.ll b/llvm/test/CodeGen/BPF/atomics_2.ll
index 6371e3b875638e..b99ea441ef2bdb 100644
--- a/llvm/test/CodeGen/BPF/atomics_2.ll
+++ b/llvm/test/CodeGen/BPF/atomics_2.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v3 -verify-machineinstrs -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v3 -verify-machineinstrs -show-mc-encoding | FileCheck %s
 ;
 ; Source:
 ;   int test_load_add_32(int *p, int v) {

diff  --git a/llvm/test/CodeGen/BPF/atomics_mem_order_v1.ll b/llvm/test/CodeGen/BPF/atomics_mem_order_v1.ll
index 31081586bf7afc..9da127ce8b5c55 100644
--- a/llvm/test/CodeGen/BPF/atomics_mem_order_v1.ll
+++ b/llvm/test/CodeGen/BPF/atomics_mem_order_v1.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
-; RUN: llc -march=bpfel -mcpu=v1 -filetype=asm < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v1 -filetype=asm < %s | FileCheck %s
 ;
 ; Source:
 ; $ cat atomics_mem_order_v1.c

diff  --git a/llvm/test/CodeGen/BPF/atomics_mem_order_v3.ll b/llvm/test/CodeGen/BPF/atomics_mem_order_v3.ll
index 20b9ebcb0d473b..76475ac1249868 100644
--- a/llvm/test/CodeGen/BPF/atomics_mem_order_v3.ll
+++ b/llvm/test/CodeGen/BPF/atomics_mem_order_v3.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
-; RUN: llc -march=bpfel -mcpu=v3 -filetype=asm < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v3 -filetype=asm < %s | FileCheck %s
 ;
 ; Source:
 ; $ cat atomics_mem_order_v3.c

diff  --git a/llvm/test/CodeGen/BPF/atomics_sub64_relaxed_v1.ll b/llvm/test/CodeGen/BPF/atomics_sub64_relaxed_v1.ll
index 4d630d475b2962..1216bda9599620 100644
--- a/llvm/test/CodeGen/BPF/atomics_sub64_relaxed_v1.ll
+++ b/llvm/test/CodeGen/BPF/atomics_sub64_relaxed_v1.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpfel -mcpu=v1 -filetype=asm < %s
+; RUN: not llc -mtriple=bpfel -mcpu=v1 -filetype=asm < %s
 ;
 ; Source:
 ; $ cat atomics_sub64_relaxed_v1.c

diff  --git a/llvm/test/CodeGen/BPF/basictest.ll b/llvm/test/CodeGen/BPF/basictest.ll
index fdcd706ecaf150..68698262d45e55 100644
--- a/llvm/test/CodeGen/BPF/basictest.ll
+++ b/llvm/test/CodeGen/BPF/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 | FileCheck %s
 
 define i32 @test0(i32 %X) {
   %tmp.1 = add i32 %X, 1

diff  --git a/llvm/test/CodeGen/BPF/bpf-fastcall-1.ll b/llvm/test/CodeGen/BPF/bpf-fastcall-1.ll
index fd81314a495ef8..f3e9f9e8dee725 100644
--- a/llvm/test/CodeGen/BPF/bpf-fastcall-1.ll
+++ b/llvm/test/CodeGen/BPF/bpf-fastcall-1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 --march=bpfel %s -o - | FileCheck %s
+; RUN: llc -O2 --mtriple=bpfel %s -o - | FileCheck %s
 
 ; Generated from the following C code:
 ;

diff  --git a/llvm/test/CodeGen/BPF/bpf-fastcall-2.ll b/llvm/test/CodeGen/BPF/bpf-fastcall-2.ll
index 971d5c6cd774ee..6391d011d63192 100644
--- a/llvm/test/CodeGen/BPF/bpf-fastcall-2.ll
+++ b/llvm/test/CodeGen/BPF/bpf-fastcall-2.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 --march=bpfel -mcpu=v1 %s -o - | FileCheck %s
+; RUN: llc -O2 --mtriple=bpfel -mcpu=v1 %s -o - | FileCheck %s
 
 ; Generated from the following C code:
 ;

diff  --git a/llvm/test/CodeGen/BPF/bpf-fastcall-3.ll b/llvm/test/CodeGen/BPF/bpf-fastcall-3.ll
index 81ca4e1ac57bc7..6340be30b12824 100644
--- a/llvm/test/CodeGen/BPF/bpf-fastcall-3.ll
+++ b/llvm/test/CodeGen/BPF/bpf-fastcall-3.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 --march=bpfel %s -o - | FileCheck %s
+; RUN: llc -O2 --mtriple=bpfel %s -o - | FileCheck %s
 
 ; Generated from the following C code:
 ;

diff  --git a/llvm/test/CodeGen/BPF/bpf-fastcall-4.ll b/llvm/test/CodeGen/BPF/bpf-fastcall-4.ll
index 4f0c9fc94aa9df..e67350690a4890 100644
--- a/llvm/test/CodeGen/BPF/bpf-fastcall-4.ll
+++ b/llvm/test/CodeGen/BPF/bpf-fastcall-4.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 --march=bpfel %s -o - | FileCheck %s
+; RUN: llc -O2 --mtriple=bpfel %s -o - | FileCheck %s
 
 ; Generated from the following C code:
 ;

diff  --git a/llvm/test/CodeGen/BPF/bpf-fastcall-5.ll b/llvm/test/CodeGen/BPF/bpf-fastcall-5.ll
index 608ab4a0bb0cfd..62dd6c3ed50bba 100644
--- a/llvm/test/CodeGen/BPF/bpf-fastcall-5.ll
+++ b/llvm/test/CodeGen/BPF/bpf-fastcall-5.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 --march=bpfel %s -o - | FileCheck %s
+; RUN: llc -O2 --mtriple=bpfel %s -o - | FileCheck %s
 
 ; Generated from the following C code:
 ;

diff  --git a/llvm/test/CodeGen/BPF/bpf-fastcall-regmask-1.ll b/llvm/test/CodeGen/BPF/bpf-fastcall-regmask-1.ll
index 857d2f000d1d5a..431aaef1233aa5 100644
--- a/llvm/test/CodeGen/BPF/bpf-fastcall-regmask-1.ll
+++ b/llvm/test/CodeGen/BPF/bpf-fastcall-regmask-1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 --march=bpfel \
+; RUN: llc -O2 --mtriple=bpfel \
 ; RUN:   -print-after=stack-slot-coloring %s \
 ; RUN:   -o /dev/null 2>&1 | FileCheck %s
 

diff  --git a/llvm/test/CodeGen/BPF/bswap.ll b/llvm/test/CodeGen/BPF/bswap.ll
index 86257ef6217180..2b467881b33191 100644
--- a/llvm/test/CodeGen/BPF/bswap.ll
+++ b/llvm/test/CodeGen/BPF/bswap.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
 ; Source:
 ;  long foo(int a, int b, long c) {
 ;    a = __builtin_bswap16(a);

diff  --git a/llvm/test/CodeGen/BPF/byval.ll b/llvm/test/CodeGen/BPF/byval.ll
index b7ff89fd3013aa..8e04695934d2c4 100644
--- a/llvm/test/CodeGen/BPF/byval.ll
+++ b/llvm/test/CodeGen/BPF/byval.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpf < %s 2> %t1
+; RUN: not llc -mtriple=bpf < %s 2> %t1
 ; RUN: FileCheck %s < %t1
 ; CHECK: by value not supported
 

diff  --git a/llvm/test/CodeGen/BPF/callx.ll b/llvm/test/CodeGen/BPF/callx.ll
index a015cf91a37880..d83e0f6888ac7c 100644
--- a/llvm/test/CodeGen/BPF/callx.ll
+++ b/llvm/test/CodeGen/BPF/callx.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel | FileCheck %s
 ; source:
 ;   int test(int (*f)(void)) { return f(); }
 

diff  --git a/llvm/test/CodeGen/BPF/cc_args.ll b/llvm/test/CodeGen/BPF/cc_args.ll
index 0752469ecc2464..11d4c62e3a56ee 100644
--- a/llvm/test/CodeGen/BPF/cc_args.ll
+++ b/llvm/test/CodeGen/BPF/cc_args.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -show-mc-encoding | FileCheck %s
 
 define void @test() #0 {
 entry:

diff  --git a/llvm/test/CodeGen/BPF/cc_args_be.ll b/llvm/test/CodeGen/BPF/cc_args_be.ll
index ae32d3cfb6d9df..88b09382cfee80 100644
--- a/llvm/test/CodeGen/BPF/cc_args_be.ll
+++ b/llvm/test/CodeGen/BPF/cc_args_be.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfeb -mcpu=v1 -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -mcpu=v1 -show-mc-encoding | FileCheck %s
 ; test big endian
 
 define void @test() #0 {

diff  --git a/llvm/test/CodeGen/BPF/cc_ret.ll b/llvm/test/CodeGen/BPF/cc_ret.ll
index 7f5d1f29c0e821..f82b644d9fcda5 100644
--- a/llvm/test/CodeGen/BPF/cc_ret.ll
+++ b/llvm/test/CodeGen/BPF/cc_ret.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 | FileCheck %s
 
 define void @test() #0 {
 entry:

diff  --git a/llvm/test/CodeGen/BPF/cmp.ll b/llvm/test/CodeGen/BPF/cmp.ll
index 119539cdded500..3787526f1e83eb 100644
--- a/llvm/test/CodeGen/BPF/cmp.ll
+++ b/llvm/test/CodeGen/BPF/cmp.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 | FileCheck %s
 
 ; Function Attrs: nounwind readnone uwtable
 define signext i8 @foo_cmp1(i8 signext %a, i8 signext %b) #0 {

diff  --git a/llvm/test/CodeGen/BPF/cttz-ctlz.ll b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
index e0bc90aea36814..865833590a3999 100644
--- a/llvm/test/CodeGen/BPF/cttz-ctlz.ll
+++ b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; RUN: llc < %s -march=bpf -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 | FileCheck %s
 
 ; test that we can expand CTTZ & CTLZ
 

diff  --git a/llvm/test/CodeGen/BPF/dwarfdump.ll b/llvm/test/CodeGen/BPF/dwarfdump.ll
index 2b865bdc4f683d..a3a6b52b2034fa 100644
--- a/llvm/test/CodeGen/BPF/dwarfdump.ll
+++ b/llvm/test/CodeGen/BPF/dwarfdump.ll
@@ -1,6 +1,6 @@
-; RUN: llc -O2 -march=bpfel %s -o %t -filetype=obj
+; RUN: llc -O2 -mtriple=bpfel %s -o %t -filetype=obj
 ; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s
-; RUN: llc -O2 -march=bpfeb %s -o %t -filetype=obj
+; RUN: llc -O2 -mtriple=bpfeb %s -o %t -filetype=obj
 ; RUN: llvm-dwarfdump -debug-line %t | FileCheck %s
 
 source_filename = "testprog.c"

diff  --git a/llvm/test/CodeGen/BPF/ex1.ll b/llvm/test/CodeGen/BPF/ex1.ll
index e4ff19f76381a4..7dd911b727f141 100644
--- a/llvm/test/CodeGen/BPF/ex1.ll
+++ b/llvm/test/CodeGen/BPF/ex1.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 | FileCheck %s
 
 %struct.bpf_context = type { i64, i64, i64, i64, i64, i64, i64 }
 %struct.sk_buff = type { i64, i64, i64, i64, i64, i64, i64 }

diff  --git a/llvm/test/CodeGen/BPF/fi_ri.ll b/llvm/test/CodeGen/BPF/fi_ri.ll
index c030a363ec5b73..8d60d29b527262 100644
--- a/llvm/test/CodeGen/BPF/fi_ri.ll
+++ b/llvm/test/CodeGen/BPF/fi_ri.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 | FileCheck %s
 
 %struct.key_t = type { i32, [16 x i8] }
 

diff  --git a/llvm/test/CodeGen/BPF/gotol.ll b/llvm/test/CodeGen/BPF/gotol.ll
index 0c7d9291f72dae..4df6192d0c8ca7 100644
--- a/llvm/test/CodeGen/BPF/gotol.ll
+++ b/llvm/test/CodeGen/BPF/gotol.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 -gotol-abs-low-bound 0 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 -gotol-abs-low-bound 0 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
 ; Source:
 ;   // This test covers all three cases:
 ;   //   (1). jmp to another basic block (not the follow-through one)

diff  --git a/llvm/test/CodeGen/BPF/i128.ll b/llvm/test/CodeGen/BPF/i128.ll
index 90c81fe9dd0ffb..a966e3e4831eb0 100644
--- a/llvm/test/CodeGen/BPF/i128.ll
+++ b/llvm/test/CodeGen/BPF/i128.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -mcpu=v1 -o - %s | FileCheck %s
-; RUN: llc -march=bpfeb -mcpu=v1 -o - %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v1 -o - %s | FileCheck %s
+; RUN: llc -mtriple=bpfeb -mcpu=v1 -o - %s | FileCheck %s
 ; Source code:
 ;   struct ipv6_key_t {
 ;     unsigned pid;

diff  --git a/llvm/test/CodeGen/BPF/inline_asm.ll b/llvm/test/CodeGen/BPF/inline_asm.ll
index cdbeb4f003c943..529d51d7a52327 100644
--- a/llvm/test/CodeGen/BPF/inline_asm.ll
+++ b/llvm/test/CodeGen/BPF/inline_asm.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -verify-machineinstrs | FileCheck %s
-; RUN: llc < %s -march=bpfeb -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; int g[2];

diff  --git a/llvm/test/CodeGen/BPF/inlineasm-wreg.ll b/llvm/test/CodeGen/BPF/inlineasm-wreg.ll
index 3c4144e60d51ea..496a2d909cb7c7 100644
--- a/llvm/test/CodeGen/BPF/inlineasm-wreg.ll
+++ b/llvm/test/CodeGen/BPF/inlineasm-wreg.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -mattr=+alu32 -verify-machineinstrs | FileCheck %s
-; RUN: llc < %s -march=bpfeb -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -mattr=+alu32 -verify-machineinstrs | FileCheck %s
 
 ; Test that %w works as input constraint
 ; CHECK-LABEL: test_inlineasm_w_input_constraint

diff  --git a/llvm/test/CodeGen/BPF/intrinsics.ll b/llvm/test/CodeGen/BPF/intrinsics.ll
index 2158097bc967b6..4bc7fee02df04f 100644
--- a/llvm/test/CodeGen/BPF/intrinsics.ll
+++ b/llvm/test/CodeGen/BPF/intrinsics.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 -show-mc-encoding | FileCheck --check-prefix=CHECK-EL %s
-; RUN: llc < %s -march=bpfeb -mcpu=v1 -show-mc-encoding | FileCheck --check-prefix=CHECK-EB %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -show-mc-encoding | FileCheck --check-prefix=CHECK-EL %s
+; RUN: llc < %s -mtriple=bpfeb -mcpu=v1 -show-mc-encoding | FileCheck --check-prefix=CHECK-EB %s
 
 ; Function Attrs: nounwind uwtable
 define i32 @ld_b(i64 %foo, ptr nocapture %bar, ptr %ctx, ptr %ctx2) #0 {

diff  --git a/llvm/test/CodeGen/BPF/is_trunc_free.ll b/llvm/test/CodeGen/BPF/is_trunc_free.ll
index 4d110a4ac11402..21c8a2aebeda17 100644
--- a/llvm/test/CodeGen/BPF/is_trunc_free.ll
+++ b/llvm/test/CodeGen/BPF/is_trunc_free.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mattr=+alu32 < %s | FileCheck %s
 ; Source:
 ;   struct env_t {
 ;     unsigned data;

diff  --git a/llvm/test/CodeGen/BPF/is_zext_free.ll b/llvm/test/CodeGen/BPF/is_zext_free.ll
index 2a62dbefd62d28..4b81a908f57b63 100644
--- a/llvm/test/CodeGen/BPF/is_zext_free.ll
+++ b/llvm/test/CodeGen/BPF/is_zext_free.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mattr=+alu32 < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mattr=+alu32 < %s | FileCheck %s
 ; Source:
 ;   unsigned test(unsigned long x, unsigned long y) {
 ;     return x & y;

diff  --git a/llvm/test/CodeGen/BPF/ldsx.ll b/llvm/test/CodeGen/BPF/ldsx.ll
index 622cacf1ad0c1c..59ca8cef871942 100644
--- a/llvm/test/CodeGen/BPF/ldsx.ll
+++ b/llvm/test/CodeGen/BPF/ldsx.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
 ; Source:
 ;  int f1(char *p) {
 ;    return *p;

diff  --git a/llvm/test/CodeGen/BPF/load.ll b/llvm/test/CodeGen/BPF/load.ll
index 048924817c4cf0..f42a8c7caf5616 100644
--- a/llvm/test/CodeGen/BPF/load.ll
+++ b/llvm/test/CodeGen/BPF/load.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 | FileCheck %s
 
 define i16 @am1(ptr %a) nounwind {
   %1 = load i16, ptr %a

diff  --git a/llvm/test/CodeGen/BPF/loops.ll b/llvm/test/CodeGen/BPF/loops.ll
index 2bdaea0f737622..8b9caa4f57b832 100644
--- a/llvm/test/CodeGen/BPF/loops.ll
+++ b/llvm/test/CodeGen/BPF/loops.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 | FileCheck %s
 
 define zeroext i16 @add(ptr nocapture %a, i16 zeroext %n) nounwind readonly {
 entry:

diff  --git a/llvm/test/CodeGen/BPF/many_args1.ll b/llvm/test/CodeGen/BPF/many_args1.ll
index 441da648eaa175..0e2ff1af06e559 100644
--- a/llvm/test/CodeGen/BPF/many_args1.ll
+++ b/llvm/test/CodeGen/BPF/many_args1.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpf -mcpu=v1 < %s 2> %t1
+; RUN: not llc -mtriple=bpf -mcpu=v1 < %s 2> %t1
 ; RUN: FileCheck %s < %t1
 ; CHECK: error: <unknown>:0:0: in function foo i32 (i32, i32, i32): {{t10|0x[0-f]+}}: i64 = GlobalAddress<ptr @bar> 0 too many arguments
 

diff  --git a/llvm/test/CodeGen/BPF/many_args2.ll b/llvm/test/CodeGen/BPF/many_args2.ll
index c5d6349dd6e1a7..d1feefc0e4047d 100644
--- a/llvm/test/CodeGen/BPF/many_args2.ll
+++ b/llvm/test/CodeGen/BPF/many_args2.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpf < %s 2> %t1
+; RUN: not llc -mtriple=bpf < %s 2> %t1
 ; RUN: FileCheck %s < %t1
 ; CHECK: error: <unknown>:0:0: in function bar i32 (i32, i32, i32, i32, i32, i32): stack arguments are not supported
 

diff  --git a/llvm/test/CodeGen/BPF/mem_offset.ll b/llvm/test/CodeGen/BPF/mem_offset.ll
index abb4a5e9b42368..498ff62ffa2968 100644
--- a/llvm/test/CodeGen/BPF/mem_offset.ll
+++ b/llvm/test/CodeGen/BPF/mem_offset.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -show-mc-encoding < %s | FileCheck %s
 
 ; Function Attrs: nounwind
 define i32 @bpf_prog1(ptr nocapture readnone) local_unnamed_addr #0 {

diff  --git a/llvm/test/CodeGen/BPF/mem_offset_be.ll b/llvm/test/CodeGen/BPF/mem_offset_be.ll
index 832a48455b784e..123c069fe8b8f6 100644
--- a/llvm/test/CodeGen/BPF/mem_offset_be.ll
+++ b/llvm/test/CodeGen/BPF/mem_offset_be.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfeb -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfeb -show-mc-encoding < %s | FileCheck %s
 
 ; Function Attrs: nounwind
 define i32 @bpf_prog1(ptr nocapture readnone) local_unnamed_addr #0 {

diff  --git a/llvm/test/CodeGen/BPF/memcmp.ll b/llvm/test/CodeGen/BPF/memcmp.ll
index 7ed8dc1e736f4c..4c326feda55920 100644
--- a/llvm/test/CodeGen/BPF/memcmp.ll
+++ b/llvm/test/CodeGen/BPF/memcmp.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel < %s | FileCheck %s
-; RUN: llc -march=bpfel -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v3 < %s | FileCheck %s
 ;
 ; Source code:
 ;   /* set aligned 4 to minimize the number of loads */

diff  --git a/llvm/test/CodeGen/BPF/memcpy-expand-in-order.ll b/llvm/test/CodeGen/BPF/memcpy-expand-in-order.ll
index c690c0e5ccaaae..61f6c60f5de5ec 100644
--- a/llvm/test/CodeGen/BPF/memcpy-expand-in-order.ll
+++ b/llvm/test/CodeGen/BPF/memcpy-expand-in-order.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -verify-machineinstrs -bpf-expand-memcpy-in-order | FileCheck %s
-; RUN: llc < %s -march=bpfeb -verify-machineinstrs -bpf-expand-memcpy-in-order | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -verify-machineinstrs -bpf-expand-memcpy-in-order | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -verify-machineinstrs -bpf-expand-memcpy-in-order | FileCheck %s
 ;
 ; #define COPY_LEN	9
 ;

diff  --git a/llvm/test/CodeGen/BPF/movsx.ll b/llvm/test/CodeGen/BPF/movsx.ll
index f781c8c10c4f1d..4d3c31c9d7f4db 100644
--- a/llvm/test/CodeGen/BPF/movsx.ll
+++ b/llvm/test/CodeGen/BPF/movsx.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
 ; Source:
 ;   short f1(int a) {
 ;     return (char)a;

diff  --git a/llvm/test/CodeGen/BPF/no-merge-attr.ll b/llvm/test/CodeGen/BPF/no-merge-attr.ll
index b5c43ace2bab15..7896c8c9754c81 100644
--- a/llvm/test/CodeGen/BPF/no-merge-attr.ll
+++ b/llvm/test/CodeGen/BPF/no-merge-attr.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ;
 ; Source:
 ;   extern void foo(void) __attribute__((nomerge));

diff  --git a/llvm/test/CodeGen/BPF/optnone-1.ll b/llvm/test/CodeGen/BPF/optnone-1.ll
index 4f06f9d205a935..68046bf026facf 100644
--- a/llvm/test/CodeGen/BPF/optnone-1.ll
+++ b/llvm/test/CodeGen/BPF/optnone-1.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
+; RUN: llc -mtriple=bpfel -filetype=asm -o - %s | FileCheck -check-prefixes=CHECK %s
 ; Source Code:
 ;   int test(int a, int b) { return a + b; }
 ; Compilation flag:

diff  --git a/llvm/test/CodeGen/BPF/optnone-2.ll b/llvm/test/CodeGen/BPF/optnone-2.ll
index 1693d1858a9807..38428557303d23 100644
--- a/llvm/test/CodeGen/BPF/optnone-2.ll
+++ b/llvm/test/CodeGen/BPF/optnone-2.ll
@@ -1,5 +1,5 @@
-; RUN: opt < %s -passes='default<O2>' | llc -march=bpfel -filetype=asm -o /dev/null -
-; RUN: opt < %s -passes='default<O0>' | llc -march=bpfel -filetype=asm -o /dev/null -
+; RUN: opt < %s -passes='default<O2>' | llc -mtriple=bpfel -filetype=asm -o /dev/null -
+; RUN: opt < %s -passes='default<O0>' | llc -mtriple=bpfel -filetype=asm -o /dev/null -
 
 ; IR generated by
 ; $ cat /tmp/a.c

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_1.ll b/llvm/test/CodeGen/BPF/remove_truncate_1.ll
index cb0b139fe7aedb..631312afab25cd 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_1.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_1.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; struct xdp_md {

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_2.ll b/llvm/test/CodeGen/BPF/remove_truncate_2.ll
index 4e8d4c3e774b84..2724ae11684d5f 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_2.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_2.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; struct xdp_md {

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_3.ll b/llvm/test/CodeGen/BPF/remove_truncate_3.ll
index 0ab60609f2d620..767d9d259e51a0 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_3.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_3.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; struct xdp_md {

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_4.ll b/llvm/test/CodeGen/BPF/remove_truncate_4.ll
index c38b7416986690..5c5ecc45aead9e 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_4.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_4.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ;struct __sk_buff;

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_5.ll b/llvm/test/CodeGen/BPF/remove_truncate_5.ll
index 070d464c0c3982..10a722fe348594 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_5.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_5.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel | FileCheck -check-prefixes=CHECK %s
+; RUN: llc < %s -mtriple=bpfel | FileCheck -check-prefixes=CHECK %s
 
 ; Source code:
 ; struct test_t {

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_6.ll b/llvm/test/CodeGen/BPF/remove_truncate_6.ll
index 949f58819884fc..9f893af655d15a 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_6.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_6.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
-; RUN: llc < %s -march=bpf -mcpu=v1 -mattr=+alu32 -verify-machineinstrs | FileCheck --check-prefix=CHECK-32 %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 -mattr=+alu32 -verify-machineinstrs | FileCheck --check-prefix=CHECK-32 %s
 ;
 ; void cal1(unsigned short *a, unsigned long *b, unsigned int k)
 ; {

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_7.ll b/llvm/test/CodeGen/BPF/remove_truncate_7.ll
index 0d76a8d2e2d197..14c7a552b0dbfc 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_7.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_7.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mattr=+alu32 -verify-machineinstrs | FileCheck %s
 ;
 ; Source:
 ;  struct __sk_buff {

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_8.ll b/llvm/test/CodeGen/BPF/remove_truncate_8.ll
index 3a13c0acd2992f..9770549f8d8604 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_8.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_8.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v1 -verify-machineinstrs | FileCheck %s
 ; Source Code:
 ;   struct loc_prog {
 ;     unsigned int ip;

diff  --git a/llvm/test/CodeGen/BPF/remove_truncate_9.ll b/llvm/test/CodeGen/BPF/remove_truncate_9.ll
index 3b9293d38fd01f..dd3114926bcf1d 100644
--- a/llvm/test/CodeGen/BPF/remove_truncate_9.ll
+++ b/llvm/test/CodeGen/BPF/remove_truncate_9.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mcpu=v2 -march=bpf < %s | FileCheck %s
-; RUN: llc -mcpu=v4 -march=bpf < %s | FileCheck %s
+; RUN: llc -mcpu=v2 -mtriple=bpf < %s | FileCheck %s
+; RUN: llc -mcpu=v4 -mtriple=bpf < %s | FileCheck %s
 
 ; Zero extension instructions should be eliminated at instruction
 ; selection phase for all test cases below.

diff  --git a/llvm/test/CodeGen/BPF/rodata_1.ll b/llvm/test/CodeGen/BPF/rodata_1.ll
index 6813ee8a116039..26dd85caa1d210 100644
--- a/llvm/test/CodeGen/BPF/rodata_1.ll
+++ b/llvm/test/CodeGen/BPF/rodata_1.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck %s
-; RUN: llc < %s -march=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; struct test_t1 {

diff  --git a/llvm/test/CodeGen/BPF/rodata_2.ll b/llvm/test/CodeGen/BPF/rodata_2.ll
index 9ec98fb08adcb5..bb7bf4ba8ace7d 100644
--- a/llvm/test/CodeGen/BPF/rodata_2.ll
+++ b/llvm/test/CodeGen/BPF/rodata_2.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck %s
-; RUN: llc < %s -march=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; struct test_t1 {

diff  --git a/llvm/test/CodeGen/BPF/rodata_3.ll b/llvm/test/CodeGen/BPF/rodata_3.ll
index 696775ba74c8c3..04186935ea8c86 100644
--- a/llvm/test/CodeGen/BPF/rodata_3.ll
+++ b/llvm/test/CodeGen/BPF/rodata_3.ll
@@ -1,6 +1,6 @@
 ; REQUIRES: x86_64-linux
-; RUN: llc < %s -march=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck --check-prefix=CHECK-EL %s
-; RUN: llc < %s -march=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck --check-prefix=CHECK-EB %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck --check-prefix=CHECK-EL %s
+; RUN: llc < %s -mtriple=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck --check-prefix=CHECK-EB %s
 ;
 ; This test requires little-endian host, so we specific x86_64-linux here.
 ; Source code:

diff  --git a/llvm/test/CodeGen/BPF/rodata_4.ll b/llvm/test/CodeGen/BPF/rodata_4.ll
index a3eecb0e8d72df..a446475a69c19e 100644
--- a/llvm/test/CodeGen/BPF/rodata_4.ll
+++ b/llvm/test/CodeGen/BPF/rodata_4.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck %s
-; RUN: llc < %s -march=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -mcpu=v1 -verify-machineinstrs | FileCheck %s
 
 ; Source code:
 ; struct test_t1

diff  --git a/llvm/test/CodeGen/BPF/rodata_5.ll b/llvm/test/CodeGen/BPF/rodata_5.ll
index 223ec936e64656..8d5c7970aff6a9 100644
--- a/llvm/test/CodeGen/BPF/rodata_5.ll
+++ b/llvm/test/CodeGen/BPF/rodata_5.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -mattr=+alu32 -verify-machineinstrs | FileCheck %s
-; RUN: llc < %s -march=bpfeb -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mattr=+alu32 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpfeb -mattr=+alu32 -verify-machineinstrs | FileCheck %s
 ;
 ; Source Code:
 ;   struct t {

diff  --git a/llvm/test/CodeGen/BPF/rodata_6.ll b/llvm/test/CodeGen/BPF/rodata_6.ll
index 6603041e2e9433..55205ae2aaad5c 100644
--- a/llvm/test/CodeGen/BPF/rodata_6.ll
+++ b/llvm/test/CodeGen/BPF/rodata_6.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpf -mcpu=v1 < %s | FileCheck %s
+; RUN: llc -mtriple=bpf -mcpu=v1 < %s | FileCheck %s
 ;
 ; Source code:
 ;   struct t1 { int a; };

diff  --git a/llvm/test/CodeGen/BPF/rodata_7.ll b/llvm/test/CodeGen/BPF/rodata_7.ll
index c238aa7a4fd864..93a8b5f5639608 100644
--- a/llvm/test/CodeGen/BPF/rodata_7.ll
+++ b/llvm/test/CodeGen/BPF/rodata_7.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpf -mcpu=v1 < %s | FileCheck %s
+; RUN: llc -mtriple=bpf -mcpu=v1 < %s | FileCheck %s
 ;
 ; Source code:
 ;   struct t1 { int a; };

diff  --git a/llvm/test/CodeGen/BPF/sdiv_smod.ll b/llvm/test/CodeGen/BPF/sdiv_smod.ll
index f944e5f21c6f2c..5fb23d03f172db 100644
--- a/llvm/test/CodeGen/BPF/sdiv_smod.ll
+++ b/llvm/test/CodeGen/BPF/sdiv_smod.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 -verify-machineinstrs -show-mc-encoding < %s | FileCheck %s
 ; Source:
 ;  int foo(int a, int b, int c) {
 ;    return a/b + a%c;

diff  --git a/llvm/test/CodeGen/BPF/sdiv_to_mul.ll b/llvm/test/CodeGen/BPF/sdiv_to_mul.ll
index 7bb1b7badac1f4..cb01eeb46b3e98 100644
--- a/llvm/test/CodeGen/BPF/sdiv_to_mul.ll
+++ b/llvm/test/CodeGen/BPF/sdiv_to_mul.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -mcpu=v1 < %s | FileCheck --check-prefix=CHECK-V1 %s
-; RUN: llc -march=bpfel -mcpu=v4 < %s | FileCheck --check-prefix=CHECK-V4 %s
+; RUN: llc -mtriple=bpfel -mcpu=v1 < %s | FileCheck --check-prefix=CHECK-V1 %s
+; RUN: llc -mtriple=bpfel -mcpu=v4 < %s | FileCheck --check-prefix=CHECK-V4 %s
 
 target triple = "bpf"
 

diff  --git a/llvm/test/CodeGen/BPF/select_ri.ll b/llvm/test/CodeGen/BPF/select_ri.ll
index 2c910eff067566..6d1529d8050ee2 100644
--- a/llvm/test/CodeGen/BPF/select_ri.ll
+++ b/llvm/test/CodeGen/BPF/select_ri.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf -mcpu=v2 -verify-machineinstrs | FileCheck %s
+; RUN: llc < %s -mtriple=bpf -mcpu=v2 -verify-machineinstrs | FileCheck %s
 ;
 ; Source file:
 ; int b, c;

diff  --git a/llvm/test/CodeGen/BPF/selectiondag-bug.ll b/llvm/test/CodeGen/BPF/selectiondag-bug.ll
index 2351994e458953..d4853ed5941406 100644
--- a/llvm/test/CodeGen/BPF/selectiondag-bug.ll
+++ b/llvm/test/CodeGen/BPF/selectiondag-bug.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpf < %s | FileCheck %s
+; RUN: llc -mtriple=bpf < %s | FileCheck %s
 ;
 ; The IR is generated from a bpftrace script (https://github.com/iovisor/bpftrace/issues/1305)
 ; and then slightly adapted for easy unit testing.

diff  --git a/llvm/test/CodeGen/BPF/setcc.ll b/llvm/test/CodeGen/BPF/setcc.ll
index 9f01f978473fa9..0e6103e3f3b056 100644
--- a/llvm/test/CodeGen/BPF/setcc.ll
+++ b/llvm/test/CodeGen/BPF/setcc.ll
@@ -1,5 +1,5 @@
-; RUN: llc -march=bpfel -mcpu=v1 < %s | FileCheck --check-prefix=CHECK-V1 %s
-; RUN: llc -march=bpfel -mcpu=v2 < %s | FileCheck --check-prefix=CHECK-V2 %s
+; RUN: llc -mtriple=bpfel -mcpu=v1 < %s | FileCheck --check-prefix=CHECK-V1 %s
+; RUN: llc -mtriple=bpfel -mcpu=v2 < %s | FileCheck --check-prefix=CHECK-V2 %s
 
 define i16 @sccweqand(i16 %a, i16 %b) nounwind {
   %t1 = and i16 %a, %b

diff  --git a/llvm/test/CodeGen/BPF/shifts.ll b/llvm/test/CodeGen/BPF/shifts.ll
index ade49d816e521e..13c05c0b06be0a 100644
--- a/llvm/test/CodeGen/BPF/shifts.ll
+++ b/llvm/test/CodeGen/BPF/shifts.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -show-mc-encoding | FileCheck %s
 
 define zeroext i8 @lshr8(i8 zeroext %a, i8 zeroext %cnt) nounwind readnone {
 entry:

diff  --git a/llvm/test/CodeGen/BPF/sockex2.ll b/llvm/test/CodeGen/BPF/sockex2.ll
index b26192a08326e7..6874751124b308 100644
--- a/llvm/test/CodeGen/BPF/sockex2.ll
+++ b/llvm/test/CodeGen/BPF/sockex2.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 -show-mc-encoding | FileCheck %s
 
 %struct.bpf_map_def = type { i32, i32, i32, i32 }
 %struct.sk_buff = type opaque

diff  --git a/llvm/test/CodeGen/BPF/spill-alu32.ll b/llvm/test/CodeGen/BPF/spill-alu32.ll
index c9de589cad3eb3..d8b5172e8b0a12 100644
--- a/llvm/test/CodeGen/BPF/spill-alu32.ll
+++ b/llvm/test/CodeGen/BPF/spill-alu32.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=bpf -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -mtriple=bpf -mcpu=v3 < %s | FileCheck %s
 ;
 ; Source code:
 ;   void foo(int, int, int, long, int);

diff  --git a/llvm/test/CodeGen/BPF/store_imm.ll b/llvm/test/CodeGen/BPF/store_imm.ll
index 778beca176f918..dba83937837b65 100644
--- a/llvm/test/CodeGen/BPF/store_imm.ll
+++ b/llvm/test/CodeGen/BPF/store_imm.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc < %s -march=bpfel -mcpu=v4 -show-mc-encoding | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v4 -show-mc-encoding | FileCheck %s
 
 target triple = "bpf"
 

diff  --git a/llvm/test/CodeGen/BPF/struct-arg.ll b/llvm/test/CodeGen/BPF/struct-arg.ll
index cfe49df0453635..fd4900c52738b2 100644
--- a/llvm/test/CodeGen/BPF/struct-arg.ll
+++ b/llvm/test/CodeGen/BPF/struct-arg.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpfel | FileCheck %s
+; RUN: llc < %s -mtriple=bpfel | FileCheck %s
 ; Source:
 ;   struct t1 {
 ;     long a;

diff  --git a/llvm/test/CodeGen/BPF/struct_ret1.ll b/llvm/test/CodeGen/BPF/struct_ret1.ll
index 387e466db42357..40d17ec514c48b 100644
--- a/llvm/test/CodeGen/BPF/struct_ret1.ll
+++ b/llvm/test/CodeGen/BPF/struct_ret1.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpf < %s 2> %t1
+; RUN: not llc -mtriple=bpf < %s 2> %t1
 ; RUN: FileCheck %s < %t1
 ; CHECK: error: <unknown>:0:0: in function bar { i64, i32 } (i32, i32, i32, i32, i32): aggregate returns are not supported
 

diff  --git a/llvm/test/CodeGen/BPF/struct_ret2.ll b/llvm/test/CodeGen/BPF/struct_ret2.ll
index 90461205f7cf25..170d55cc29df07 100644
--- a/llvm/test/CodeGen/BPF/struct_ret2.ll
+++ b/llvm/test/CodeGen/BPF/struct_ret2.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpf < %s 2> %t1
+; RUN: not llc -mtriple=bpf < %s 2> %t1
 ; RUN: FileCheck %s < %t1
 ; CHECK: only small returns
 

diff  --git a/llvm/test/CodeGen/BPF/undef.ll b/llvm/test/CodeGen/BPF/undef.ll
index c0cd8f89df6a94..05af4f3b61d85f 100644
--- a/llvm/test/CodeGen/BPF/undef.ll
+++ b/llvm/test/CodeGen/BPF/undef.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=bpfel -mcpu=v1 | FileCheck -check-prefixes=CHECK,EL %s
-; RUN: llc < %s -march=bpfeb -mcpu=v1 | FileCheck -check-prefixes=CHECK,EB %s
+; RUN: llc < %s -mtriple=bpfel -mcpu=v1 | FileCheck -check-prefixes=CHECK,EL %s
+; RUN: llc < %s -mtriple=bpfeb -mcpu=v1 | FileCheck -check-prefixes=CHECK,EB %s
 
 %struct.bpf_map_def = type { i32, i32, i32, i32 }
 %struct.__sk_buff = type opaque

diff  --git a/llvm/test/CodeGen/BPF/vararg1.ll b/llvm/test/CodeGen/BPF/vararg1.ll
index 2b5ed16ddf135f..835c29fbaa619e 100644
--- a/llvm/test/CodeGen/BPF/vararg1.ll
+++ b/llvm/test/CodeGen/BPF/vararg1.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpf < %s 2> %t1
+; RUN: not llc -mtriple=bpf < %s 2> %t1
 ; RUN: FileCheck %s < %t1
 ; CHECK: error: <unknown>:0:0: in function foo void (i32, ...): variadic functions are not supported
 

diff  --git a/llvm/test/CodeGen/BPF/warn-call.ll b/llvm/test/CodeGen/BPF/warn-call.ll
index fbfaead98f13d9..d0b1da5e642641 100644
--- a/llvm/test/CodeGen/BPF/warn-call.ll
+++ b/llvm/test/CodeGen/BPF/warn-call.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpfel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not llc -mtriple=bpfel < %s 2>&1 >/dev/null | FileCheck %s
 
 ; CHECK: error: warn_call.c
 ; CHECK: built-in function 'memcpy'

diff  --git a/llvm/test/CodeGen/BPF/warn-stack.ll b/llvm/test/CodeGen/BPF/warn-stack.ll
index 807e196b926d98..58a6e4c8d9e74f 100644
--- a/llvm/test/CodeGen/BPF/warn-stack.ll
+++ b/llvm/test/CodeGen/BPF/warn-stack.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpfel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not llc -mtriple=bpfel < %s 2>&1 >/dev/null | FileCheck %s
 
 ;; CHECK-NOT: nowarn
 define void @nowarn() local_unnamed_addr #0 !dbg !6 {

diff  --git a/llvm/test/CodeGen/BPF/xadd.ll b/llvm/test/CodeGen/BPF/xadd.ll
index ed7fb130f37fea..a3ec3235e04f49 100644
--- a/llvm/test/CodeGen/BPF/xadd.ll
+++ b/llvm/test/CodeGen/BPF/xadd.ll
@@ -1,5 +1,5 @@
-; RUN: not llc -march=bpfel -mcpu=v1 < %s 2>&1 | FileCheck %s
-; RUN: not llc -march=bpfeb -mcpu=v1 < %s 2>&1 | FileCheck %s
+; RUN: not llc -mtriple=bpfel -mcpu=v1 < %s 2>&1 | FileCheck %s
+; RUN: not llc -mtriple=bpfeb -mcpu=v1 < %s 2>&1 | FileCheck %s
 
 ; This file is generated with the source command and source
 ; $ clang -target bpf -O2 -g -S -emit-llvm t.c

diff  --git a/llvm/test/CodeGen/BPF/xadd_legal.ll b/llvm/test/CodeGen/BPF/xadd_legal.ll
index 7bfe91e73e23b7..652de9c821342e 100644
--- a/llvm/test/CodeGen/BPF/xadd_legal.ll
+++ b/llvm/test/CodeGen/BPF/xadd_legal.ll
@@ -1,7 +1,7 @@
-; RUN: llc -march=bpfel -mcpu=v1 < %s 2>&1 | FileCheck --check-prefix=CHECK-64 %s
-; RUN: llc -march=bpfeb -mcpu=v1 < %s 2>&1 | FileCheck --check-prefix=CHECK-64 %s
-; RUN: llc -march=bpfel -mcpu=v1 -mattr=+alu32 < %s 2>&1 | FileCheck --check-prefix=CHECK-32 %s
-; RUN: llc -march=bpfeb -mcpu=v1 -mattr=+alu32 < %s 2>&1 | FileCheck --check-prefix=CHECK-32 %s
+; RUN: llc -mtriple=bpfel -mcpu=v1 < %s 2>&1 | FileCheck --check-prefix=CHECK-64 %s
+; RUN: llc -mtriple=bpfeb -mcpu=v1 < %s 2>&1 | FileCheck --check-prefix=CHECK-64 %s
+; RUN: llc -mtriple=bpfel -mcpu=v1 -mattr=+alu32 < %s 2>&1 | FileCheck --check-prefix=CHECK-32 %s
+; RUN: llc -mtriple=bpfeb -mcpu=v1 -mattr=+alu32 < %s 2>&1 | FileCheck --check-prefix=CHECK-32 %s
 
 ; This file is generated with the source command and source
 ; $ clang -target bpf -O2 -S -emit-llvm t.c

diff  --git a/llvm/test/CodeGen/BPF/xaddd_v1.ll b/llvm/test/CodeGen/BPF/xaddd_v1.ll
index d3bfd8d81b15b5..4fd019a1eef723 100644
--- a/llvm/test/CodeGen/BPF/xaddd_v1.ll
+++ b/llvm/test/CodeGen/BPF/xaddd_v1.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpfel -mcpu=v1 -filetype=asm < %s
+; RUN: not llc -mtriple=bpfel -mcpu=v1 -filetype=asm < %s
 ;
 ; Source:
 ; $ cat xaddd_v1.c


        
