From 7f1c077c3014760030cbaebdfccb8f99a4ec41c5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 6 Jul 2021 18:46:21 -0700 Subject: [PATCH] tests/CodeGen: Use %python lit substitution when invoking python This will use the python that LLVM was configured to use rather than python from PATH. Reviewed By: serge-sans-paille Differential Revision: https://reviews.llvm.org/D105224 --- llvm/test/CodeGen/NVPTX/ld-st-addrrspace.py | 2 +- llvm/test/CodeGen/NVPTX/wmma.py | 14 +++++++------- llvm/test/CodeGen/SystemZ/Large/branch-range-01.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-02.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-03.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-04.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-05.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-06.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-07.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-08.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-09.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-10.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-11.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-12.py | 2 +- llvm/test/CodeGen/SystemZ/Large/branch-range-13.py | 2 +- llvm/test/CodeGen/SystemZ/Large/spill-01.py | 2 +- llvm/test/CodeGen/SystemZ/Large/spill-02.py | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/llvm/test/CodeGen/NVPTX/ld-st-addrrspace.py b/llvm/test/CodeGen/NVPTX/ld-st-addrrspace.py index 7c28620..cbeb027 100644 --- a/llvm/test/CodeGen/NVPTX/ld-st-addrrspace.py +++ b/llvm/test/CodeGen/NVPTX/ld-st-addrrspace.py @@ -1,7 +1,7 @@ # This test generates all variants of load/store instructions and verifies that # LLVM generates correct PTX for them. -# RUN: python %s > %t.ll +# RUN: %python %s > %t.ll # RUN: llc < %t.ll -march=nvptx64 -mcpu=sm_30 | FileCheck -check-prefixes=CHECK,CHECK_P64 %t.ll # RUN: llc < %t.ll -march=nvptx -mcpu=sm_30 | FileCheck -check-prefixes=CHECK,CHECK_P32 %t.ll diff --git a/llvm/test/CodeGen/NVPTX/wmma.py b/llvm/test/CodeGen/NVPTX/wmma.py index 8a808bd..2daffd0 100644 --- a/llvm/test/CodeGen/NVPTX/wmma.py +++ b/llvm/test/CodeGen/NVPTX/wmma.py @@ -2,7 +2,7 @@ # generates correct instructions for them. # Check all variants of instructions supported by PTX60 on SM70 -# RUN: python %s --ptx=60 --gpu-arch=70 > %t-ptx60-sm_70.ll +# RUN: %python %s --ptx=60 --gpu-arch=70 > %t-ptx60-sm_70.ll # RUN: FileCheck %t-ptx60-sm_70.ll < %t-ptx60-sm_70.ll \ # RUN: --check-prefixes=INTRINSICS,M16N16 # RUN: FileCheck %t-ptx60-sm_70.ll < %t-ptx60-sm_70.ll \ @@ -11,7 +11,7 @@ # RUN: | FileCheck %t-ptx60-sm_70.ll # Check all variants of instructions supported by PTX61 on SM70 -# RUN: python %s --ptx=61 --gpu-arch=70 > %t-ptx61-sm_70.ll +# RUN: %python %s --ptx=61 --gpu-arch=70 > %t-ptx61-sm_70.ll # RUN: FileCheck %t-ptx61-sm_70.ll < %t-ptx61-sm_70.ll \ # RUN: --check-prefixes=INTRINSICS,M16N16,EXTGEOM # RUN: FileCheck %t-ptx61-sm_70.ll < %t-ptx61-sm_70.ll \ @@ -20,7 +20,7 @@ # RUN: | FileCheck %t-ptx61-sm_70.ll # Check all variants of instructions supported by PTX63 on SM72 -# RUN: python %s --ptx=63 --gpu-arch=72 > %t-ptx63-sm_72.ll +# RUN: %python %s --ptx=63 --gpu-arch=72 > %t-ptx63-sm_72.ll # RUN: FileCheck %t-ptx63-sm_72.ll < %t-ptx63-sm_72.ll \ # RUN: --check-prefixes=INTRINSICS,M16N16,EXTGEOM,INT # RUN: FileCheck %t-ptx63-sm_72.ll < %t-ptx63-sm_72.ll \ @@ -29,7 +29,7 @@ # RUN: | FileCheck %t-ptx63-sm_72.ll # Check all variants of instructions supported by PTX63 on SM75 -# RUN: python %s --ptx=63 --gpu-arch=75 > %t-ptx63-sm_75.ll +# RUN: %python %s --ptx=63 --gpu-arch=75 > %t-ptx63-sm_75.ll # RUN: FileCheck %t-ptx63-sm_75.ll < %t-ptx63-sm_75.ll \ # RUN: --check-prefixes=INTRINSICS,M16N16,EXTGEOM,INT,SUBINT # RUN: FileCheck %t-ptx63-sm_75.ll < %t-ptx63-sm_75.ll \ @@ -38,7 +38,7 @@ # RUN: | FileCheck %t-ptx63-sm_75.ll # Check all variants of instructions supported by PTX64 on SM70+ -# RUN: python %s --ptx=64 --gpu-arch=70 > %t-ptx64-sm_70.ll +# RUN: %python %s --ptx=64 --gpu-arch=70 > %t-ptx64-sm_70.ll # RUN: FileCheck %t-ptx64-sm_70.ll < %t-ptx64-sm_70.ll \ # RUN: --check-prefixes=INTRINSICS,M16N16,EXTGEOM,MMA # RUN: FileCheck %t-ptx64-sm_70.ll < %t-ptx64-sm_70.ll \ @@ -47,7 +47,7 @@ # RUN: | FileCheck %t-ptx64-sm_70.ll # Check all variants of instructions supported by PTX65 on SM75+ -# RUN: python %s --ptx=65 --gpu-arch=75 > %t-ptx65-sm_75.ll +# RUN: %python %s --ptx=65 --gpu-arch=75 > %t-ptx65-sm_75.ll # RUN: FileCheck %t-ptx65-sm_75.ll < %t-ptx65-sm_75.ll \ # RUN: --check-prefixes=INTRINSICS,M16N16,EXTGEOM,INT,SUBINT,MMA,PTX65MMA # RUN: FileCheck %t-ptx65-sm_75.ll < %t-ptx65-sm_75.ll \ @@ -56,7 +56,7 @@ # RUN: | FileCheck %t-ptx65-sm_75.ll # Check all variants of instructions supported by PTX70 on SM80+ -# RUN: python %s --ptx=70 --gpu-arch=80 > %t-ptx70-sm_80.ll +# RUN: %python %s --ptx=70 --gpu-arch=80 > %t-ptx70-sm_80.ll # RUN: FileCheck %t-ptx70-sm_80.ll < %t-ptx70-sm_80.ll \ # RUN: --check-prefixes=INTRINSICS,M16N16,EXTGEOM,INT,SUBINT,MMA,ALTFLOAT,DOUBLE,PTX65MMA,PTX70MMA # RUN: FileCheck %t-ptx70-sm_80.ll < %t-ptx70-sm_80.ll \ diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py index 49ce623..162cabd 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-01.py @@ -1,6 +1,6 @@ # Test normal conditional branches in cases where the sheer number of # instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py index 155f742..a636309 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-02.py @@ -1,6 +1,6 @@ # Test normal conditional branches in cases where block alignments cause # some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu -align-all-blocks=8 | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu -align-all-blocks=8 | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py index f58bedf..025cbdf 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-03.py @@ -1,6 +1,6 @@ # Test 32-bit COMPARE AND BRANCH in cases where the sheer number of # instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py index 6aca0a2..9292dc9 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-04.py @@ -1,6 +1,6 @@ # Test 64-bit COMPARE AND BRANCH in cases where the sheer number of # instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py index 326fe8b..4c01f90 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-05.py @@ -1,6 +1,6 @@ # Test 32-bit COMPARE IMMEDIATE AND BRANCH in cases where the sheer number of # instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py index 44cc5c6..4553887 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-06.py @@ -1,6 +1,6 @@ # Test 64-bit COMPARE IMMEDIATE AND BRANCH in cases where the sheer number of # instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py index 71e9588..4fd72d6 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-07.py @@ -1,6 +1,6 @@ # Test 32-bit BRANCH RELATIVE ON COUNT in cases where some branches are out # of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py index 2ef6859..7e6e2bf 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-08.py @@ -1,6 +1,6 @@ # Test 64-bit BRANCH RELATIVE ON COUNT in cases where some branches are out # of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py index 09d5d69..cfdf31d 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-09.py @@ -1,6 +1,6 @@ # Test 32-bit COMPARE LOGICAL AND BRANCH in cases where the sheer number of # instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py index 258989b..4b7ba24 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-10.py @@ -1,6 +1,6 @@ # Test 64-bit COMPARE LOGICAL AND BRANCH in cases where the sheer number of # instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py index 22776aa..1d330a3 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-11.py @@ -1,6 +1,6 @@ # Test 32-bit COMPARE LOGICAL IMMEDIATE AND BRANCH in cases where the sheer # number of instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py index 0911953..5615507 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-12.py @@ -1,6 +1,6 @@ # Test 64-bit COMPARE LOGICAL IMMEDIATE AND BRANCH in cases where the sheer # number of instructions causes some branches to be out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # Construct: # diff --git a/llvm/test/CodeGen/SystemZ/Large/branch-range-13.py b/llvm/test/CodeGen/SystemZ/Large/branch-range-13.py index 13543a7..a827b16 100644 --- a/llvm/test/CodeGen/SystemZ/Large/branch-range-13.py +++ b/llvm/test/CodeGen/SystemZ/Large/branch-range-13.py @@ -1,7 +1,7 @@ # Test that inline assembly get the right size value so that a branch across # a block containing them gets relaxed. -# RUN: python %s | llc -mtriple=s390x-linux-gnu -mcpu=z196 -enable-post-misched=false \ +# RUN: %python %s | llc -mtriple=s390x-linux-gnu -mcpu=z196 -enable-post-misched=false \ # RUN: | FileCheck %s # Construct: diff --git a/llvm/test/CodeGen/SystemZ/Large/spill-01.py b/llvm/test/CodeGen/SystemZ/Large/spill-01.py index 2831804..c1b094e3 100644 --- a/llvm/test/CodeGen/SystemZ/Large/spill-01.py +++ b/llvm/test/CodeGen/SystemZ/Large/spill-01.py @@ -1,5 +1,5 @@ # Test cases where MVC is used for spill slots that end up being out of range. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # There are 8 usable call-saved GPRs, two of which are needed for the base # registers. The first 160 bytes of the frame are needed for the ABI diff --git a/llvm/test/CodeGen/SystemZ/Large/spill-02.py b/llvm/test/CodeGen/SystemZ/Large/spill-02.py index 0fefe63..aa2900b 100644 --- a/llvm/test/CodeGen/SystemZ/Large/spill-02.py +++ b/llvm/test/CodeGen/SystemZ/Large/spill-02.py @@ -1,6 +1,6 @@ # Test cases where we spill from one frame index to another, both of which # are out of range of MVC, and both of which need emergency spill slots. -# RUN: python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s +# RUN: %python %s | llc -mtriple=s390x-linux-gnu | FileCheck %s # CHECK: f1: # CHECK: %fallthru -- 2.7.4