caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MLIR][LLVM] Fix #llvm.constant_range crashing in storage uniquer (#135772)

Browse Source 
Add APIntParameter with custom implementation for comparison and use it
in llvm.constant_range attribute. This is necessary because the default
equality operator of APInt asserts when the bit widths of the compared
APInts differ. The comparison is used by StorageUniquer when hashes of
two ranges with different bit widths collide.
This commit is contained in:
Robert Konicar
2025-04-16 11:49:19 +02:00
committed by GitHub
parent 1f96aea037
commit b9ce185d4e
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
View File

@@ -1095,8 +1095,8 @@ def LLVM_TBAATagArrayAttr
//===----------------------------------------------------------------------===//
def LLVM_ConstantRangeAttr : LLVM_Attr<"ConstantRange", "constant_range"> {
let parameters = (ins
"::llvm::APInt":$lower,
"::llvm::APInt":$upper
APIntParameter<"">:$lower,
APIntParameter<"">:$upper
);
let summary = "A range of two integers, corresponding to LLVM's ConstantRange";
let description = [{

8
mlir/include/mlir/IR/AttrTypeBase.td
View File

@@ -383,6 +383,14 @@ class StringRefParameter<string desc = "", string value = ""> :
let defaultValue = value;
}
// For APInts, which require comparison supporting different bitwidths. The
// default APInt comparison operator asserts when the bitwidths differ, so
// a custom implementation is necessary.
class APIntParameter<string desc> :
AttrOrTypeParameter<"::llvm::APInt", desc> {
let comparator = "$_lhs.getBitWidth() == $_rhs.getBitWidth() && $_lhs == $_rhs";
}
// For APFloats, which require comparison.
class APFloatParameter<string desc> :
AttrOrTypeParameter<"::llvm::APFloat", desc> {

10
mlir/test/Dialect/LLVMIR/range-attr.mlir Normal file
View File

@@ -0,0 +1,10 @@
// RUN: mlir-opt %s -o - | FileCheck %s
// CHECK: #llvm.constant_range<i32, 0, 12>
llvm.func external @foo1(!llvm.ptr, i64) -> (i32 {llvm.range = #llvm.constant_range<i32, 0, 12>})
// CHECK: #llvm.constant_range<i8, 1, 10>
llvm.func external @foo2(!llvm.ptr, i64) -> (i8 {llvm.range = #llvm.constant_range<i8, 1, 10>})
// CHECK: #llvm.constant_range<i64, 0, 2147483648>
llvm.func external @foo3(!llvm.ptr, i64) -> (i64 {llvm.range = #llvm.constant_range<i64, 0, 2147483648>})
// CHECK: #llvm.constant_range<i32, 1, -2147483648>
llvm.func external @foo4(!llvm.ptr, i64) -> (i32 {llvm.range = #llvm.constant_range<i32, 1, -2147483648>})