Skip to content

Commit 1e242db

Browse files
committed
[mlir][SPIRV] Add support for dense_resource in arith to spirv
1 parent 37d0063 commit 1e242db

File tree

2 files changed

+56
-4
lines changed

2 files changed

+56
-4
lines changed

mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h"
1818
#include "mlir/IR/BuiltinAttributes.h"
1919
#include "mlir/IR/BuiltinTypes.h"
20+
#include "mlir/IR/DialectResourceBlobManager.h"
2021
#include "llvm/ADT/APInt.h"
2122
#include "llvm/ADT/ArrayRef.h"
2223
#include "llvm/ADT/STLExtras.h"
@@ -229,16 +230,29 @@ struct ConstantCompositeOpPattern final
229230
if (!srcType || srcType.getNumElements() == 1)
230231
return failure();
231232

232-
// arith.constant should only have vector or tenor types.
233+
// arith.constant should only have vector or tensor types.
233234
assert((isa<VectorType, RankedTensorType>(srcType)));
234235

235236
Type dstType = getTypeConverter()->convertType(srcType);
236237
if (!dstType)
237238
return failure();
238239

239-
auto dstElementsAttr = dyn_cast<DenseElementsAttr>(constOp.getValue());
240-
if (!dstElementsAttr)
241-
return failure();
240+
// Import the resource into the IR to make use of the special handling of
241+
// element types later on.
242+
mlir::DenseElementsAttr dstElementsAttr;
243+
if (auto denseElementsAttr =
244+
dyn_cast<DenseElementsAttr>(constOp.getValue())) {
245+
dstElementsAttr = denseElementsAttr;
246+
} else if (auto resourceAttr =
247+
dyn_cast<DenseResourceElementsAttr>(constOp.getValue())) {
248+
249+
ArrayRef<char> ptr = resourceAttr.getRawHandle().getBlob()->getData();
250+
dstElementsAttr =
251+
DenseElementsAttr::getFromRawBuffer(resourceAttr.getType(), ptr);
252+
} else {
253+
return rewriter.notifyMatchFailure(constOp,
254+
"Could not decode ElementsAttr");
255+
}
242256

243257
ShapedType dstAttrType = dstElementsAttr.getType();
244258

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// RUN: mlir-opt -split-input-file -convert-arith-to-spirv -verify-diagnostics %s | FileCheck %s
2+
3+
4+
//===----------------------------------------------------------------------===//
5+
// arith.constant dense_resource
6+
//
7+
// The decoding of dense_resource differs between little and big endian
8+
// machines. At the moment only litte endian is supported.
9+
// See https://github.com/llvm/llvm-project/issues/63469 for more infos.
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
// XFAIL: target=s390x-{{.*}}
14+
15+
module attributes {
16+
spirv.target_env = #spirv.target_env<
17+
#spirv.vce<v1.0, [Int8, Int16, Int64, Float16, Float64], []>, #spirv.resource_limits<>>
18+
} {
19+
func.func @constant_dense_resource() {
20+
// CHECK: %{{.*}} = spirv.Constant dense<[0.203224242, -0.254296064, -0.365104556, -0.469196141, 0.466041982]> : tensor<5xf32> : !spirv.array<5 x f32>
21+
%0 = arith.constant dense_resource<dense_resource_test_5xf32> : tensor<5xf32>
22+
// CHECK: %{{.*}} = spirv.Constant dense<[1, 2]> : vector<2xi32>
23+
%1 = arith.constant dense_resource<dense_resource_test_2xi32> : vector<2xi32>
24+
// CHECK: %{{.*}} = spirv.Constant dense<[0.35476172, 0.351080596, -0.0795008316, 0.366843373]> : tensor<4xf32> : !spirv.array<4 x f32>
25+
%2 = arith.constant dense_resource<dense_resource_test_2x2xf32> : tensor<1x2x2xf32>
26+
return
27+
}
28+
}
29+
// Resources are kept at end of file. New tests should be added above this.
30+
{-#
31+
dialect_resources: {
32+
builtin: {
33+
dense_resource_test_2xi32: "0x400000000100000002000000",
34+
dense_resource_test_5xf32: "0x08000000041A503E183382BEFCEEBABE7A3AF0BE0E9DEE3E",
35+
dense_resource_test_2x2xf32: "0x0800000054A3B53ED6C0B33E55D1A2BDE5D2BB3E"
36+
}
37+
}
38+
#-}

0 commit comments

Comments
 (0)