Fix some MLIR build errors

larq · Jun 15, 2024 · f940562 · f940562
1 parent 68e7076
commit f940562
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 28 deletions.
diff --git a/larq_compute_engine/mlir/ir/lce_ops.h b/larq_compute_engine/mlir/ir/lce_ops.h
@@ -3,6 +3,7 @@
 
 #include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
+#include "mlir/Bytecode/BytecodeOpInterface.h"
 
 // clang-format off
 #include "larq_compute_engine/mlir/ir/lce_dialect.h.inc"

diff --git a/larq_compute_engine/mlir/transforms/bitpack_activations_patterns.td b/larq_compute_engine/mlir/transforms/bitpack_activations_patterns.td
@@ -55,6 +55,6 @@ class WriteBitpackedActivationsPat<ConstantStrAttr padding_type, string pad_valu
               padding_type,
               $stride_height,
               $stride_width),
-          [(HasOneUse $output)], (addBenefit 10)>;
+          [(HasOneUse $output)]>;
 def : WriteBitpackedActivationsPat<TFL_PAD_Valid, "0">;
 def : WriteBitpackedActivationsPat<TFL_PAD_Same, "1">;
diff --git a/larq_compute_engine/mlir/transforms/fuse_padding.td b/larq_compute_engine/mlir/transforms/fuse_padding.td
@@ -43,8 +43,7 @@ def : Pat<(TFL_Conv2DOp:$conv_output
           [(HasOneUse $pad_output),
            (NoBatchAndChannelPadding $paddings),
            (SamePaddingHeight $paddings, $input, $conv_output, $stride_h),
-           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)],
-          (addBenefit 100)>;
+           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)]>;
 
 
 // PadV2 > Conv2D
@@ -74,8 +73,7 @@ def : Pat<(TFL_Conv2DOp:$conv_output
            (ConstFloatValueIs<"0.0"> $pad_values),
            (NoBatchAndChannelPadding $paddings),
            (SamePaddingHeight $paddings, $input, $conv_output, $stride_h),
-           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)],
-          (addBenefit 100)>;
+           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)]>;
 
 // Pad > DepthwiseConv2D
 def : Pat<(TFL_DepthwiseConv2DOp:$conv_output
@@ -104,8 +102,7 @@ def : Pat<(TFL_DepthwiseConv2DOp:$conv_output
           [(HasOneUse $pad_output),
            (NoBatchAndChannelPadding $paddings),
            (SamePaddingHeight $paddings, $input, $conv_output, $stride_h),
-           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)],
-          (addBenefit 100)>;
+           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)]>;
 
 // PadV2 > DepthwiseConv2D
 def : Pat<(TFL_DepthwiseConv2DOp:$conv_output
@@ -136,5 +133,4 @@ def : Pat<(TFL_DepthwiseConv2DOp:$conv_output
            (ConstFloatValueIs<"0.0"> $pad_values),
            (NoBatchAndChannelPadding $paddings),
            (SamePaddingHeight $paddings, $input, $conv_output, $stride_h),
-           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)],
-          (addBenefit 100)>;
+           (SamePaddingWidth $paddings, $input, $conv_output, $stride_w)]>;
diff --git a/larq_compute_engine/mlir/transforms/optimize.cc b/larq_compute_engine/mlir/transforms/optimize.cc
@@ -4,7 +4,6 @@
 #include "larq_compute_engine/mlir/ir/lce_ops.h"
 #include "larq_compute_engine/mlir/transforms/common.h"
 #include "larq_compute_engine/mlir/transforms/passes.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"

diff --git a/larq_compute_engine/mlir/transforms/optimize_patterns_common.td b/larq_compute_engine/mlir/transforms/optimize_patterns_common.td
@@ -18,24 +18,21 @@ def : Pat<(LQ_QuantizeOp
                   $input,
                   (Arith_ConstantOp ConstantValue<"0.0f">))),
           (LQ_QuantizeOp $input),
-          [(HasOneUse $ge_op)],
-          (addBenefit 150)>;
+          [(HasOneUse $ge_op)]>;
 
 def : Pat<(LQ_QuantizeOp
               (TFL_GreaterEqualOp:$ge_op
                   $input,
                   $threshold)),
           (LQ_QuantizeOp
               (TFL_SubOp $input, $threshold, TFL_AF_None)),
-          [(HasOneUse $ge_op)],
-          (addBenefit 100)>;
+          [(HasOneUse $ge_op)]>;
 
 def : Pat<(LQ_QuantizeOp
               (TFL_LessEqualOp:$ge_op $lhs, $rhs)),
           (LQ_QuantizeOp
               (TFL_GreaterEqualOp $rhs, $lhs)),
-          [(HasOneUse $ge_op)],
-          (addBenefit 100)>;
+          [(HasOneUse $ge_op)]>;
 
 // TODO: Check shapes before fusing
 multiclass FuseAddOrSubWithBConv2D<Op binaryOp> {
@@ -70,7 +67,7 @@ multiclass FuseAddOrSubWithBConv2D<Op binaryOp> {
                 $padding,
                 $stride_height,
                 $stride_width),
-            [(HasOneUse $output)], (addBenefit 100)>;
+            [(HasOneUse $output)]>;
 }
 foreach binaryOp = [TFL_AddOp, TFL_SubOp] in
   defm : FuseAddOrSubWithBConv2D<binaryOp>;
@@ -109,7 +106,7 @@ multiclass FuseMulOrDivWithBConv2D<Op binaryOp> {
                 $padding,
                 $stride_height,
                 $stride_width),
-            [(HasOneUse $conv_output)], (addBenefit 100)>;
+            [(HasOneUse $conv_output)]>;
 }
 foreach binaryOp = [TFL_DivOp, TFL_MulOp] in
   defm : FuseMulOrDivWithBConv2D<binaryOp>;
@@ -146,7 +143,7 @@ multiclass FuseActFnIntoConvOpPat<Op ActFnOp, ConstantStrAttr ActFnAttr> {
                 $padding,
                 $stride_height,
                 $stride_width),
-            [(HasOneUse $conv_output)], (addBenefit 100)>;
+            [(HasOneUse $conv_output)]>;
   def : Pat<(ActFnOp
                 (LQ_Bconv2dOp:$conv_output
                     $input,
@@ -176,7 +173,7 @@ multiclass FuseActFnIntoConvOpPat<Op ActFnOp, ConstantStrAttr ActFnAttr> {
                 $padding,
                 $stride_height,
                 $stride_width),
-            [(HasOneUse $conv_output)], (addBenefit 100)>;
+            [(HasOneUse $conv_output)]>;
 }
 foreach actFnPair = [[TFL_ReluOp, TFL_AF_Relu],
                      [TFL_Relu1Op, TFL_AF_Relu1],

diff --git a/larq_compute_engine/mlir/transforms/prepare_patterns_common.td b/larq_compute_engine/mlir/transforms/prepare_patterns_common.td
@@ -37,7 +37,7 @@ multiclass QuantDequantPatterns<Op SelectOp> {
                             $select_op,
                             $select_op,
                             /*use 32bit*/ConstBoolAttrFalse)))),
-            [], (addBenefit 100)>;
+            []>;
   def : Pat<(SelectOp:$select_op
                 $cond,
                 (Arith_ConstantOp ConstantValue<"-1.0f">),
@@ -51,17 +51,17 @@ multiclass QuantDequantPatterns<Op SelectOp> {
                             $select_op,
                             $select_op,
                             /*use 32bit*/ConstBoolAttrFalse)))),
-            [], (addBenefit 100)>;
+            []>;
 }
 foreach SelectOp = [TF_SelectOp, TF_SelectV2Op]<Op> in
   defm : QuantDequantPatterns<SelectOp>;
 
 // A fallback for the old version of `ste_sign` that uses a specific `tf.sign`
 // based implementation of `larq.math.sign`.
 def : Pat<(TF_SignOp (TF_AddV2Op (TF_SignOp $arg), $c)),
-          (LQ_DequantizeOp (LQ_QuantizeOp $arg)), [], (addBenefit 100)>;
+          (LQ_DequantizeOp (LQ_QuantizeOp $arg)), []>;
 def : Pat<(TF_SignOp (TF_AddV2Op $c, (TF_SignOp $arg))),
-          (LQ_DequantizeOp (LQ_QuantizeOp $arg)), [], (addBenefit 100)>;
+          (LQ_DequantizeOp (LQ_QuantizeOp $arg)), []>;
 
 // Copied from legalize_patterns.td
 class I32VectorElementsAttr<int len> : ElementsAttrBase<
@@ -123,8 +123,7 @@ class PrepareBConvPadValue0Pat<ConstantStrAttr padding_type> :
               ExtractI32At<1>:$strides,
               ExtractI32At<2>:$strides),
           [(BinaryFilter $filter),
-           (ValidFilterShape $dequantized_input, $filter_op)],
-          (addBenefit 90)>;
+           (ValidFilterShape $dequantized_input, $filter_op)]>;
 def : PrepareBConvPadValue0Pat<TFL_PAD_Valid>;
 
 def ConstFloatValueIsOne : Constraint<
@@ -166,5 +165,4 @@ def : Pat<(TF_Conv2DOp:$output
           [(BinaryFilter $filter),
            (ConstFloatValueIsOne $pad_values),
            (SamePadding $paddings, $input, $output, $strides),
-           (ValidFilterShape $dequantized_input, $filter_op)],
-          (addBenefit 90)>;
+           (ValidFilterShape $dequantized_input, $filter_op)]>;