shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "[mlir][test] Fix IR/AttributeTest.cpp compilation on Solaris"

Browse Source 
The `IR/AttributeTest.cpp` test fails to compile on Solaris:
```
/vol/llvm/src/llvm-project/local/mlir/unittests/IR/AttributeTest.cpp:223:36: error: no matching function for call to 'allocate'
      AttrT::get(type, "resource", UnmanagedAsmResourceBlob::allocate(data));
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/vol/llvm/src/llvm-project/local/mlir/unittests/IR/AttributeTest.cpp:237:3: note: in instantiation of function template specialization 'checkNativeAccess<mlir::detail::DenseResourceElementsAttrBase<int8_t>, char>' requested here
  checkNativeAccess<AttrT, T>(builder.getContext(), llvm::makeArrayRef(data),
  ^
/vol/llvm/src/llvm-project/local/mlir/unittests/IR/AttributeTest.cpp:258:3: note: in instantiation of function template specialization 'checkNativeIntAccess<mlir::detail::DenseResourceElementsAttrBase<int8_t>, char>' requested here
  checkNativeIntAccess<DenseI8ResourceElementsAttr, int8_t>(builder, 8);
  ^
/vol/llvm/src/llvm-project/local/mlir/include/mlir/IR/AsmState.h:221:3: note: candidate template ignored: requirement '!std::is_same<char, char>::value' was not satisfied [with T = char]
  allocate(ArrayRef<T> data, bool dataIsMutable = false) {
  ^
/vol/llvm/src/llvm-project/local/mlir/include/mlir/IR/AsmState.h:214:26: note: candidate function not viable: requires at least 2 arguments, but 1 was provided
  static AsmResourceBlob allocate(ArrayRef<char> data, size_t align,
                         ^
```
Because `char` is `signed` by default on Solaris and `int8_t` is
`char`. `std::is_same<int8_t, char>` is `true` unlike elsewhere, rejecting
the one-arg `allocate` overload.

Fixed by renaming the two overloads to avoid the ambiguity.

Tested on `amd64-pc-solaris2.11` ,`sparcv9-sun-solaris2.11`, and
`x86_64-pc-linux-gnu`.

Differential Revision: https://reviews.llvm.org/D131148
This commit is contained in:
Rainer Orth 2022-08-19 21:59:57 +02:00
parent 59960e8db9
commit 8847d9a242
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mlir/include/mlir/IR/AsmState.h
View File

@ -211,15 +211,15 @@ public:
/// Create a new unmanaged resource directly referencing the provided data. /// Create a new unmanaged resource directly referencing the provided data.
/// `dataIsMutable` indicates if the allocated data can be mutated. By /// `dataIsMutable` indicates if the allocated data can be mutated. By
/// default, we treat unmanaged blobs as immutable. /// default, we treat unmanaged blobs as immutable.
static AsmResourceBlob allocate(ArrayRef<char> data, size_t align, static AsmResourceBlob allocateWithAlign(ArrayRef<char> data, size_t align,
bool dataIsMutable = false) { bool dataIsMutable = false) {
return AsmResourceBlob(data, align, /*deleter=*/{}, return AsmResourceBlob(data, align, /*deleter=*/{},
/*dataIsMutable=*/false); /*dataIsMutable=*/false);
} }
template <typename T> template <typename T>
static std::enable_if_t<!std::is_same<T, char>::value, AsmResourceBlob> static AsmResourceBlob allocateInferAlign(ArrayRef<T> data,
allocate(ArrayRef<T> data, bool dataIsMutable = false) { bool dataIsMutable = false) {
return allocate( return allocateWithAlign(
ArrayRef<char>((const char *)data.data(), data.size() * sizeof(T)), ArrayRef<char>((const char *)data.data(), data.size() * sizeof(T)),
alignof(T)); alignof(T));
} }

12
mlir/unittests/IR/AttributeTest.cpp
View File

@ -219,8 +219,8 @@ template <typename AttrT, typename T>
static void checkNativeAccess(MLIRContext *ctx, ArrayRef<T> data, static void checkNativeAccess(MLIRContext *ctx, ArrayRef<T> data,
Type elementType) { Type elementType) {
auto type = RankedTensorType::get(data.size(), elementType); auto type = RankedTensorType::get(data.size(), elementType);
auto attr = auto attr = AttrT::get(type, "resource",
AttrT::get(type, "resource", UnmanagedAsmResourceBlob::allocate(data)); UnmanagedAsmResourceBlob::allocateInferAlign(data));
// Check that we can access and iterate the data properly. // Check that we can access and iterate the data properly.
Optional<ArrayRef<T>> attrData = attr.tryGetAsArrayRef(); Optional<ArrayRef<T>> attrData = attr.tryGetAsArrayRef();
@ -279,7 +279,7 @@ TEST(DenseResourceElementsAttrTest, CheckNoCast) {
ArrayRef<uint32_t> data; ArrayRef<uint32_t> data;
auto type = RankedTensorType::get(data.size(), builder.getI32Type()); auto type = RankedTensorType::get(data.size(), builder.getI32Type());
Attribute i32ResourceAttr = DenseI32ResourceElementsAttr::get( Attribute i32ResourceAttr = DenseI32ResourceElementsAttr::get(
type, "resource", UnmanagedAsmResourceBlob::allocate(data)); type, "resource", UnmanagedAsmResourceBlob::allocateInferAlign(data));
EXPECT_TRUE(i32ResourceAttr.isa<DenseI32ResourceElementsAttr>()); EXPECT_TRUE(i32ResourceAttr.isa<DenseI32ResourceElementsAttr>());
EXPECT_FALSE(i32ResourceAttr.isa<DenseF32ResourceElementsAttr>()); EXPECT_FALSE(i32ResourceAttr.isa<DenseF32ResourceElementsAttr>());
@ -296,7 +296,8 @@ TEST(DenseResourceElementsAttrTest, CheckInvalidData) {
EXPECT_DEBUG_DEATH( EXPECT_DEBUG_DEATH(
{ {
DenseBoolResourceElementsAttr::get( DenseBoolResourceElementsAttr::get(
type, "resource", UnmanagedAsmResourceBlob::allocate(data)); type, "resource",
UnmanagedAsmResourceBlob::allocateInferAlign(data));
}, },
"alignment mismatch between expected alignment and blob alignment"); "alignment mismatch between expected alignment and blob alignment");
} }
@ -311,7 +312,8 @@ TEST(DenseResourceElementsAttrTest, CheckInvalidType) {
EXPECT_DEBUG_DEATH( EXPECT_DEBUG_DEATH(
{ {
DenseBoolResourceElementsAttr::get( DenseBoolResourceElementsAttr::get(
type, "resource", UnmanagedAsmResourceBlob::allocate(data)); type, "resource",
UnmanagedAsmResourceBlob::allocateInferAlign(data));
}, },
"invalid shape element type for provided type `T`"); "invalid shape element type for provided type `T`");
} }