[Mlir-commits] [mlir] 5e10a8c - [mlir][Transforms] Fix mlir-config flag check

[Matthias Springer]

Author: Matthias Springer
Date: 2023-05-24T16:32:58+02:00
New Revision: 5e10a8c436eb7edd3cb8a865218a3b271a458634

URL: https://github.com/llvm/llvm-project/commit/5e10a8c436eb7edd3cb8a865218a3b271a458634
DIFF: https://github.com/llvm/llvm-project/commit/5e10a8c436eb7edd3cb8a865218a3b271a458634.diff

LOG: [mlir][Transforms] Fix mlir-config flag check

Boolean compiler flags (such as `DMLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS`) show up in `mlir-config.h` as preprocessor defines that are either 0 or 1. Use `#if` instead of `#ifdef`.

This should have been part of D144552.

Added: 
    

Modified: 
    mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp b/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
index c05b6398496c..4bc514b62c70 100644
--- a/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
+++ b/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
@@ -36,7 +36,7 @@ using namespace mlir;
 //===----------------------------------------------------------------------===//
 
 namespace {
-#ifdef MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#if MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
 /// A helper struct that stores finger prints of ops in order to detect broken
 /// RewritePatterns. A rewrite pattern is broken if it modifies IR without
 /// using the rewriter API or if it returns an inconsistent return value.
@@ -223,7 +223,7 @@ class GreedyPatternRewriteDriver : public PatternRewriter,
   /// The low-level pattern applicator.
   PatternApplicator matcher;
 
-#ifdef MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#if MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
   DebugFingerPrints debugFingerPrints;
 #endif // MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
 };
@@ -233,7 +233,7 @@ GreedyPatternRewriteDriver::GreedyPatternRewriteDriver(
     MLIRContext *ctx, const FrozenRewritePatternSet &patterns,
     const GreedyRewriteConfig &config)
     : PatternRewriter(ctx), folder(ctx, this), config(config), matcher(patterns)
-#ifdef MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#if MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
       // clang-format off
       , debugFingerPrints(this)
 // clang-format on
@@ -245,7 +245,7 @@ GreedyPatternRewriteDriver::GreedyPatternRewriteDriver(
   matcher.applyDefaultCostModel();
 
   // Set up listener.
-#ifdef MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#if MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
   // Send IR notifications to the debug handler. This handler will then forward
   // all notifications to this GreedyPatternRewriteDriver.
   setListener(&debugFingerPrints);
@@ -346,7 +346,7 @@ bool GreedyPatternRewriteDriver::processWorklist() {
     function_ref<LogicalResult(const Pattern &)> onSuccess = {};
 #endif
 
-#ifdef MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#if MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
     debugFingerPrints.computeFingerPrints(
         /*topLevel=*/config.scope ? config.scope->getParentOp() : op);
     auto clearFingerprints =
@@ -358,14 +358,14 @@ bool GreedyPatternRewriteDriver::processWorklist() {
 
     if (succeeded(matchResult)) {
       LLVM_DEBUG(logResultWithLine("success", "pattern matched"));
-#ifdef MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#if MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
       debugFingerPrints.notifyRewriteSuccess();
 #endif // MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
       changed = true;
       ++numRewrites;
     } else {
       LLVM_DEBUG(logResultWithLine("failure", "pattern failed to match"));
-#ifdef MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
+#if MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
       debugFingerPrints.notifyRewriteFailure();
 #endif // MLIR_ENABLE_EXPENSIVE_PATTERN_API_CHECKS
     }