From b7a4fb3af12646407ec976d8783613ec3efb4f98 Mon Sep 17 00:00:00 2001 From: Farzon Lotfi Date: Thu, 17 Apr 2025 22:46:29 -0400 Subject: [PATCH 1/5] [DirectX] legalize memset fixes #136243 This change converts memset into a series of geps and stores It is intentionally limited to memsets of fixed size It also converts the byte stores to type stores. DXIL does not support i8 plus this reduces the total number of gep and store instructions. This change also moves DXILFinalizeLinkage to run after Legalization to clean up any dead intrinsic definitions. --- llvm/lib/Target/DirectX/DXILLegalizePass.cpp | 78 ++++++++++++++++++ .../Target/DirectX/DirectXTargetMachine.cpp | 2 +- llvm/test/CodeGen/DirectX/legalize-memset.ll | 81 +++++++++++++++++++ llvm/test/CodeGen/DirectX/llc-pipeline.ll | 2 +- 4 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 llvm/test/CodeGen/DirectX/legalize-memset.ll diff --git a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp index 7da5a71ab729b..460cef248a355 100644 --- a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp +++ b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp @@ -13,6 +13,7 @@ #include "llvm/IR/InstIterator.h" #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" +#include "llvm/IR/Module.h" #include "llvm/Pass.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include @@ -239,6 +240,82 @@ downcastI64toI32InsertExtractElements(Instruction &I, } } +void emitMemset(IRBuilder<> &Builder, Value *Dst, Value *Val, + ConstantInt *SizeCI) { + LLVMContext &Ctx = Builder.getContext(); + [[maybe_unused]] DataLayout DL = + Builder.GetInsertBlock()->getModule()->getDataLayout(); + [[maybe_unused]] uint64_t OrigSize = SizeCI->getZExtValue(); + + AllocaInst *Alloca = dyn_cast(Dst); + + assert(Alloca && "Expected memset on an Alloca"); + assert(OrigSize == Alloca->getAllocationSize(DL)->getFixedValue() && + "Expected for memset size to match DataLayout size"); + + Type *AllocatedTy = Alloca->getAllocatedType(); + ArrayType *ArrTy = dyn_cast(AllocatedTy); + assert(ArrTy && "Expected Alloca for an Array Type"); + + Type *ElemTy = ArrTy->getElementType(); + uint64_t Size = ArrTy->getArrayNumElements(); + + [[maybe_unused]] uint64_t ElemSize = DL.getTypeStoreSize(ElemTy); + + assert(ElemSize > 0 && "Size must be set"); + assert(OrigSize == ElemSize * Size && "Size in bytes must match"); + + Value *TypedVal = Val; + if (Val->getType() != ElemTy) + TypedVal = Builder.CreateIntCast(Val, ElemTy, + false); // Or use CreateBitCast for float + + for (uint64_t I = 0; I < Size; ++I) { + Value *Offset = ConstantInt::get(Type::getInt32Ty(Ctx), I); + Value *Ptr = Builder.CreateGEP(ElemTy, Dst, Offset, "gep"); + Builder.CreateStore(TypedVal, Ptr); + } +} + +void removeLifetimesForMemset(CallInst *Memset, + SmallVectorImpl &ToRemove) { + assert(Memset->getCalledFunction()->getIntrinsicID() == Intrinsic::memset && + "Expected a memset intrinsic"); + + Value *DstPtr = Memset->getArgOperand(0); + DstPtr = DstPtr->stripPointerCasts(); + + for (User *U : DstPtr->users()) { + if (auto *CI = dyn_cast(U)) { + switch (CI->getIntrinsicID()) { + case Intrinsic::lifetime_start: + case Intrinsic::lifetime_end: + ToRemove.push_back(CI); + break; + } + } + } +} + +static void removeMemSet(Instruction &I, + SmallVectorImpl &ToRemove, + DenseMap) { + if (CallInst *CI = dyn_cast(&I)) { + Intrinsic::ID ID = CI->getIntrinsicID(); + if (ID == Intrinsic::memset) { + IRBuilder<> Builder(&I); + Value *Dst = CI->getArgOperand(0); + Value *Val = CI->getArgOperand(1); + [[maybe_unused]] ConstantInt *Size = + dyn_cast(CI->getArgOperand(2)); + assert(Size && "Expected Size to be a ConstantInt"); + emitMemset(Builder, Dst, Val, Size); + removeLifetimesForMemset(CI, ToRemove); + ToRemove.push_back(CI); + } + } +} + namespace { class DXILLegalizationPipeline { @@ -266,6 +343,7 @@ class DXILLegalizationPipeline { LegalizationPipeline; void initializeLegalizationPipeline() { + LegalizationPipeline.push_back(removeMemSet); LegalizationPipeline.push_back(upcastI8AllocasAndUses); LegalizationPipeline.push_back(fixI8UseChain); LegalizationPipeline.push_back(downcastI64toI32InsertExtractElements); diff --git a/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp b/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp index 398abd66dda16..10f4b4ee76619 100644 --- a/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp +++ b/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp @@ -98,7 +98,6 @@ class DirectXPassConfig : public TargetPassConfig { FunctionPass *createTargetRegisterAllocator(bool) override { return nullptr; } void addCodeGenPrepare() override { - addPass(createDXILFinalizeLinkageLegacyPass()); addPass(createDXILIntrinsicExpansionLegacyPass()); addPass(createDXILCBufferAccessLegacyPass()); addPass(createDXILDataScalarizationLegacyPass()); @@ -109,6 +108,7 @@ class DirectXPassConfig : public TargetPassConfig { addPass(createScalarizerPass(DxilScalarOptions)); addPass(createDXILForwardHandleAccessesLegacyPass()); addPass(createDXILLegalizeLegacyPass()); + addPass(createDXILFinalizeLinkageLegacyPass()); addPass(createDXILTranslateMetadataLegacyPass()); addPass(createDXILOpLoweringLegacyPass()); addPass(createDXILPrepareModulePass()); diff --git a/llvm/test/CodeGen/DirectX/legalize-memset.ll b/llvm/test/CodeGen/DirectX/legalize-memset.ll new file mode 100644 index 0000000000000..2d9b28753ef3d --- /dev/null +++ b/llvm/test/CodeGen/DirectX/legalize-memset.ll @@ -0,0 +1,81 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5 +; RUN: opt -S -passes='dxil-legalize' -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s + + +define void @replace_float_memset_test() { +; CHECK-LABEL: define void @replace_float_memset_test() { +; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [2 x float], align 4 +; CHECK-NEXT: [[GEP:%.*]] = getelementptr float, ptr [[ACCUM_I_FLAT]], i32 0 +; CHECK-NEXT: store float 0.000000e+00, ptr [[GEP]], align 4 +; CHECK-NEXT: [[GEP1:%.*]] = getelementptr float, ptr [[ACCUM_I_FLAT]], i32 1 +; CHECK-NEXT: store float 0.000000e+00, ptr [[GEP1]], align 4 +; CHECK-NEXT: ret void +; + %accum.i.flat = alloca [2 x float], align 4 + call void @llvm.lifetime.start.p0(i64 8, ptr nonnull %accum.i.flat) + call void @llvm.memset.p0.i32(ptr nonnull align 4 dereferenceable(8) %accum.i.flat, i8 0, i32 8, i1 false) + call void @llvm.lifetime.end.p0(i64 8, ptr nonnull %accum.i.flat) + ret void +} + +define void @replace_half_memset_test() { +; CHECK-LABEL: define void @replace_half_memset_test() { +; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [2 x half], align 4 +; CHECK-NEXT: [[GEP:%.*]] = getelementptr half, ptr [[ACCUM_I_FLAT]], i32 0 +; CHECK-NEXT: store half 0xH0000, ptr [[GEP]], align 2 +; CHECK-NEXT: [[GEP1:%.*]] = getelementptr half, ptr [[ACCUM_I_FLAT]], i32 1 +; CHECK-NEXT: store half 0xH0000, ptr [[GEP1]], align 2 +; CHECK-NEXT: ret void +; + %accum.i.flat = alloca [2 x half], align 4 + call void @llvm.lifetime.start.p0(i64 4, ptr nonnull %accum.i.flat) + call void @llvm.memset.p0.i32(ptr nonnull align 4 dereferenceable(8) %accum.i.flat, i8 0, i32 4, i1 false) + call void @llvm.lifetime.end.p0(i64 4, ptr nonnull %accum.i.flat) + ret void +} + +define void @replace_double_memset_test() { +; CHECK-LABEL: define void @replace_double_memset_test() { +; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [2 x double], align 4 +; CHECK-NEXT: [[GEP:%.*]] = getelementptr double, ptr [[ACCUM_I_FLAT]], i32 0 +; CHECK-NEXT: store double 0.000000e+00, ptr [[GEP]], align 8 +; CHECK-NEXT: [[GEP1:%.*]] = getelementptr double, ptr [[ACCUM_I_FLAT]], i32 1 +; CHECK-NEXT: store double 0.000000e+00, ptr [[GEP1]], align 8 +; CHECK-NEXT: ret void +; + %accum.i.flat = alloca [2 x double], align 4 + call void @llvm.lifetime.start.p0(i64 16, ptr nonnull %accum.i.flat) + call void @llvm.memset.p0.i32(ptr nonnull align 4 dereferenceable(8) %accum.i.flat, i8 0, i32 16, i1 false) + call void @llvm.lifetime.end.p0(i64 16, ptr nonnull %accum.i.flat) + ret void +} + +define void @replace_int16_memset_test() { +; CHECK-LABEL: define void @replace_int16_memset_test() { +; CHECK-NEXT: [[CACHE_I:%.*]] = alloca [2 x i16], align 2 +; CHECK-NEXT: [[GEP:%.*]] = getelementptr i16, ptr [[CACHE_I]], i32 0 +; CHECK-NEXT: store i16 0, ptr [[GEP]], align 2 +; CHECK-NEXT: [[GEP1:%.*]] = getelementptr i16, ptr [[CACHE_I]], i32 1 +; CHECK-NEXT: store i16 0, ptr [[GEP1]], align 2 +; CHECK-NEXT: ret void +; + %cache.i = alloca [2 x i16], align 2 + call void @llvm.lifetime.start.p0(i64 4, ptr nonnull %cache.i) + call void @llvm.memset.p0.i32(ptr nonnull align 2 dereferenceable(4) %cache.i, i8 0, i32 4, i1 false) + call void @llvm.lifetime.end.p0(i64 4, ptr nonnull %cache.i) + ret void +} + +define void @replace_int_memset_test() { +; CHECK-LABEL: define void @replace_int_memset_test() { +; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [1 x i32], align 4 +; CHECK-NEXT: [[GEP:%.*]] = getelementptr i32, ptr [[ACCUM_I_FLAT]], i32 0 +; CHECK-NEXT: store i32 0, ptr [[GEP]], align 4 +; CHECK-NEXT: ret void +; + %accum.i.flat = alloca [1 x i32], align 4 + call void @llvm.lifetime.start.p0(i64 4, ptr nonnull %accum.i.flat) + call void @llvm.memset.p0.i32(ptr nonnull align 4 dereferenceable(8) %accum.i.flat, i8 0, i32 4, i1 false) + call void @llvm.lifetime.end.p0(i64 4, ptr nonnull %accum.i.flat) + ret void +} diff --git a/llvm/test/CodeGen/DirectX/llc-pipeline.ll b/llvm/test/CodeGen/DirectX/llc-pipeline.ll index a2412b6324a05..55dd86c9fad1d 100644 --- a/llvm/test/CodeGen/DirectX/llc-pipeline.ll +++ b/llvm/test/CodeGen/DirectX/llc-pipeline.ll @@ -13,7 +13,6 @@ ; CHECK-OBJ-NEXT: Create Garbage Collector Module Metadata ; CHECK-NEXT: ModulePass Manager -; CHECK-NEXT: DXIL Finalize Linkage ; CHECK-NEXT: DXIL Intrinsic Expansion ; CHECK-NEXT: DXIL CBuffer Access ; CHECK-NEXT: DXIL Data Scalarization @@ -24,6 +23,7 @@ ; CHECK-NEXT: Scalarize vector operations ; CHECK-NEXT: DXIL Forward Handle Accesses ; CHECK-NEXT: DXIL Legalizer +; CHECK-NEXT: DXIL Finalize Linkage ; CHECK-NEXT: DXIL Resources Analysis ; CHECK-NEXT: DXIL Module Metadata analysis ; CHECK-NEXT: DXIL Shader Flag Analysis From 8636f9ca7c2c886ddc5822120eb6c19609ff8055 Mon Sep 17 00:00:00 2001 From: Farzon Lotfi Date: Mon, 21 Apr 2025 18:28:17 -0400 Subject: [PATCH 2/5] remove lifetime intrinsics removal. Move memset cleanup first incase we want to do i8 load store cleanup later. --- llvm/lib/Target/DirectX/DXILLegalizePass.cpp | 21 ------ llvm/test/CodeGen/DirectX/legalize-memset.ll | 68 ++++++++++++++++---- 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp index 460cef248a355..adf1e3d9a7458 100644 --- a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp +++ b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp @@ -277,26 +277,6 @@ void emitMemset(IRBuilder<> &Builder, Value *Dst, Value *Val, } } -void removeLifetimesForMemset(CallInst *Memset, - SmallVectorImpl &ToRemove) { - assert(Memset->getCalledFunction()->getIntrinsicID() == Intrinsic::memset && - "Expected a memset intrinsic"); - - Value *DstPtr = Memset->getArgOperand(0); - DstPtr = DstPtr->stripPointerCasts(); - - for (User *U : DstPtr->users()) { - if (auto *CI = dyn_cast(U)) { - switch (CI->getIntrinsicID()) { - case Intrinsic::lifetime_start: - case Intrinsic::lifetime_end: - ToRemove.push_back(CI); - break; - } - } - } -} - static void removeMemSet(Instruction &I, SmallVectorImpl &ToRemove, DenseMap) { @@ -310,7 +290,6 @@ static void removeMemSet(Instruction &I, dyn_cast(CI->getArgOperand(2)); assert(Size && "Expected Size to be a ConstantInt"); emitMemset(Builder, Dst, Val, Size); - removeLifetimesForMemset(CI, ToRemove); ToRemove.push_back(CI); } } diff --git a/llvm/test/CodeGen/DirectX/legalize-memset.ll b/llvm/test/CodeGen/DirectX/legalize-memset.ll index 2d9b28753ef3d..3bef92fe43e09 100644 --- a/llvm/test/CodeGen/DirectX/legalize-memset.ll +++ b/llvm/test/CodeGen/DirectX/legalize-memset.ll @@ -1,14 +1,17 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5 -; RUN: opt -S -passes='dxil-legalize' -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s +; RUN: opt -S -dxil-legalize -dxil-finalize-linkage -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s -define void @replace_float_memset_test() { -; CHECK-LABEL: define void @replace_float_memset_test() { +define void @replace_float_memset_test() #0 { +; CHECK-LABEL: define void @replace_float_memset_test( +; CHECK-SAME: ) #[[ATTR0:[0-9]+]] { ; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [2 x float], align 4 +; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 8, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: [[GEP:%.*]] = getelementptr float, ptr [[ACCUM_I_FLAT]], i32 0 ; CHECK-NEXT: store float 0.000000e+00, ptr [[GEP]], align 4 ; CHECK-NEXT: [[GEP1:%.*]] = getelementptr float, ptr [[ACCUM_I_FLAT]], i32 1 ; CHECK-NEXT: store float 0.000000e+00, ptr [[GEP1]], align 4 +; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 8, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: ret void ; %accum.i.flat = alloca [2 x float], align 4 @@ -18,13 +21,16 @@ define void @replace_float_memset_test() { ret void } -define void @replace_half_memset_test() { -; CHECK-LABEL: define void @replace_half_memset_test() { +define void @replace_half_memset_test() #0 { +; CHECK-LABEL: define void @replace_half_memset_test( +; CHECK-SAME: ) #[[ATTR0]] { ; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [2 x half], align 4 +; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: [[GEP:%.*]] = getelementptr half, ptr [[ACCUM_I_FLAT]], i32 0 ; CHECK-NEXT: store half 0xH0000, ptr [[GEP]], align 2 ; CHECK-NEXT: [[GEP1:%.*]] = getelementptr half, ptr [[ACCUM_I_FLAT]], i32 1 ; CHECK-NEXT: store half 0xH0000, ptr [[GEP1]], align 2 +; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: ret void ; %accum.i.flat = alloca [2 x half], align 4 @@ -34,13 +40,16 @@ define void @replace_half_memset_test() { ret void } -define void @replace_double_memset_test() { -; CHECK-LABEL: define void @replace_double_memset_test() { +define void @replace_double_memset_test() #0 { +; CHECK-LABEL: define void @replace_double_memset_test( +; CHECK-SAME: ) #[[ATTR0]] { ; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [2 x double], align 4 +; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: [[GEP:%.*]] = getelementptr double, ptr [[ACCUM_I_FLAT]], i32 0 ; CHECK-NEXT: store double 0.000000e+00, ptr [[GEP]], align 8 ; CHECK-NEXT: [[GEP1:%.*]] = getelementptr double, ptr [[ACCUM_I_FLAT]], i32 1 ; CHECK-NEXT: store double 0.000000e+00, ptr [[GEP1]], align 8 +; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: ret void ; %accum.i.flat = alloca [2 x double], align 4 @@ -50,13 +59,16 @@ define void @replace_double_memset_test() { ret void } -define void @replace_int16_memset_test() { -; CHECK-LABEL: define void @replace_int16_memset_test() { +define void @replace_int16_memset_test() #0 { +; CHECK-LABEL: define void @replace_int16_memset_test( +; CHECK-SAME: ) #[[ATTR0]] { ; CHECK-NEXT: [[CACHE_I:%.*]] = alloca [2 x i16], align 2 +; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 4, ptr nonnull [[CACHE_I]]) ; CHECK-NEXT: [[GEP:%.*]] = getelementptr i16, ptr [[CACHE_I]], i32 0 ; CHECK-NEXT: store i16 0, ptr [[GEP]], align 2 ; CHECK-NEXT: [[GEP1:%.*]] = getelementptr i16, ptr [[CACHE_I]], i32 1 ; CHECK-NEXT: store i16 0, ptr [[GEP1]], align 2 +; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 4, ptr nonnull [[CACHE_I]]) ; CHECK-NEXT: ret void ; %cache.i = alloca [2 x i16], align 2 @@ -66,11 +78,14 @@ define void @replace_int16_memset_test() { ret void } -define void @replace_int_memset_test() { -; CHECK-LABEL: define void @replace_int_memset_test() { +define void @replace_int_memset_test() #0 { +; CHECK-LABEL: define void @replace_int_memset_test( +; CHECK-SAME: ) #[[ATTR0]] { ; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [1 x i32], align 4 +; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: [[GEP:%.*]] = getelementptr i32, ptr [[ACCUM_I_FLAT]], i32 0 ; CHECK-NEXT: store i32 0, ptr [[GEP]], align 4 +; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: ret void ; %accum.i.flat = alloca [1 x i32], align 4 @@ -79,3 +94,34 @@ define void @replace_int_memset_test() { call void @llvm.lifetime.end.p0(i64 4, ptr nonnull %accum.i.flat) ret void } + +define void @replace_int_memset_to_var_test() #0 { +; CHECK-LABEL: define void @replace_int_memset_to_var_test( +; CHECK-SAME: ) #[[ATTR0]] { +; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [1 x i32], align 4 +; CHECK-NEXT: [[I:%.*]] = alloca i8, align 4 +; CHECK-NEXT: store i8 1, ptr [[I]], align 1 +; CHECK-NEXT: [[I8_LOAD:%.*]] = load i8, ptr [[I]], align 1 +; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) +; CHECK-NEXT: [[TMP1:%.*]] = zext i8 [[I8_LOAD]] to i32 +; CHECK-NEXT: [[GEP:%.*]] = getelementptr i32, ptr [[ACCUM_I_FLAT]], i32 0 +; CHECK-NEXT: store i32 [[TMP1]], ptr [[GEP]], align 4 +; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) +; CHECK-NEXT: ret void +; + %accum.i.flat = alloca [1 x i32], align 4 + %i = alloca i8, align 4 + store i8 1, ptr %i + %i8.load = load i8, ptr %i + call void @llvm.lifetime.start.p0(i64 4, ptr nonnull %accum.i.flat) + call void @llvm.memset.p0.i32(ptr nonnull align 4 dereferenceable(8) %accum.i.flat, i8 %i8.load, i32 4, i1 false) + call void @llvm.lifetime.end.p0(i64 4, ptr nonnull %accum.i.flat) + ret void +} + +attributes #0 = {"hlsl.export"} + + +declare void @llvm.lifetime.end.p0(i64 immarg, ptr captures(none)) +declare void @llvm.lifetime.start.p0(i64 immarg, ptr captures(none)) +declare void @llvm.memset.p0.i32(ptr writeonly captures(none), i8, i32, i1 immarg) From b020f5c7a6806f8f732ab07ff6a0440a7456a698 Mon Sep 17 00:00:00 2001 From: Farzon Lotfi Date: Tue, 29 Apr 2025 18:01:23 -0400 Subject: [PATCH 3/5] Add memset as an alloca load condition for type propogation. --- llvm/lib/Target/DirectX/DXILLegalizePass.cpp | 40 ++++++++++++++------ llvm/test/CodeGen/DirectX/legalize-memset.ll | 10 ++--- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp index adf1e3d9a7458..5a8b1acf77cdd 100644 --- a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp +++ b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp @@ -181,10 +181,17 @@ static void upcastI8AllocasAndUses(Instruction &I, if (!Load) continue; for (User *LU : Load->users()) { - auto *Cast = dyn_cast(LU); - if (!Cast) + Type *Ty = nullptr; + if (auto *Cast = dyn_cast(LU)) + Ty = Cast->getType(); + if (CallInst *CI = dyn_cast(LU)) { + if (CI->getIntrinsicID() == Intrinsic::memset) + Ty = Type::getInt32Ty(CI->getContext()); + } + + if (!Ty) continue; - Type *Ty = Cast->getType(); + if (!SmallestType || Ty->getPrimitiveSizeInBits() < SmallestType->getPrimitiveSizeInBits()) SmallestType = Ty; @@ -240,8 +247,9 @@ downcastI64toI32InsertExtractElements(Instruction &I, } } -void emitMemset(IRBuilder<> &Builder, Value *Dst, Value *Val, - ConstantInt *SizeCI) { +void emitMemsetExpansion(IRBuilder<> &Builder, Value *Dst, Value *Val, + ConstantInt *SizeCI, + DenseMap &ReplacedValues) { LLVMContext &Ctx = Builder.getContext(); [[maybe_unused]] DataLayout DL = Builder.GetInsertBlock()->getModule()->getDataLayout(); @@ -266,9 +274,19 @@ void emitMemset(IRBuilder<> &Builder, Value *Dst, Value *Val, assert(OrigSize == ElemSize * Size && "Size in bytes must match"); Value *TypedVal = Val; - if (Val->getType() != ElemTy) - TypedVal = Builder.CreateIntCast(Val, ElemTy, - false); // Or use CreateBitCast for float + + if (Val->getType() != ElemTy) { + // Note for i8 replacements if we know them we should use them. + // Further if this is a constant ReplacedValues will return null + // so we will stick to TypedVal = Val + if (ReplacedValues[Val]) + TypedVal = ReplacedValues[Val]; + // This case Val is a ConstantInt so the cast folds away. + // However if we don't do the cast the store below ends up being + // an i8. + else + TypedVal = Builder.CreateIntCast(Val, ElemTy, false); + } for (uint64_t I = 0; I < Size; ++I) { Value *Offset = ConstantInt::get(Type::getInt32Ty(Ctx), I); @@ -279,7 +297,7 @@ void emitMemset(IRBuilder<> &Builder, Value *Dst, Value *Val, static void removeMemSet(Instruction &I, SmallVectorImpl &ToRemove, - DenseMap) { + DenseMap &ReplacedValues) { if (CallInst *CI = dyn_cast(&I)) { Intrinsic::ID ID = CI->getIntrinsicID(); if (ID == Intrinsic::memset) { @@ -289,7 +307,7 @@ static void removeMemSet(Instruction &I, [[maybe_unused]] ConstantInt *Size = dyn_cast(CI->getArgOperand(2)); assert(Size && "Expected Size to be a ConstantInt"); - emitMemset(Builder, Dst, Val, Size); + emitMemsetExpansion(Builder, Dst, Val, Size, ReplacedValues); ToRemove.push_back(CI); } } @@ -322,11 +340,11 @@ class DXILLegalizationPipeline { LegalizationPipeline; void initializeLegalizationPipeline() { - LegalizationPipeline.push_back(removeMemSet); LegalizationPipeline.push_back(upcastI8AllocasAndUses); LegalizationPipeline.push_back(fixI8UseChain); LegalizationPipeline.push_back(downcastI64toI32InsertExtractElements); LegalizationPipeline.push_back(legalizeFreeze); + LegalizationPipeline.push_back(removeMemSet); } }; diff --git a/llvm/test/CodeGen/DirectX/legalize-memset.ll b/llvm/test/CodeGen/DirectX/legalize-memset.ll index 3bef92fe43e09..e97817ba824ed 100644 --- a/llvm/test/CodeGen/DirectX/legalize-memset.ll +++ b/llvm/test/CodeGen/DirectX/legalize-memset.ll @@ -1,7 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5 ; RUN: opt -S -dxil-legalize -dxil-finalize-linkage -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s - define void @replace_float_memset_test() #0 { ; CHECK-LABEL: define void @replace_float_memset_test( ; CHECK-SAME: ) #[[ATTR0:[0-9]+]] { @@ -99,13 +98,12 @@ define void @replace_int_memset_to_var_test() #0 { ; CHECK-LABEL: define void @replace_int_memset_to_var_test( ; CHECK-SAME: ) #[[ATTR0]] { ; CHECK-NEXT: [[ACCUM_I_FLAT:%.*]] = alloca [1 x i32], align 4 -; CHECK-NEXT: [[I:%.*]] = alloca i8, align 4 -; CHECK-NEXT: store i8 1, ptr [[I]], align 1 -; CHECK-NEXT: [[I8_LOAD:%.*]] = load i8, ptr [[I]], align 1 +; CHECK-NEXT: [[I:%.*]] = alloca i32, align 4 +; CHECK-NEXT: store i32 1, ptr [[I]], align 4 +; CHECK-NEXT: [[I8_LOAD:%.*]] = load i32, ptr [[I]], align 4 ; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) -; CHECK-NEXT: [[TMP1:%.*]] = zext i8 [[I8_LOAD]] to i32 ; CHECK-NEXT: [[GEP:%.*]] = getelementptr i32, ptr [[ACCUM_I_FLAT]], i32 0 -; CHECK-NEXT: store i32 [[TMP1]], ptr [[GEP]], align 4 +; CHECK-NEXT: store i32 [[I8_LOAD]], ptr [[GEP]], align 4 ; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 4, ptr nonnull [[ACCUM_I_FLAT]]) ; CHECK-NEXT: ret void ; From 53690baacb0d1555a1fec62563ccfc94a00f607b Mon Sep 17 00:00:00 2001 From: Farzon Lotfi Date: Wed, 30 Apr 2025 15:13:05 -0400 Subject: [PATCH 4/5] address pr comments --- llvm/lib/Target/DirectX/DXILLegalizePass.cpp | 49 +++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp index 5a8b1acf77cdd..5e384754c5e60 100644 --- a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp +++ b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp @@ -251,7 +251,7 @@ void emitMemsetExpansion(IRBuilder<> &Builder, Value *Dst, Value *Val, ConstantInt *SizeCI, DenseMap &ReplacedValues) { LLVMContext &Ctx = Builder.getContext(); - [[maybe_unused]] DataLayout DL = + [[maybe_unused]] const DataLayout &DL = Builder.GetInsertBlock()->getModule()->getDataLayout(); [[maybe_unused]] uint64_t OrigSize = SizeCI->getZExtValue(); @@ -276,16 +276,18 @@ void emitMemsetExpansion(IRBuilder<> &Builder, Value *Dst, Value *Val, Value *TypedVal = Val; if (Val->getType() != ElemTy) { - // Note for i8 replacements if we know them we should use them. - // Further if this is a constant ReplacedValues will return null - // so we will stick to TypedVal = Val - if (ReplacedValues[Val]) + if (ReplacedValues[Val]) { + // Note for i8 replacements if we know them we should use them. + // Further if this is a constant ReplacedValues will return null + // so we will stick to TypedVal = Val TypedVal = ReplacedValues[Val]; - // This case Val is a ConstantInt so the cast folds away. - // However if we don't do the cast the store below ends up being - // an i8. - else + + } else { + // This case Val is a ConstantInt so the cast folds away. + // However if we don't do the cast the store below ends up being + // an i8. TypedVal = Builder.CreateIntCast(Val, ElemTy, false); + } } for (uint64_t I = 0; I < Size; ++I) { @@ -298,19 +300,22 @@ void emitMemsetExpansion(IRBuilder<> &Builder, Value *Dst, Value *Val, static void removeMemSet(Instruction &I, SmallVectorImpl &ToRemove, DenseMap &ReplacedValues) { - if (CallInst *CI = dyn_cast(&I)) { - Intrinsic::ID ID = CI->getIntrinsicID(); - if (ID == Intrinsic::memset) { - IRBuilder<> Builder(&I); - Value *Dst = CI->getArgOperand(0); - Value *Val = CI->getArgOperand(1); - [[maybe_unused]] ConstantInt *Size = - dyn_cast(CI->getArgOperand(2)); - assert(Size && "Expected Size to be a ConstantInt"); - emitMemsetExpansion(Builder, Dst, Val, Size, ReplacedValues); - ToRemove.push_back(CI); - } - } + + CallInst *CI = dyn_cast(&I); + if (!CI) + return; + + Intrinsic::ID ID = CI->getIntrinsicID(); + if (ID != Intrinsic::memset) + return; + + IRBuilder<> Builder(&I); + Value *Dst = CI->getArgOperand(0); + Value *Val = CI->getArgOperand(1); + ConstantInt *Size = dyn_cast(CI->getArgOperand(2)); + assert(Size && "Expected Size to be a ConstantInt"); + emitMemsetExpansion(Builder, Dst, Val, Size, ReplacedValues); + ToRemove.push_back(CI); } namespace { From e6a4b05efd2c00d812b922a76dbef2aae6a98ea6 Mon Sep 17 00:00:00 2001 From: Farzon Lotfi Date: Wed, 30 Apr 2025 16:25:37 -0400 Subject: [PATCH 5/5] fix a few more issues with pr --- llvm/lib/Target/DirectX/DXILLegalizePass.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp index 5e384754c5e60..be77a70fa46ba 100644 --- a/llvm/lib/Target/DirectX/DXILLegalizePass.cpp +++ b/llvm/lib/Target/DirectX/DXILLegalizePass.cpp @@ -175,7 +175,6 @@ static void upcastI8AllocasAndUses(Instruction &I, Type *SmallestType = nullptr; - // Gather all cast targets for (User *U : AI->users()) { auto *Load = dyn_cast(U); if (!Load) @@ -247,9 +246,9 @@ downcastI64toI32InsertExtractElements(Instruction &I, } } -void emitMemsetExpansion(IRBuilder<> &Builder, Value *Dst, Value *Val, - ConstantInt *SizeCI, - DenseMap &ReplacedValues) { +static void emitMemsetExpansion(IRBuilder<> &Builder, Value *Dst, Value *Val, + ConstantInt *SizeCI, + DenseMap &ReplacedValues) { LLVMContext &Ctx = Builder.getContext(); [[maybe_unused]] const DataLayout &DL = Builder.GetInsertBlock()->getModule()->getDataLayout();