From deaeca02a1749b7f58172374ed03280bcfd7f53f Mon Sep 17 00:00:00 2001 From: AmrDeveloper Date: Sun, 8 Jun 2025 00:14:31 +0200 Subject: [PATCH 1/2] [CIR] Backport Extending VecShuffleOp verifier to catch invalid index --- clang/lib/CIR/Dialect/IR/CIRDialect.cpp | 9 +++++++++ .../IR/invalid-vector-shuffle-wrong-index.cir | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 clang/test/CIR/IR/invalid-vector-shuffle-wrong-index.cir diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp index ba9787a19d19..436c87a2ebd7 100644 --- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp @@ -1081,6 +1081,15 @@ LogicalResult cir::VecShuffleOp::verify() { [](mlir::Attribute attr) { return mlir::isa(attr); })) { return emitOpError() << "all index values must be integers"; } + + const uint64_t maxValidIndex = + getVec1().getType().getSize() + getVec2().getType().getSize() - 1; + for (const auto &idxAttr : getIndices().getAsRange()) { + if (idxAttr.getUInt() > maxValidIndex) + return emitOpError() << ": index for __builtin_shufflevector must be " + "less than the total number of vector elements"; + } + return success(); } diff --git a/clang/test/CIR/IR/invalid-vector-shuffle-wrong-index.cir b/clang/test/CIR/IR/invalid-vector-shuffle-wrong-index.cir new file mode 100644 index 000000000000..9e37a3a593e8 --- /dev/null +++ b/clang/test/CIR/IR/invalid-vector-shuffle-wrong-index.cir @@ -0,0 +1,16 @@ +// RUN: cir-opt %s -verify-diagnostics -split-input-file + +!s32i = !cir.int +!s64i = !cir.int + +module { + cir.func @fold_shuffle_vector_op_test() -> !cir.vector { + %vec_1 = cir.const #cir.const_vector<[#cir.int<1> : !s32i, #cir.int<3> : !s32i, #cir.int<5> : !s32i, #cir.int<7> : !s32i]> : !cir.vector + %vec_2 = cir.const #cir.const_vector<[#cir.int<2> : !s32i, #cir.int<4> : !s32i, #cir.int<6> : !s32i, #cir.int<8> : !s32i]> : !cir.vector + + // expected-error @below {{index for __builtin_shufflevector must be less than the total number of vector elements}} + %new_vec = cir.vec.shuffle(%vec_1, %vec_2 : !cir.vector) [#cir.int<9> : !s64i, #cir.int<4> : !s64i, + #cir.int<1> : !s64i, #cir.int<5> : !s64i] : !cir.vector + cir.return %new_vec : !cir.vector + } +} From f79b7a6d32745913944f34b1902f7d0ab5b9f203 Mon Sep 17 00:00:00 2001 From: AmrDeveloper Date: Sun, 8 Jun 2025 12:24:47 +0200 Subject: [PATCH 2/2] Fix the index constraint to accept -1 as valid index --- clang/lib/CIR/Dialect/IR/CIRDialect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp index 436c87a2ebd7..f42cdb2c9d0f 100644 --- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp @@ -1085,7 +1085,7 @@ LogicalResult cir::VecShuffleOp::verify() { const uint64_t maxValidIndex = getVec1().getType().getSize() + getVec2().getType().getSize() - 1; for (const auto &idxAttr : getIndices().getAsRange()) { - if (idxAttr.getUInt() > maxValidIndex) + if (idxAttr.getSInt() != -1 && idxAttr.getUInt() > maxValidIndex) return emitOpError() << ": index for __builtin_shufflevector must be " "less than the total number of vector elements"; }