Skip to content

Commit e7ebc9b

Browse files
committed
Addressed feedback
1 parent 937e49b commit e7ebc9b

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
@@ -117,35 +117,35 @@ class OpLowerer {
117117
};
118118

119119
[[nodiscard]] bool replaceFunctionWithOp(Function &F, dxil::OpCode DXILOp,
120-
ArrayRef<ArgSelect> Args) {
120+
ArrayRef<ArgSelect> ArgSelects) {
121121
bool IsVectorArgExpansion = isVectorArgExpansion(F);
122122
return replaceFunction(F, [&](CallInst *CI) -> Error {
123123
OpBuilder.getIRB().SetInsertPoint(CI);
124-
SmallVector<Value *> NewArgs;
125-
if (Args.size()) {
126-
for (const ArgSelect &A : Args) {
124+
SmallVector<Value *> Args;
125+
if (ArgSelects.size()) {
126+
for (const ArgSelect &A : ArgSelects) {
127127
switch (A.Type) {
128128
case ArgSelect::Type::Index:
129-
NewArgs.push_back(CI->getArgOperand(A.Value));
129+
Args.push_back(CI->getArgOperand(A.Value));
130130
break;
131131
case ArgSelect::Type::I8:
132-
NewArgs.push_back(OpBuilder.getIRB().getInt8((uint8_t)A.Value));
132+
Args.push_back(OpBuilder.getIRB().getInt8((uint8_t)A.Value));
133133
break;
134134
case ArgSelect::Type::I32:
135-
NewArgs.push_back(OpBuilder.getIRB().getInt32(A.Value));
135+
Args.push_back(OpBuilder.getIRB().getInt32(A.Value));
136136
break;
137137
default:
138138
llvm_unreachable("Invalid type of intrinsic arg select.");
139139
}
140140
}
141141
} else if (IsVectorArgExpansion) {
142-
NewArgs = argVectorFlatten(CI, OpBuilder.getIRB());
142+
Args = argVectorFlatten(CI, OpBuilder.getIRB());
143143
} else {
144-
NewArgs.append(CI->arg_begin(), CI->arg_end());
144+
Args.append(CI->arg_begin(), CI->arg_end());
145145
}
146146

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

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
@@ -39,7 +39,7 @@ struct DXILArgSelect {
3939
I8,
4040
};
4141
Type Type = Type::Index;
42-
int Value = 0;
42+
int Value = -1;
4343
};
4444
struct DXILIntrinsicSelect {
4545
StringRef Intrinsic;

0 commit comments

Comments
 (0)