Skip to content

Commit f13c3a9

Browse files
committed
Addressed feedback
1 parent 485e3a8 commit f13c3a9

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

llvm/lib/Target/DirectX/DXILOpLowering.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,35 +116,35 @@ class OpLowerer {
116116
};
117117

118118
[[nodiscard]] bool replaceFunctionWithOp(Function &F, dxil::OpCode DXILOp,
119-
ArrayRef<ArgSelect> Args) {
119+
ArrayRef<ArgSelect> ArgSelects) {
120120
bool IsVectorArgExpansion = isVectorArgExpansion(F);
121121
return replaceFunction(F, [&](CallInst *CI) -> Error {
122122
OpBuilder.getIRB().SetInsertPoint(CI);
123-
SmallVector<Value *> NewArgs;
124-
if (Args.size()) {
125-
for (const ArgSelect &A : Args) {
123+
SmallVector<Value *> Args;
124+
if (ArgSelects.size()) {
125+
for (const ArgSelect &A : ArgSelects) {
126126
switch (A.Type) {
127127
case ArgSelect::Type::Index:
128-
NewArgs.push_back(CI->getArgOperand(A.Value));
128+
Args.push_back(CI->getArgOperand(A.Value));
129129
break;
130130
case ArgSelect::Type::I8:
131-
NewArgs.push_back(OpBuilder.getIRB().getInt8((uint8_t)A.Value));
131+
Args.push_back(OpBuilder.getIRB().getInt8((uint8_t)A.Value));
132132
break;
133133
case ArgSelect::Type::I32:
134-
NewArgs.push_back(OpBuilder.getIRB().getInt32(A.Value));
134+
Args.push_back(OpBuilder.getIRB().getInt32(A.Value));
135135
break;
136136
default:
137137
llvm_unreachable("Invalid type of intrinsic arg select.");
138138
}
139139
}
140140
} else if (IsVectorArgExpansion) {
141-
NewArgs = argVectorFlatten(CI, OpBuilder.getIRB());
141+
Args = argVectorFlatten(CI, OpBuilder.getIRB());
142142
} else {
143-
NewArgs.append(CI->arg_begin(), CI->arg_end());
143+
Args.append(CI->arg_begin(), CI->arg_end());
144144
}
145145

146-
Expected<CallInst *> OpCall = OpBuilder.tryCreateOp(
147-
DXILOp, NewArgs, CI->getName(), F.getReturnType());
146+
Expected<CallInst *> OpCall =
147+
OpBuilder.tryCreateOp(DXILOp, Args, CI->getName(), F.getReturnType());
148148
if (Error E = OpCall.takeError())
149149
return E;
150150

llvm/test/CodeGen/DirectX/group_memory_barrier_with_group_sync.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -dxil-op-lower -mtriple=dxil-pc-shadermodel6.3-library < %s | FileCheck %s --check-prefix=CHECK
1+
; RUN: opt -S -dxil-op-lower -mtriple=dxil-pc-shadermodel6.3-library < %s | FileCheck %s
22

33
define void @test_group_memory_barrier_with_group_sync() {
44
entry:

llvm/utils/TableGen/DXILEmitter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct DXILArgSelect {
4040
I8,
4141
};
4242
Type Type = Type::Index;
43-
int Value = 0;
43+
int Value = -1;
4444
};
4545
struct DXILIntrinsicSelect {
4646
StringRef Intrinsic;

0 commit comments

Comments
 (0)