Skip to content

Commit db1147b

Browse files
authored
Pick up the following changes: * llvm/llvm-project#135243 * llvm/llvm-project#135131
1 parent e1162ee commit db1147b

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

cmake/llvm-hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
adba14acea99cc6a17d837763a3248c9d4a2fadf
1+
1cec5fffd8fddd9d85b516f876093b0e3f0eec5f

third_party/amd/lib/TritonAMDGPUToLLVM/LoadStoreOpToLLVM.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ struct LoadOpConversion : public ConvertOpToLLVMPattern<triton::LoadOp>,
366366

367367
auto cacheMod = op.getCache();
368368
SmallVector<Value> loadedVals;
369-
Type vecTy = LLVM::getFixedVectorType(valueElemTy, vec);
369+
Type vecTy = LLVM::getVectorType(valueElemTy, vec);
370370
for (size_t vecStart = 0; vecStart < numElems; vecStart += vec) {
371371
const size_t maxWordWidth = std::max<size_t>(32, valueElemNBits);
372372
const size_t totalWidth = valueElemNBits * vec;
@@ -466,7 +466,7 @@ struct BufferLoadOpConversion
466466
// Create the resource descriptor and then emit the buffer_load intrinsic(s)
467467
Value rsrcDesc = bufferEmitter.createResourceDescriptor(llPtr, llStride);
468468
SmallVector<Value> loadedVals;
469-
Type vecTy = LLVM::getFixedVectorType(valueElemTy, vec);
469+
Type vecTy = LLVM::getVectorType(valueElemTy, vec);
470470
for (size_t vecStart = 0; vecStart < numElems; vecStart += vec) {
471471
Value pred = mask ? maskElems[vecStart] : b.int_val(1, 1);
472472
Value falseVal = createZeroVector(rewriter, loc, cast<VectorType>(vecTy));
@@ -818,7 +818,7 @@ struct StoreOpConversion : public ConvertOpToLLVMPattern<triton::StoreOp>,
818818
Value pred =
819819
llMask ? b.and_(threadPred, maskElems[vecStart]) : threadPred;
820820

821-
auto vecTy = LLVM::getFixedVectorType(valueElemTy, vec);
821+
auto vecTy = LLVM::getVectorType(valueElemTy, vec);
822822

823823
const size_t maxWordWidth = std::max<size_t>(32, valueElemNBits);
824824
const size_t totalWidth = valueElemNBits * vec;
@@ -1038,7 +1038,7 @@ struct BufferAtomicRMWOpConversion
10381038
Value pred =
10391039
llMask ? b.and_(threadPred, maskElems[vecStart]) : threadPred;
10401040

1041-
Type vecTy = LLVM::getFixedVectorType(valueElemTy, vec);
1041+
Type vecTy = LLVM::getVectorType(valueElemTy, vec);
10421042
Value falseVal = createZeroVector(rewriter, loc, cast<VectorType>(vecTy));
10431043
// Create the store val
10441044
Value storeVal = packElementRangeIntoVector(
@@ -1148,7 +1148,7 @@ struct BufferStoreOpConversion
11481148
Value pred =
11491149
llMask ? b.and_(threadPred, maskElems[vecStart]) : threadPred;
11501150

1151-
Type vecTy = LLVM::getFixedVectorType(valueElemTy, vec);
1151+
Type vecTy = LLVM::getVectorType(valueElemTy, vec);
11521152
// Create the store val
11531153
Value storeVal = packElementRangeIntoVector(
11541154
rewriter, this->getTypeConverter(), loc, cast<VectorType>(vecTy),

third_party/amd/lib/TritonAMDGPUToLLVM/Utility.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ std::string mangleFunc(std::string name, Type type) {
4949
Value createVectorMaskFromPredicate(RewriterBase &rewriter, Location loc,
5050
Value pred, int64_t vecSize) {
5151
auto b = TritonLLVMOpBuilder(loc, rewriter);
52-
auto vecMaskTy = LLVM::getFixedVectorType(rewriter.getI1Type(), vecSize);
52+
auto vecMaskTy = LLVM::getVectorType(rewriter.getI1Type(), vecSize);
5353
Value maskVal = b.undef(vecMaskTy);
5454
for (size_t s = 0; s < vecSize; ++s) {
5555
Value indexVal =
@@ -70,7 +70,7 @@ int64_t getNumElements(Type ty) {
7070
Type castToVectorType(Type ty) {
7171
if (isa<VectorType>(ty))
7272
return ty;
73-
return LLVM::getFixedVectorType(ty, 1);
73+
return LLVM::getVectorType(ty, 1);
7474
}
7575

7676
} // namespace

third_party/nvidia/lib/TritonNVIDIAGPUToLLVM/LoadStoreOpToLLVM.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ struct LoadOpConversion : public ConvertOpToLLVMPattern<triton::LoadOp>,
305305

306306
size_t size = width / valueElemNBits;
307307

308-
auto vecTy = LLVM::getFixedVectorType(valueElemTy, size);
308+
auto vecTy = LLVM::getVectorType(valueElemTy, size);
309309
Value v = b.undef(vecTy);
310310
for (size_t s = 0; s < size; ++s) {
311311
Value falseVal = otherElems[vecStart + ii * size + s];
@@ -376,8 +376,8 @@ struct LoadOpConversion : public ConvertOpToLLVMPattern<triton::LoadOp>,
376376
} else {
377377
curr = ret;
378378
}
379-
curr = b.bitcast(curr, LLVM::getFixedVectorType(
380-
valueElemTy, width / valueElemNBits));
379+
curr = b.bitcast(
380+
curr, LLVM::getVectorType(valueElemTy, width / valueElemNBits));
381381
rets.push_back(curr);
382382
}
383383
int tmp = width / valueElemNBits;

third_party/nvidia/lib/TritonNVIDIAGPUToLLVM/TargetInfo.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ Value TargetInfo::ballot(RewriterBase &rewriter, Location loc, Type type,
128128
Value cmp) const {
129129
auto b = TritonLLVMOpBuilder(loc, rewriter);
130130
Value threadMask = b.int_val(type.getIntOrFloatBitWidth(), -1);
131-
return rewriter.create<NVVM::VoteBallotOp>(loc, type, threadMask, cmp);
131+
return rewriter.create<NVVM::VoteSyncOp>(loc, type, threadMask, cmp,
132+
NVVM::VoteSyncKind::ballot);
132133
}
133134

134135
static Value mapa(RewriterBase &rewriter, Location loc, Value ptr, Value ctaid,

0 commit comments

Comments
 (0)