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

Disable named attribute in ODG for ArgOrResultElementTypeIs as was taking address of r-value. 

--

PiperOrigin-RevId: 250805965
This commit is contained in:
Jacques Pienaar 2019-05-30 18:42:16 -07:00 committed by Mehdi Amini
parent 3650df50dd
commit 9c430353ae
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mlir/test/TestDialect/TestOps.td
View File

@ -83,7 +83,8 @@ def ArgAndResHaveFixedElementTypesOp :
Or<[And<[ArgOrResultElementTypeIs<"x", I32>, Or<[And<[ArgOrResultElementTypeIs<"x", I32>,
ArgOrResultElementTypeIs<"y", F32>, ArgOrResultElementTypeIs<"y", F32>,
ArgOrResultElementTypeIs<"res", I16>]>, ArgOrResultElementTypeIs<"res", I16>]>,
ArgOrResultElementTypeIs<"attr", I8>]>>]> { // TODO(jpienaar): change back to attr.
ArgOrResultElementTypeIs<"x", I8>]>>]> {
let arguments = (ins AnyVectorOrTensor:$x, AnyVectorOrTensor:$y, AnyAttr:$attr); let arguments = (ins AnyVectorOrTensor:$x, AnyVectorOrTensor:$y, AnyAttr:$attr);
let results = (outs AnyVectorOrTensor:$res); let results = (outs AnyVectorOrTensor:$res);
} }

11
mlir/test/mlir-tblgen/types.mlir
View File

@ -89,11 +89,12 @@ func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) {
// ----- // -----
// CHECK-LABEL: @fixed_element_types // TODO(jpienaar): re-enable post supporting attributes again.
func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) { // DISABLED_CHECK-LABEL: @fixed_element_types
%0 = "test.arg_and_res_have_fixed_element_types"(%arg0, %arg1) {attr: splat<tensor<2xi8>, 1>}: (tensor<* x i32>, tensor<* x f32>) -> tensor<* x i32> //func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) {
return // %0 = "test.arg_and_res_have_fixed_element_types"(%arg0, %arg1) {attr: splat<tensor<2xi8>, 1>}: (tensor<* x i32>, tensor<* x f32>) -> tensor<* x i32>
} // return
//}
// ----- // -----

4
mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
View File

@ -911,9 +911,7 @@ void OpEmitter::genVerifier() {
auto &body = method.body(); auto &body = method.body();
// Populate substitutions for attributes and named operands and results. // Populate substitutions for attributes and named operands and results.
for (const auto &namedAttr : op.getAttributes()) // TODO(jpienaar): Add attributes back.
verifyCtx.addSubst(namedAttr.name,
formatv("(&this->getAttr(\"{0}\"))", namedAttr.name));
for (int i = 0, e = op.getNumOperands(); i < e; ++i) { for (int i = 0, e = op.getNumOperands(); i < e; ++i) {
auto &value = op.getOperand(i); auto &value = op.getOperand(i);
// Skip from from first variadic operands for now. Else getOperand index // Skip from from first variadic operands for now. Else getOperand index