[llvm] r218932 - [x86] Remove some of the --show-mc-encoding flags from avx512 tests that
Adam Nemet
anemet at apple.com
Thu Oct 2 21:30:15 PDT 2014
On Oct 2, 2014, at 5:36 PM, Chandler Carruth <chandlerc at gmail.com> wrote:
> Author: chandlerc
> Date: Thu Oct 2 19:36:29 2014
> New Revision: 218932
>
> URL: http://llvm.org/viewvc/llvm-project?rev=218932&view=rev
> Log:
> [x86] Remove some of the --show-mc-encoding flags from avx512 tests that
> need to be updated for the new vector shuffle lowering.
>
> After talking to Adam Nemet, Tim Northover, etc., it seems that testing
> MC encodings in the same suite as the basic codegen isn't the right
> approach. Instead, we're going to want dedicated MC tests for the
> encodings. These encodings are starting to get in my way so I wanted to
> cut them out early. The total set of instructions that should have
> encoding tests added is:
>
> vpaddd
> vsqrtss
> vsqrtsd
> vmovlhps
> vmovhlps
> valignq
> vbroadcastss
So the plan is that I will put together a script that will move all the encoding tests from CodeGen to MC.
The concern was that we’re not testing the assembler when we check the encoding only through CodeGen.
Adam
>
> Not too many parts of these tests were even using this. =]
>
> Modified:
> llvm/trunk/test/CodeGen/X86/avx512-arith.ll
> llvm/trunk/test/CodeGen/X86/avx512-shuffle.ll
> llvm/trunk/test/CodeGen/X86/avx512-vbroadcast.ll
>
> Modified: llvm/trunk/test/CodeGen/X86/avx512-arith.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/avx512-arith.ll?rev=218932&r1=218931&r2=218932&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/avx512-arith.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/avx512-arith.ll Thu Oct 2 19:36:29 2014
> @@ -1,4 +1,4 @@
> -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl --show-mc-encoding| FileCheck %s
> +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl | FileCheck %s
>
> ; CHECK-LABEL: addpd512
> ; CHECK: vaddpd
> @@ -223,7 +223,7 @@ define <16 x i32> @vpaddd_broadcast_test
> }
>
> ; CHECK-LABEL: vpaddd_mask_test
> -; CHECK: vpaddd {{%zmm[0-9]{1,2}, %zmm[0-9]{1,2}, %zmm[0-9]{1,2} {%k[1-7]} }}
> +; CHECK: vpaddd {{%zmm[0-9], %zmm[0-9], %zmm[0-9] {%k[1-7]}}}
> ; CHECK: ret
> define <16 x i32> @vpaddd_mask_test(<16 x i32> %i, <16 x i32> %j, <16 x i32> %mask1) nounwind readnone {
> %mask = icmp ne <16 x i32> %mask1, zeroinitializer
> @@ -233,7 +233,7 @@ define <16 x i32> @vpaddd_mask_test(<16
> }
>
> ; CHECK-LABEL: vpaddd_maskz_test
> -; CHECK: vpaddd {{%zmm[0-9]{1,2}, %zmm[0-9]{1,2}, %zmm[0-9]{1,2} {%k[1-7]} {z} }}
> +; CHECK: vpaddd {{%zmm[0-9], %zmm[0-9], %zmm[0-9] {%k[1-7]} {z}}}
> ; CHECK: ret
> define <16 x i32> @vpaddd_maskz_test(<16 x i32> %i, <16 x i32> %j, <16 x i32> %mask1) nounwind readnone {
> %mask = icmp ne <16 x i32> %mask1, zeroinitializer
> @@ -243,7 +243,7 @@ define <16 x i32> @vpaddd_maskz_test(<16
> }
>
> ; CHECK-LABEL: vpaddd_mask_fold_test
> -; CHECK: vpaddd (%rdi), {{%zmm[0-9]{1,2}, %zmm[0-9]{1,2} {%k[1-7]} }}
> +; CHECK: vpaddd (%rdi), {{%zmm[0-9], %zmm[0-9] {%k[1-7]}}}
> ; CHECK: ret
> define <16 x i32> @vpaddd_mask_fold_test(<16 x i32> %i, <16 x i32>* %j.ptr, <16 x i32> %mask1) nounwind readnone {
> %mask = icmp ne <16 x i32> %mask1, zeroinitializer
> @@ -254,7 +254,7 @@ define <16 x i32> @vpaddd_mask_fold_test
> }
>
> ; CHECK-LABEL: vpaddd_mask_broadcast_test
> -; CHECK: vpaddd LCP{{.*}}(%rip){1to16}, {{%zmm[0-9]{1,2}, %zmm[0-9]{1,2} {%k[1-7]} }}
> +; CHECK: vpaddd LCP{{.*}}(%rip){1to16}, {{%zmm[0-9], %zmm[0-9] {%k[1-7]}}}
> ; CHECK: ret
> define <16 x i32> @vpaddd_mask_broadcast_test(<16 x i32> %i, <16 x i32> %mask1) nounwind readnone {
> %mask = icmp ne <16 x i32> %mask1, zeroinitializer
> @@ -264,7 +264,7 @@ define <16 x i32> @vpaddd_mask_broadcast
> }
>
> ; CHECK-LABEL: vpaddd_maskz_fold_test
> -; CHECK: vpaddd (%rdi), {{%zmm[0-9]{1,2}, %zmm[0-9]{1,2} {%k[1-7]}}} {z}
> +; CHECK: vpaddd (%rdi), {{%zmm[0-9], %zmm[0-9] {%k[1-7]}}} {z}
> ; CHECK: ret
> define <16 x i32> @vpaddd_maskz_fold_test(<16 x i32> %i, <16 x i32>* %j.ptr, <16 x i32> %mask1) nounwind readnone {
> %mask = icmp ne <16 x i32> %mask1, zeroinitializer
> @@ -275,7 +275,7 @@ define <16 x i32> @vpaddd_maskz_fold_tes
> }
>
> ; CHECK-LABEL: vpaddd_maskz_broadcast_test
> -; CHECK: vpaddd LCP{{.*}}(%rip){1to16}, {{%zmm[0-9]{1,2}, %zmm[0-9]{1,2} {%k[1-7]}}} {z}
> +; CHECK: vpaddd LCP{{.*}}(%rip){1to16}, {{%zmm[0-9], %zmm[0-9] {%k[1-7]}}} {z}
> ; CHECK: ret
> define <16 x i32> @vpaddd_maskz_broadcast_test(<16 x i32> %i, <16 x i32> %mask1) nounwind readnone {
> %mask = icmp ne <16 x i32> %mask1, zeroinitializer
> @@ -309,7 +309,7 @@ define <16 x i32> @vpmulld_test(<16 x i3
> }
>
> ; CHECK-LABEL: sqrtA
> -; CHECK: vsqrtss {{.*}} encoding: [0x62
> +; CHECK: vsqrtss {{.*}}
> ; CHECK: ret
> declare float @sqrtf(float) readnone
> define float @sqrtA(float %a) nounwind uwtable readnone ssp {
> @@ -319,7 +319,7 @@ entry:
> }
>
> ; CHECK-LABEL: sqrtB
> -; CHECK: vsqrtsd {{.*}}## encoding: [0x62
> +; CHECK: vsqrtsd {{.*}}
> ; CHECK: ret
> declare double @sqrt(double) readnone
> define double @sqrtB(double %a) nounwind uwtable readnone ssp {
> @@ -329,7 +329,7 @@ entry:
> }
>
> ; CHECK-LABEL: sqrtC
> -; CHECK: vsqrtss {{.*}}## encoding: [0x62
> +; CHECK: vsqrtss {{.*}}
> ; CHECK: ret
> declare float @llvm.sqrt.f32(float)
> define float @sqrtC(float %a) nounwind {
>
> Modified: llvm/trunk/test/CodeGen/X86/avx512-shuffle.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/avx512-shuffle.ll?rev=218932&r1=218931&r2=218932&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/avx512-shuffle.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/avx512-shuffle.ll Thu Oct 2 19:36:29 2014
> @@ -1,4 +1,4 @@
> -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl --show-mc-encoding| FileCheck %s
> +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl | FileCheck %s
> ; CHECK: LCP
> ; CHECK: .long 2
> ; CHECK: .long 5
> @@ -169,7 +169,7 @@ define <16 x i32> @test11(<16 x i32> %a,
> }
>
> ; CHECK-LABEL: test12
> -; CHECK: vmovlhps {{.*}}## encoding: [0x62
> +; CHECK: vmovlhps {{.*}}
> ; CHECK: ret
> define <4 x i32> @test12(<4 x i32> %a, <4 x i32> %b) nounwind {
> %c = shufflevector <4 x i32> %a, <4 x i32> %b, <4 x i32> <i32 0, i32 1, i32 4, i32 5>
> @@ -226,7 +226,7 @@ define <8 x double> @test16(<8 x double>
> }
>
> ; CHECK-LABEL: test16k
> -; CHECK: valignq $2, %zmm0, %zmm1, %zmm2 {%k1} #
> +; CHECK: valignq $2, %zmm0, %zmm1, %zmm2 {%k1}
> define <8 x i64> @test16k(<8 x i64> %a, <8 x i64> %b, <8 x i64> %src, i8 %mask) nounwind {
> %c = shufflevector <8 x i64> %a, <8 x i64> %b, <8 x i32> <i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9>
> %m = bitcast i8 %mask to <8 x i1>
> @@ -235,7 +235,7 @@ define <8 x i64> @test16k(<8 x i64> %a,
> }
>
> ; CHECK-LABEL: test16kz
> -; CHECK: valignq $2, %zmm0, %zmm1, %zmm0 {%k1} {z} ## encoding: [0x62,0xf3,0xf5,0xc9,0x03,0xc0,0x02]
> +; CHECK: valignq $2, %zmm0, %zmm1, %zmm0 {%k1} {z}
> define <8 x i64> @test16kz(<8 x i64> %a, <8 x i64> %b, i8 %mask) nounwind {
> %c = shufflevector <8 x i64> %a, <8 x i64> %b, <8 x i32> <i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9>
> %m = bitcast i8 %mask to <8 x i1>
> @@ -296,7 +296,7 @@ define <16 x float> @test21(<16 x float>
> }
>
> ; CHECK-LABEL: test22
> -; CHECK: vmovhlps {{.*}}## encoding: [0x62
> +; CHECK: vmovhlps {{.*}}
> ; CHECK: ret
> define <4 x i32> @test22(<4 x i32> %a, <4 x i32> %b) nounwind {
> %c = shufflevector <4 x i32> %a, <4 x i32> %b, <4 x i32> <i32 2, i32 3, i32 6, i32 7>
>
> Modified: llvm/trunk/test/CodeGen/X86/avx512-vbroadcast.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/avx512-vbroadcast.ll?rev=218932&r1=218931&r2=218932&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/avx512-vbroadcast.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/avx512-vbroadcast.ll Thu Oct 2 19:36:29 2014
> @@ -1,4 +1,4 @@
> -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl --show-mc-encoding| FileCheck %s
> +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl | FileCheck %s
>
> ;CHECK-LABEL: _inreg16xi32:
> ;CHECK: vpbroadcastd {{.*}}, %zmm
> @@ -45,7 +45,7 @@ define <16 x i32> @_xmm16xi32(<16 x i3
> }
>
> ;CHECK-LABEL: _xmm16xfloat
> -;CHECK: vbroadcastss {{.*}}## encoding: [0x62
> +;CHECK: vbroadcastss {{.*}}
> ;CHECK: ret
> define <16 x float> @_xmm16xfloat(<16 x float> %a) {
> %b = shufflevector <16 x float> %a, <16 x float> undef, <16 x i32> zeroinitializer
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list