[llvm] r369443 - [test] Fix tests when run on windows after SVN r369426. NFC.

Martin Storsjo via llvm-commits llvm-commits at lists.llvm.org
Tue Aug 20 13:58:02 PDT 2019


Author: mstorsjo
Date: Tue Aug 20 13:58:02 2019
New Revision: 369443

URL: http://llvm.org/viewvc/llvm-project?rev=369443&view=rev
Log:
[test] Fix tests when run on windows after SVN r369426. NFC.

When running tests on windows, invoking "llc -march=<arch>" will
implicitly use windows as the target os, making these tests misbehave
after this change.

Fix the issue by using more specific -mtriple values instead of plain
-march in these tests.

This should hopefully fix buildbot failures like
http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/9816.

Modified:
    llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-bitcast-function.ll
    llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-clone.ll
    llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-single-set.ll
    llvm/trunk/test/CodeGen/Hexagon/pic-jt-big.ll
    llvm/trunk/test/CodeGen/Hexagon/pic-sdata.ll
    llvm/trunk/test/CodeGen/SPARC/tls.ll

Modified: llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-bitcast-function.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-bitcast-function.ll?rev=369443&r1=369442&r2=369443&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-bitcast-function.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-bitcast-function.ll Tue Aug 20 13:58:02 2019
@@ -1,4 +1,4 @@
-; RUN: llc -march=amdgcn -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck -check-prefix=GCN %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck -check-prefix=GCN %s
 
 ; GCN: foo1:
 ; v_cndmask_b32_e64 v0, 0, 1, vcc_lo{{$}}

Modified: llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-clone.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-clone.ll?rev=369443&r1=369442&r2=369443&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-clone.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-clone.ll Tue Aug 20 13:58:02 2019
@@ -1,5 +1,5 @@
 ; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -O1 < %s | FileCheck -check-prefix=OPT %s
-; RUN: llc -march=amdgcn -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck -check-prefix=LLC %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck -check-prefix=LLC %s
 
 ; OPT: declare void @foo4() local_unnamed_addr #0
 ; OPT: define internal fastcc void @foo3.2() unnamed_addr #1

Modified: llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-single-set.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-single-set.ll?rev=369443&r1=369442&r2=369443&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-single-set.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/propagate-attributes-single-set.ll Tue Aug 20 13:58:02 2019
@@ -1,5 +1,5 @@
 ; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -O1 < %s | FileCheck -check-prefix=OPT %s
-; RUN: llc -march=amdgcn -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck -check-prefix=LLC %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck -check-prefix=LLC %s
 
 ; OPT: declare void @foo4() local_unnamed_addr #0
 ; OPT: define void @foo3() local_unnamed_addr #1

Modified: llvm/trunk/test/CodeGen/Hexagon/pic-jt-big.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/pic-jt-big.ll?rev=369443&r1=369442&r2=369443&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Hexagon/pic-jt-big.ll (original)
+++ llvm/trunk/test/CodeGen/Hexagon/pic-jt-big.ll Tue Aug 20 13:58:02 2019
@@ -1,4 +1,4 @@
-; RUN: llc -march=hexagon -relocation-model=pic < %s | FileCheck %s
+; RUN: llc -mtriple=hexagon-unknown-elf -relocation-model=pic < %s | FileCheck %s
 
 ; CHECK: r{{[0-9]+}} = add({{pc|PC}},##.LJTI{{[0-9_]+}}@PCREL)
 ; CHECK: r{{[0-9]+}} = memw(r{{[0-9]}}+##g0 at GOT

Modified: llvm/trunk/test/CodeGen/Hexagon/pic-sdata.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/pic-sdata.ll?rev=369443&r1=369442&r2=369443&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Hexagon/pic-sdata.ll (original)
+++ llvm/trunk/test/CodeGen/Hexagon/pic-sdata.ll Tue Aug 20 13:58:02 2019
@@ -1,5 +1,5 @@
-; RUN: llc -march=hexagon -hexagon-small-data-threshold=8 -relocation-model=static < %s | FileCheck --check-prefixes=CHECK,STATIC %s
-; RUN: llc -march=hexagon -hexagon-small-data-threshold=8 -relocation-model=pic < %s | FileCheck --check-prefixes=CHECK,PIC %s
+; RUN: llc -mtriple=hexagon-unknown-elf -hexagon-small-data-threshold=8 -relocation-model=static < %s | FileCheck --check-prefixes=CHECK,STATIC %s
+; RUN: llc -mtriple=hexagon-unknown-elf -hexagon-small-data-threshold=8 -relocation-model=pic < %s | FileCheck --check-prefixes=CHECK,PIC %s
 
 ; If a global has a specified section, it should probably be placed in that
 ; section, but with PIC any accesses to globals in small data should still

Modified: llvm/trunk/test/CodeGen/SPARC/tls.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SPARC/tls.ll?rev=369443&r1=369442&r2=369443&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SPARC/tls.ll (original)
+++ llvm/trunk/test/CodeGen/SPARC/tls.ll Tue Aug 20 13:58:02 2019
@@ -1,12 +1,12 @@
-; RUN: llc <%s -march=sparc   -relocation-model=static | FileCheck %s --check-prefix=v8abs
-; RUN: llc <%s -march=sparcv9 -relocation-model=static | FileCheck %s --check-prefix=v9abs
-; RUN: llc <%s -march=sparc   -relocation-model=pic    | FileCheck %s --check-prefix=pic
-; RUN: llc <%s -march=sparcv9 -relocation-model=pic    | FileCheck %s --check-prefix=pic
+; RUN: llc <%s -mtriple=sparc-unknown-linux   -relocation-model=static | FileCheck %s --check-prefix=v8abs
+; RUN: llc <%s -mtriple=sparcv9-unknown-linux -relocation-model=static | FileCheck %s --check-prefix=v9abs
+; RUN: llc <%s -mtriple=sparc-unknown-linux   -relocation-model=pic    | FileCheck %s --check-prefix=pic
+; RUN: llc <%s -mtriple=sparcv9-unknown-linux -relocation-model=pic    | FileCheck %s --check-prefix=pic
 
-; RUN: llc <%s -march=sparc   -relocation-model=static -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=v8abs-obj
-; RUN: llc <%s -march=sparcv9 -relocation-model=static -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=v9abs-obj
-; RUN: llc <%s -march=sparc   -relocation-model=pic    -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=pic-obj
-; RUN: llc <%s -march=sparcv9 -relocation-model=pic    -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=pic-obj
+; RUN: llc <%s -mtriple=sparc-unknown-linux   -relocation-model=static -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=v8abs-obj
+; RUN: llc <%s -mtriple=sparcv9-unknown-linux -relocation-model=static -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=v9abs-obj
+; RUN: llc <%s -mtriple=sparc-unknown-linux   -relocation-model=pic    -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=pic-obj
+; RUN: llc <%s -mtriple=sparcv9-unknown-linux -relocation-model=pic    -filetype=obj | llvm-readobj -r --symbols | FileCheck %s --check-prefix=pic-obj
 
 @local_symbol = internal thread_local global i32 0
 @extern_symbol = external thread_local global i32




More information about the llvm-commits mailing list