From 3662f50ee1ee7e1dadda1ee3bc63f733c2e78384 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Mon, 21 Aug 2017 05:03:28 +0000 Subject: [PATCH] [AVX512] Add 128->256 vbroadcastf64x2/vbroadcasti64x2 instructions to the EVEX->VEX table. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@311307 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/X86/avx512-vbroadcasti128.ll | 44 +++------- test/CodeGen/X86/subvector-broadcast.ll | 91 ++++----------------- utils/TableGen/X86EVEX2VEXTablesEmitter.cpp | 3 + 3 files changed, 31 insertions(+), 107 deletions(-) diff --git a/test/CodeGen/X86/avx512-vbroadcasti128.ll b/test/CodeGen/X86/avx512-vbroadcasti128.ll index 15be0dfcb69..c5f7ec60700 100644 --- a/test/CodeGen/X86/avx512-vbroadcasti128.ll +++ b/test/CodeGen/X86/avx512-vbroadcasti128.ll @@ -8,23 +8,11 @@ ; define <4 x double> @test_broadcast_2f64_4f64(<2 x double> *%p) nounwind { -; X64-AVX512VL-LABEL: test_broadcast_2f64_4f64: -; X64-AVX512VL: ## BB#0: -; X64-AVX512VL-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512VL-NEXT: vaddpd {{.*}}(%rip), %ymm0, %ymm0 -; X64-AVX512VL-NEXT: retq -; -; X64-AVX512BWVL-LABEL: test_broadcast_2f64_4f64: -; X64-AVX512BWVL: ## BB#0: -; X64-AVX512BWVL-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512BWVL-NEXT: vaddpd {{.*}}(%rip), %ymm0, %ymm0 -; X64-AVX512BWVL-NEXT: retq -; -; X64-AVX512DQVL-LABEL: test_broadcast_2f64_4f64: -; X64-AVX512DQVL: ## BB#0: -; X64-AVX512DQVL-NEXT: vbroadcastf64x2 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512DQVL-NEXT: vaddpd {{.*}}(%rip), %ymm0, %ymm0 -; X64-AVX512DQVL-NEXT: retq +; X64-AVX512-LABEL: test_broadcast_2f64_4f64: +; X64-AVX512: ## BB#0: +; X64-AVX512-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] +; X64-AVX512-NEXT: vaddpd {{.*}}(%rip), %ymm0, %ymm0 +; X64-AVX512-NEXT: retq %1 = load <2 x double>, <2 x double> *%p %2 = shufflevector <2 x double> %1, <2 x double> undef, <4 x i32> %3 = fadd <4 x double> %2, @@ -32,23 +20,11 @@ define <4 x double> @test_broadcast_2f64_4f64(<2 x double> *%p) nounwind { } define <4 x i64> @test_broadcast_2i64_4i64(<2 x i64> *%p) nounwind { -; X64-AVX512VL-LABEL: test_broadcast_2i64_4i64: -; X64-AVX512VL: ## BB#0: -; X64-AVX512VL-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512VL-NEXT: vpaddq {{.*}}(%rip), %ymm0, %ymm0 -; X64-AVX512VL-NEXT: retq -; -; X64-AVX512BWVL-LABEL: test_broadcast_2i64_4i64: -; X64-AVX512BWVL: ## BB#0: -; X64-AVX512BWVL-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512BWVL-NEXT: vpaddq {{.*}}(%rip), %ymm0, %ymm0 -; X64-AVX512BWVL-NEXT: retq -; -; X64-AVX512DQVL-LABEL: test_broadcast_2i64_4i64: -; X64-AVX512DQVL: ## BB#0: -; X64-AVX512DQVL-NEXT: vbroadcasti64x2 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512DQVL-NEXT: vpaddq {{.*}}(%rip), %ymm0, %ymm0 -; X64-AVX512DQVL-NEXT: retq +; X64-AVX512-LABEL: test_broadcast_2i64_4i64: +; X64-AVX512: ## BB#0: +; X64-AVX512-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] +; X64-AVX512-NEXT: vpaddq {{.*}}(%rip), %ymm0, %ymm0 +; X64-AVX512-NEXT: retq %1 = load <2 x i64>, <2 x i64> *%p %2 = shufflevector <2 x i64> %1, <2 x i64> undef, <4 x i32> %3 = add <4 x i64> %2, diff --git a/test/CodeGen/X86/subvector-broadcast.ll b/test/CodeGen/X86/subvector-broadcast.ll index 6b208cced72..4ddc79efb4d 100644 --- a/test/CodeGen/X86/subvector-broadcast.ll +++ b/test/CodeGen/X86/subvector-broadcast.ll @@ -15,49 +15,16 @@ ; define <4 x double> @test_broadcast_2f64_4f64(<2 x double> *%p) nounwind { -; X32-AVX-LABEL: test_broadcast_2f64_4f64: -; X32-AVX: # BB#0: -; X32-AVX-NEXT: movl {{[0-9]+}}(%esp), %eax -; X32-AVX-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X32-AVX-NEXT: retl -; -; X32-AVX512F-LABEL: test_broadcast_2f64_4f64: -; X32-AVX512F: # BB#0: -; X32-AVX512F-NEXT: movl {{[0-9]+}}(%esp), %eax -; X32-AVX512F-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X32-AVX512F-NEXT: retl -; -; X32-AVX512BW-LABEL: test_broadcast_2f64_4f64: -; X32-AVX512BW: # BB#0: -; X32-AVX512BW-NEXT: movl {{[0-9]+}}(%esp), %eax -; X32-AVX512BW-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X32-AVX512BW-NEXT: retl -; -; X32-AVX512DQ-LABEL: test_broadcast_2f64_4f64: -; X32-AVX512DQ: # BB#0: -; X32-AVX512DQ-NEXT: movl {{[0-9]+}}(%esp), %eax -; X32-AVX512DQ-NEXT: vbroadcastf64x2 {{.*#+}} ymm0 = mem[0,1,0,1] -; X32-AVX512DQ-NEXT: retl -; -; X64-AVX-LABEL: test_broadcast_2f64_4f64: -; X64-AVX: # BB#0: -; X64-AVX-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX-NEXT: retq -; -; X64-AVX512F-LABEL: test_broadcast_2f64_4f64: -; X64-AVX512F: # BB#0: -; X64-AVX512F-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512F-NEXT: retq -; -; X64-AVX512BW-LABEL: test_broadcast_2f64_4f64: -; X64-AVX512BW: # BB#0: -; X64-AVX512BW-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512BW-NEXT: retq +; X32-LABEL: test_broadcast_2f64_4f64: +; X32: # BB#0: +; X32-NEXT: movl {{[0-9]+}}(%esp), %eax +; X32-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] +; X32-NEXT: retl ; -; X64-AVX512DQ-LABEL: test_broadcast_2f64_4f64: -; X64-AVX512DQ: # BB#0: -; X64-AVX512DQ-NEXT: vbroadcastf64x2 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512DQ-NEXT: retq +; X64-LABEL: test_broadcast_2f64_4f64: +; X64: # BB#0: +; X64-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] +; X64-NEXT: retq %1 = load <2 x double>, <2 x double> *%p %2 = shufflevector <2 x double> %1, <2 x double> undef, <4 x i32> ret <4 x double> %2 @@ -150,43 +117,21 @@ define <4 x i64> @test_broadcast_2i64_4i64(<2 x i64> *%p) nounwind { ; X32-AVX-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] ; X32-AVX-NEXT: retl ; -; X32-AVX512F-LABEL: test_broadcast_2i64_4i64: -; X32-AVX512F: # BB#0: -; X32-AVX512F-NEXT: movl {{[0-9]+}}(%esp), %eax -; X32-AVX512F-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X32-AVX512F-NEXT: retl -; -; X32-AVX512BW-LABEL: test_broadcast_2i64_4i64: -; X32-AVX512BW: # BB#0: -; X32-AVX512BW-NEXT: movl {{[0-9]+}}(%esp), %eax -; X32-AVX512BW-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X32-AVX512BW-NEXT: retl -; -; X32-AVX512DQ-LABEL: test_broadcast_2i64_4i64: -; X32-AVX512DQ: # BB#0: -; X32-AVX512DQ-NEXT: movl {{[0-9]+}}(%esp), %eax -; X32-AVX512DQ-NEXT: vbroadcasti64x2 {{.*#+}} ymm0 = mem[0,1,0,1] -; X32-AVX512DQ-NEXT: retl +; X32-AVX512-LABEL: test_broadcast_2i64_4i64: +; X32-AVX512: # BB#0: +; X32-AVX512-NEXT: movl {{[0-9]+}}(%esp), %eax +; X32-AVX512-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] +; X32-AVX512-NEXT: retl ; ; X64-AVX-LABEL: test_broadcast_2i64_4i64: ; X64-AVX: # BB#0: ; X64-AVX-NEXT: vbroadcastf128 {{.*#+}} ymm0 = mem[0,1,0,1] ; X64-AVX-NEXT: retq ; -; X64-AVX512F-LABEL: test_broadcast_2i64_4i64: -; X64-AVX512F: # BB#0: -; X64-AVX512F-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512F-NEXT: retq -; -; X64-AVX512BW-LABEL: test_broadcast_2i64_4i64: -; X64-AVX512BW: # BB#0: -; X64-AVX512BW-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512BW-NEXT: retq -; -; X64-AVX512DQ-LABEL: test_broadcast_2i64_4i64: -; X64-AVX512DQ: # BB#0: -; X64-AVX512DQ-NEXT: vbroadcasti64x2 {{.*#+}} ymm0 = mem[0,1,0,1] -; X64-AVX512DQ-NEXT: retq +; X64-AVX512-LABEL: test_broadcast_2i64_4i64: +; X64-AVX512: # BB#0: +; X64-AVX512-NEXT: vbroadcasti128 {{.*#+}} ymm0 = mem[0,1,0,1] +; X64-AVX512-NEXT: retq %1 = load <2 x i64>, <2 x i64> *%p %2 = shufflevector <2 x i64> %1, <2 x i64> undef, <4 x i32> ret <4 x i64> %2 diff --git a/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp b/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp index 07b96b03b01..7c2d4efa29b 100644 --- a/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp +++ b/utils/TableGen/X86EVEX2VEXTablesEmitter.cpp @@ -137,6 +137,9 @@ void X86EVEX2VEXTablesEmitter::printTable(const std::vector &Table, {"VBROADCASTSDZ256m", "VBROADCASTSDYrm", false}, {"VBROADCASTSDZ256r", "VBROADCASTSDYrr", false}, + {"VBROADCASTF64X2Z128rm", "VBROADCASTF128", false}, + {"VBROADCASTI64X2Z128rm", "VBROADCASTI128", false}, + {"VEXTRACTF64x2Z256mr", "VEXTRACTF128mr", false}, {"VEXTRACTF64x2Z256rr", "VEXTRACTF128rr", false}, {"VEXTRACTI64x2Z256mr", "VEXTRACTI128mr", false}, -- 2.50.1