https://github.com/yubingex007-a11y updated https://github.com/llvm/llvm-project/pull/80106
>From 447998dfa2a5cde2b2e08c1b6f6a3503a2c3fcce Mon Sep 17 00:00:00 2001 From: Bing1 Yu <bing1...@intel.com> Date: Wed, 31 Jan 2024 14:20:31 +0800 Subject: [PATCH 1/2] [X86] Stop custom-widening v2f32 = fpext v2bf16 --- llvm/lib/Target/X86/X86ISelLowering.cpp | 5 ++- llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll | 41 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 531e00862558c..82753a74ba0dd 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -32815,10 +32815,11 @@ void X86TargetLowering::ReplaceNodeResults(SDNode *N, // No other ValueType for FP_EXTEND should reach this point. assert(N->getValueType(0) == MVT::v2f32 && "Do not know how to legalize this Node"); - if (!Subtarget.hasFP16() || !Subtarget.hasVLX()) - return; bool IsStrict = N->isStrictFPOpcode(); SDValue Src = N->getOperand(IsStrict ? 1 : 0); + if (!Subtarget.hasFP16() || !Subtarget.hasVLX() || + Src.getValueType().getVectorElementType() != MVT::f16) + return; SDValue Ext = IsStrict ? DAG.getConstantFP(0.0, dl, MVT::v2f16) : DAG.getUNDEF(MVT::v2f16); SDValue V = DAG.getNode(ISD::CONCAT_VECTORS, dl, MVT::v4f16, Src, Ext); diff --git a/llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll b/llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll new file mode 100644 index 0000000000000..d56bb62d22f06 --- /dev/null +++ b/llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll @@ -0,0 +1,41 @@ +; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py +; RUN: llc < %s -mtriple=x86_64-- -mattr=avx512bf16,avx512fp16 | FileCheck %s +define dso_local void @calc_matrix_tdpbf16ps(<2 x ptr> %ptr) local_unnamed_addr #0 { +; CHECK-LABEL: calc_matrix_tdpbf16ps: +; CHECK: # %bb.0: # %entry +; CHECK-NEXT: xorl %eax, %eax +; CHECK-NEXT: testb %al, %al +; CHECK-NEXT: je .LBB0_1 +; CHECK-NEXT: # %bb.2: # %loop.127.preheader +; CHECK-NEXT: retq +; CHECK-NEXT: .LBB0_1: # %ifmerge.89 +; CHECK-NEXT: movzwl (%rax), %eax +; CHECK-NEXT: shll $16, %eax +; CHECK-NEXT: vmovd %eax, %xmm0 +; CHECK-NEXT: vmulss %xmm0, %xmm0, %xmm0 +; CHECK-NEXT: vbroadcastss %xmm0, %xmm0 +; CHECK-NEXT: vmovlps %xmm0, (%rax) +entry: + br label %then.13 + +then.13: ; preds = %entry + %0 = fpext bfloat poison to float + br i1 poison, label %loop.127.preheader, label %ifmerge.89 + +ifmerge.89: ; preds = %then.13 + %.splatinsert144 = insertelement <2 x float> poison, float %0, i64 0 + %.splat145 = shufflevector <2 x float> %.splatinsert144, <2 x float> poison, <2 x i32> zeroinitializer + %1 = tail call <2 x bfloat> @llvm.masked.gather.v2bf16.v2p0(<2 x ptr> undef, i32 2, <2 x i1> <i1 true, i1 true>, <2 x bfloat> poison) + %2 = fpext <2 x bfloat> %1 to <2 x float> + %3 = fmul fast <2 x float> %.splat145, %2 + %4 = fadd fast <2 x float> zeroinitializer, %3 + store <2 x float> %4, ptr poison, align 4 + unreachable + +loop.127.preheader: ; preds = %then.13 + ret void +} + +; Function Attrs: nocallback nofree nosync nounwind willreturn memory(read) +declare <2 x bfloat> @llvm.masked.gather.v2bf16.v2p0(<2 x ptr>, i32 immarg, <2 x i1>, <2 x bfloat>) #1 + >From e52d3bdd48c511634cf9c42d8e6a31d338c09ec4 Mon Sep 17 00:00:00 2001 From: Bing1 Yu <bing1...@intel.com> Date: Wed, 31 Jan 2024 15:53:22 +0800 Subject: [PATCH 2/2] address comments --- llvm/lib/Target/X86/X86ISelLowering.cpp | 3 +-- llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 82753a74ba0dd..483fa01861f7c 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -32817,8 +32817,7 @@ void X86TargetLowering::ReplaceNodeResults(SDNode *N, "Do not know how to legalize this Node"); bool IsStrict = N->isStrictFPOpcode(); SDValue Src = N->getOperand(IsStrict ? 1 : 0); - if (!Subtarget.hasFP16() || !Subtarget.hasVLX() || - Src.getValueType().getVectorElementType() != MVT::f16) + if (Src.getValueType().getVectorElementType() != MVT::f16) return; SDValue Ext = IsStrict ? DAG.getConstantFP(0.0, dl, MVT::v2f16) : DAG.getUNDEF(MVT::v2f16); diff --git a/llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll b/llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll index d56bb62d22f06..eff1937b59343 100644 --- a/llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll +++ b/llvm/test/CodeGen/X86/concat-fpext-v2bf16.ll @@ -1,7 +1,8 @@ ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py ; RUN: llc < %s -mtriple=x86_64-- -mattr=avx512bf16,avx512fp16 | FileCheck %s -define dso_local void @calc_matrix_tdpbf16ps(<2 x ptr> %ptr) local_unnamed_addr #0 { -; CHECK-LABEL: calc_matrix_tdpbf16ps: + +define void @test(<2 x ptr> %ptr) { +; CHECK-LABEL: test: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: xorl %eax, %eax ; CHECK-NEXT: testb %al, %al @@ -36,6 +37,4 @@ loop.127.preheader: ; preds = %then.13 ret void } -; Function Attrs: nocallback nofree nosync nounwind willreturn memory(read) -declare <2 x bfloat> @llvm.masked.gather.v2bf16.v2p0(<2 x ptr>, i32 immarg, <2 x i1>, <2 x bfloat>) #1 - +declare <2 x bfloat> @llvm.masked.gather.v2bf16.v2p0(<2 x ptr>, i32 immarg, <2 x i1>, <2 x bfloat>) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits