This is an archive of the discontinued LLVM Phabricator instance.

Differential D133279

[DirectX backend] Remove Attribute not for DXIL on CallInst
ClosedPublic

Authored by python3kgae on Sep 4 2022, 4:08 PM.

Details

Reviewers
beanz
pow2clk
bogner
Commits
rG1e3d4c43442f: [DirectX backend] Remove Attribute not for DXIL on CallInst
Summary

Remove Attribute on CallInst which is not for DXIL when prepare for DXIL.

Diff Detail

Event Timeline

python3kgae created this revision.Sep 4 2022, 4:08 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 4 2022, 4:08 PM
Herald added a subscriber: hiraditya. · View Herald Transcript
python3kgae requested review of this revision.Sep 4 2022, 4:08 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 4 2022, 4:08 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B185027: Diff 457875.Sep 4 2022, 4:49 PM
nikic added a subscriber: nikic.Sep 5 2022, 12:31 AM
nikic added inline comments.
llvm/lib/Target/DirectX/DXILPrepare.cpp
163

Don't know if DXIL has invokes, but using CallBase here might be better to handle those as well.

python3kgae updated this revision to Diff 458036.Sep 5 2022, 10:07 AM

Use CallBase to cover both CallInst and Invoke

python3kgae marked an inline comment as done.Sep 5 2022, 10:11 AM
python3kgae added inline comments.
llvm/lib/Target/DirectX/DXILPrepare.cpp
163

Fixed. Thanks for pointing it out.

Harbormaster completed remote builds in B185134: Diff 458036.Sep 5 2022, 10:57 AM
beanz accepted this revision.Sep 13 2022, 11:37 AM

Looks good to me.

This revision is now accepted and ready to land.Sep 13 2022, 11:37 AM
Closed by commit rG1e3d4c43442f: [DirectX backend] Remove Attribute not for DXIL on CallInst (authored by python3kgae). · Explain WhySep 13 2022, 1:46 PM
This revision was automatically updated to reflect the committed changes.
python3kgae marked an inline comment as done.
python3kgae added a commit: rG1e3d4c43442f: [DirectX backend] Remove Attribute not for DXIL on CallInst.
Herald added a subscriber: mgorny. · View Herald TranscriptSep 13 2022, 1:46 PM

Revision Contents

PathSize
llvm/
lib/
Target/
DirectX/
2 lines
7 lines
test/
CodeGen/
DirectX/
25 lines

Diff 459867

llvm/lib/Target/DirectX/CMakeLists.txt

Show All 18 Linesadd_llvm_target(DirectXCodeGen
DirectXTargetMachine.cpp DirectXTargetMachine.cpp
DXILOpBuilder.cpp DXILOpBuilder.cpp
DXILOpLowering.cpp DXILOpLowering.cpp
DXILPrepare.cpp DXILPrepare.cpp
DXILTranslateMetadata.cpp DXILTranslateMetadata.cpp
PointerTypeAnalysis.cpp PointerTypeAnalysis.cpp
LINK_COMPONENTS LINK_COMPONENTS
AsmPrinter
Core Core
SelectionDAG
Support Support
DirectXInfo DirectXInfo
DXILBitWriter DXILBitWriter
ADD_TO_COMPONENT ADD_TO_COMPONENT
DirectX DirectX
) )
add_subdirectory(MCTargetDesc) add_subdirectory(MCTargetDesc)
add_subdirectory(TargetInfo) add_subdirectory(TargetInfo)
add_subdirectory(DXILWriter) add_subdirectory(DXILWriter)

llvm/lib/Target/DirectX/DXILPrepare.cpp

Show First 20 Lines • Show All 154 Lines • ▼ Show 20 Lines for (auto &F : M.functions()) {
} }
if (auto GEP = dyn_cast<GetElementPtrInst>(&I)) { if (auto GEP = dyn_cast<GetElementPtrInst>(&I)) {
if (Value *NoOpBitcast = maybeGenerateBitcast( if (Value *NoOpBitcast = maybeGenerateBitcast(
Builder, PointerTypes, I, GEP->getPointerOperand(), Builder, PointerTypes, I, GEP->getPointerOperand(),
GEP->getResultElementType())) GEP->getResultElementType()))
GEP->setOperand(0, NoOpBitcast); GEP->setOperand(0, NoOpBitcast);
continue; continue;
} }
if (auto *CB = dyn_cast<CallBase>(&I)) {
nikicUnsubmitted
Done
ReplyInline Actions

Don't know if DXIL has invokes, but using CallBase here might be better to handle those as well.

nikic: Don't know if DXIL has invokes, but using CallBase here might be better to handle those as well.
python3kgaeAuthorUnsubmitted
Done
ReplyInline Actions

Fixed. Thanks for pointing it out.

python3kgae: Fixed. Thanks for pointing it out.
CB->removeFnAttrs(AttrMask);
CB->removeRetAttrs(AttrMask);
for (size_t Idx = 0, End = CB->arg_size(); Idx < End; ++Idx)
CB->removeParamAttrs(Idx, AttrMask);
continue;
}
} }
} }
} }
return true; return true;
} }
DXILPrepareModule() : ModulePass(ID) {} DXILPrepareModule() : ModulePass(ID) {}
Show All 14 Lines

llvm/test/CodeGen/DirectX/strip-call-attrs.ll

  • This file was added.
; RUN: opt -S -dxil-prepare < %s | FileCheck %s
target triple = "dxil-unknown-unknown"
@f = internal unnamed_addr global float 0.000000e+00, align 4
@llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @_GLOBAL__sub_I_static_global.hlsl, ptr null }]
; Make sure noundef is removed for function.
; CHECK:declare float @"?init@@YAMXZ"()
declare noundef float @"?init@@YAMXZ"() local_unnamed_addr #0
; Make sure noundef is removed for call.
; CHECK: %call.i = tail call float @"?init@@YAMXZ"()
; Function Attrs: nounwind
define internal void @_GLOBAL__sub_I_static_global.hlsl() #1 {
entry:
%call.i = tail call noundef float @"?init@@YAMXZ"() #2
store float %call.i, ptr @f, align 4
ret void
}
attributes #0 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
attributes #1 = { nounwind "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
attributes #2 = { nounwind }