<div dir="ltr">I mentioned this in irc, but I'm not entirely certain the changes to remove sse4a from these testcases is correct. Could you please investigate what made you need to do this?<br><div><br></div><div>The rest of it looks like a great cleanup, thanks!</div><div><br></div><div>-eric</div></div><br><div class="gmail_quote">On Thu Jan 29 2015 at 5:36:33 AM Alex Rosenberg <<a href="mailto:alexr@leftfield.org">alexr@leftfield.org</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: alexr<br>
Date: Thu Jan 29 07:31:32 2015<br>
New Revision: 227437<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=227437&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=227437&view=rev</a><br>
Log:<br>
Cleanup a few tests on sse4a machines and FileCheckize along the way.<br>
<br>
Modified:<br>
llvm/trunk/test/CodeGen/X86/<u></u>2006-05-22-FPSetEQ.ll<br>
llvm/trunk/test/CodeGen/X86/<u></u>2009-01-25-NoSSE.ll<br>
llvm/trunk/test/CodeGen/X86/<u></u>2009-06-18-movlp-shuffle-<u></u>register.ll<br>
llvm/trunk/test/CodeGen/X86/<u></u>barrier.ll<br>
llvm/trunk/test/CodeGen/X86/<u></u>nosse-varargs.ll<br>
llvm/trunk/test/CodeGen/X86/<u></u>sse4a.ll<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/<u></u>2006-05-22-FPSetEQ.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2006-05-22-FPSetEQ.ll?rev=227437&r1=227436&r2=227437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/test/<u></u>CodeGen/X86/2006-05-22-<u></u>FPSetEQ.ll?rev=227437&r1=<u></u>227436&r2=227437&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/test/CodeGen/X86/<u></u>2006-05-22-FPSetEQ.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/<u></u>2006-05-22-FPSetEQ.ll Thu Jan 29 07:31:32 2015<br>
@@ -1,7 +1,10 @@<br>
-; RUN: llc < %s -march=x86 -mattr=-sse | grep setnp<br>
-; RUN: llc < %s -march=x86 -mattr=-sse -enable-unsafe-fp-math -enable-no-nans-fp-math | \<br>
-; RUN: not grep setnp<br>
+; RUN: llc < %s -march=x86 -mattr=-sse | FileCheck %s -check-prefix=WITHNANS<br>
+; RUN: llc < %s -march=x86 -mattr=-sse -enable-unsafe-fp-math -enable-no-nans-fp-math | FileCheck %s -check-prefix=NONANS<br>
<br>
+; WITHNANS-LABEL: test:<br>
+; WITHNANS: setnp<br>
+; NONANS-LABEL: test:<br>
+; NONANS-NOT: setnp<br>
define i32 @test(float %f) {<br>
%tmp = fcmp oeq float %f, 0.000000e+00 ; <i1> [#uses=1]<br>
%tmp.upgrd.1 = zext i1 %tmp to i32 ; <i32> [#uses=1]<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/<u></u>2009-01-25-NoSSE.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-01-25-NoSSE.ll?rev=227437&r1=227436&r2=227437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/test/<u></u>CodeGen/X86/2009-01-25-NoSSE.<u></u>ll?rev=227437&r1=227436&r2=<u></u>227437&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/test/CodeGen/X86/<u></u>2009-01-25-NoSSE.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/<u></u>2009-01-25-NoSSE.ll Thu Jan 29 07:31:32 2015<br>
@@ -1,4 +1,4 @@<br>
-; RUN: llc < %s -march=x86-64 -mattr=-sse,-sse2 | not grep xmm<br>
+; RUN: llc < %s -march=x86-64 -mattr=-sse,-sse2,-sse4a | FileCheck %s<br>
; PR3402<br>
target datalayout =<br>
"e-p:64:64:64-i1:8:8-i8:8:8-<u></u>i16:16:16-i32:32:32-i64:64:64-<u></u>f32:32:32-f64:64:64-v64:64:64-<u></u>v128:128:128-a0:0:64-s0:64:64-<u></u>f80:128:128"<br>
@@ -6,6 +6,8 @@ target triple = "x86_64-unknown-linux-gn<br>
<br>
%struct.ktermios = type { i32, i32, i32, i32, i8, [19 x i8], i32, i32 }<br>
<br>
+; CHECK-NOT: xmm<br>
+; CHECK-NOT: ymm<br>
define void @foo() nounwind {<br>
entry:<br>
%termios = alloca %struct.ktermios, align 8<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/<u></u>2009-06-18-movlp-shuffle-<u></u>register.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-06-18-movlp-shuffle-register.ll?rev=227437&r1=227436&r2=227437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/test/<u></u>CodeGen/X86/2009-06-18-movlp-<u></u>shuffle-register.ll?rev=<u></u>227437&r1=227436&r2=227437&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/test/CodeGen/X86/<u></u>2009-06-18-movlp-shuffle-<u></u>register.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/<u></u>2009-06-18-movlp-shuffle-<u></u>register.ll Thu Jan 29 07:31:32 2015<br>
@@ -1,4 +1,4 @@<br>
-; RUN: llc < %s -march=x86 -mattr=+sse,-sse2 | FileCheck %s<br>
+; RUN: llc < %s -march=x86 -mattr=+sse,-sse2,-sse4a | FileCheck %s<br>
; PR2484<br>
<br>
define <4 x float> @f4523(<4 x float> %a,<4 x float> %b) nounwind {<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/<u></u>barrier.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/barrier.ll?rev=227437&r1=227436&r2=227437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/test/<u></u>CodeGen/X86/barrier.ll?rev=<u></u>227437&r1=227436&r2=227437&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/test/CodeGen/X86/<u></u>barrier.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/<u></u>barrier.ll Thu Jan 29 07:31:32 2015<br>
@@ -1,6 +1,7 @@<br>
-; RUN: llc < %s -march=x86 -mattr=-sse2 | grep lock<br>
+; RUN: llc < %s -march=x86 -mattr=-sse2,-sse4a | FileCheck %s<br>
<br>
define void @test() {<br>
+; CHECK: lock<br>
fence seq_cst<br>
ret void<br>
}<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/<u></u>nosse-varargs.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/nosse-varargs.ll?rev=227437&r1=227436&r2=227437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/test/<u></u>CodeGen/X86/nosse-varargs.ll?<u></u>rev=227437&r1=227436&r2=<u></u>227437&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/test/CodeGen/X86/<u></u>nosse-varargs.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/<u></u>nosse-varargs.ll Thu Jan 29 07:31:32 2015<br>
@@ -1,11 +1,12 @@<br>
-; RUN: llvm-as < %s > %t<br>
-; RUN: llc -march=x86-64 -mattr=-sse < %t | not grep xmm<br>
-; RUN: llc -march=x86-64 < %t | grep xmm<br>
+; RUN: llc < %s -march=x86-64 -mattr=-sse | FileCheck %s -check-prefix=NOSSE<br>
+; RUN: llc < %s -march=x86-64 | FileCheck %s -check-prefix=YESSSE<br>
; PR3403<br>
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-<u></u>i16:16:16-i32:32:32-i64:64:64-<u></u>f32:32:32-f64:64:64-v64:64:64-<u></u>v128:128:128-a0:0:64-s0:64:64-<u></u>f80:128:128"<br>
target triple = "x86_64-unknown-linux-gnu"<br>
%struct.__va_list_tag = type { i32, i32, i8*, i8* }<br>
<br>
+; NOSSE-NOT: xmm<br>
+; YESSSE: xmm<br>
define i32 @foo(float %a, i8* nocapture %fmt, ...) nounwind {<br>
entry:<br>
%ap = alloca [1 x %struct.__va_list_tag], align 8 ; <[1 x %struct.__va_list_tag]*> [#uses=4]<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/<u></u>sse4a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/sse4a.ll?rev=227437&r1=227436&r2=227437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/test/<u></u>CodeGen/X86/sse4a.ll?rev=<u></u>227437&r1=227436&r2=227437&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/test/CodeGen/X86/<u></u>sse4a.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/<u></u>sse4a.ll Thu Jan 29 07:31:32 2015<br>
@@ -1,4 +1,5 @@<br>
; RUN: llc < %s -mtriple=i686-apple-darwin9 -mattr=sse4a | FileCheck %s<br>
+; RUN: llc < %s -mtriple=x86_64-unknown-linux -mattr=sse4a | FileCheck %s<br>
<br>
define void @test1(i8* %p, <4 x float> %a) nounwind optsize ssp {<br>
; CHECK-LABEL: test1:<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div>