From 9c430353ae31beabe37a7d8676e82dcf779a2ed1 Mon Sep 17 00:00:00 2001 From: Jacques Pienaar Date: Thu, 30 May 2019 18:42:16 -0700 Subject: [PATCH] Disable named attribute in ODG for ArgOrResultElementTypeIs as was taking address of r-value. -- PiperOrigin-RevId: 250805965 --- mlir/test/TestDialect/TestOps.td | 3 ++- mlir/test/mlir-tblgen/types.mlir | 11 ++++++----- mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp | 4 +--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mlir/test/TestDialect/TestOps.td b/mlir/test/TestDialect/TestOps.td index 814bc72..d694644 100644 --- a/mlir/test/TestDialect/TestOps.td +++ b/mlir/test/TestDialect/TestOps.td @@ -83,7 +83,8 @@ def ArgAndResHaveFixedElementTypesOp : Or<[And<[ArgOrResultElementTypeIs<"x", I32>, ArgOrResultElementTypeIs<"y", F32>, 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 results = (outs AnyVectorOrTensor:$res); } diff --git a/mlir/test/mlir-tblgen/types.mlir b/mlir/test/mlir-tblgen/types.mlir index e84adcf..0b853b2 100644 --- a/mlir/test/mlir-tblgen/types.mlir +++ b/mlir/test/mlir-tblgen/types.mlir @@ -89,11 +89,12 @@ func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) { // ----- -// CHECK-LABEL: @fixed_element_types -func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) { - %0 = "test.arg_and_res_have_fixed_element_types"(%arg0, %arg1) {attr: splat, 1>}: (tensor<* x i32>, tensor<* x f32>) -> tensor<* x i32> - return -} +// TODO(jpienaar): re-enable post supporting attributes again. +// DISABLED_CHECK-LABEL: @fixed_element_types +//func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) { +// %0 = "test.arg_and_res_have_fixed_element_types"(%arg0, %arg1) {attr: splat, 1>}: (tensor<* x i32>, tensor<* x f32>) -> tensor<* x i32> +// return +//} // ----- diff --git a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp index a7b347e..61373ae 100644 --- a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp +++ b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp @@ -911,9 +911,7 @@ void OpEmitter::genVerifier() { auto &body = method.body(); // Populate substitutions for attributes and named operands and results. - for (const auto &namedAttr : op.getAttributes()) - verifyCtx.addSubst(namedAttr.name, - formatv("(&this->getAttr(\"{0}\"))", namedAttr.name)); + // TODO(jpienaar): Add attributes back. for (int i = 0, e = op.getNumOperands(); i < e; ++i) { auto &value = op.getOperand(i); // Skip from from first variadic operands for now. Else getOperand index -- 2.7.4