maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mlir][LLVMIR] Use the correct way to determine if it's a scalable vector 

One of the ShuffleVectorOp::build functions checks if the incoming
vector operands is scalable vector by casting its type to
mlir::VectorType first. However, in some cases the operand is not
necessarily mlir::VectorType (e.g. it might be a LLVMVectorType).

This patch fixes this issue by using the dedicated
`LLVM::isScalableVectorType` function to determine if the incoming
vector is scalable vector or not.

Differential Revision: https://reviews.llvm.org/D125818
This commit is contained in:
Min-Yih Hsu 2022-04-21 09:45:42 -07:00
parent 3b91657c7b
commit f088b99eac
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
View File

@ -2049,9 +2049,9 @@ void LLVM::ShuffleVectorOp::build(OpBuilder &b, OperationState &result,
Value v1, Value v2, ArrayAttr mask, Value v1, Value v2, ArrayAttr mask,
ArrayRef<NamedAttribute> attrs) { ArrayRef<NamedAttribute> attrs) {
auto containerType = v1.getType(); auto containerType = v1.getType();
auto vType = LLVM::getVectorType( auto vType = LLVM::getVectorType(LLVM::getVectorElementType(containerType),
LLVM::getVectorElementType(containerType), mask.size(), mask.size(),
containerType.cast<VectorType>().isScalable()); LLVM::isScalableVectorType(containerType));
build(b, result, vType, v1, v2, mask); build(b, result, vType, v1, v2, mask);
result.addAttributes(attrs); result.addAttributes(attrs);
} }

8
mlir/test/Target/LLVMIR/Import/incorrect-scalable-vector-check.ll Normal file
View File

@ -0,0 +1,8 @@
; RUN: mlir-translate --import-llvm %s | FileCheck %s
; CHECK: llvm.func @shufflevector_crash
define void @shufflevector_crash(<2 x i32*> %arg0) {
; CHECK: llvm.shufflevector %{{.+}}, %{{.+}} [1 : i32, 0 : i32] : !llvm.vec<2 x ptr<i32>>, !llvm.vec<2 x ptr<i32>>
%1 = shufflevector <2 x i32*> %arg0, <2 x i32*> undef, <2 x i32> <i32 1, i32 0>
ret void
}