fixes

llvm · May 17, 2024 · 4b7d95d · 4b7d95d
1 parent 7b00833
commit 4b7d95d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/lib/polygeist/Passes/AffineOpt.cpp b/lib/polygeist/Passes/AffineOpt.cpp
@@ -230,18 +230,24 @@ std::unique_ptr<Pass> mlir::polygeist::createAffineOptPass() {
 
 #else
 
-#include <cstdlib>
-#include <memory>
-
 #include "PassDetails.h"
 
+#include "mlir/Dialect/Arith/IR/Arith.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
+#include "mlir/Dialect/MemRef/IR/MemRef.h"
+
 namespace mlir {
 class Pass;
 }
-
+using namespace mlir;
+using namespace polygeist;
+namespace {
+struct AffineOptPass : public AffineOptBase<AffineOptPass> {
+  void runOnOperation() override {}
+};
+} // namespace
 std::unique_ptr<mlir::Pass> mlir::polygeist::createAffineOptPass() {
-  abort();
-  return nullptr;
+  return std::make_unique<AffineOptPass>();
 }
 
 #endif
diff --git a/test/lit.cfg.py b/test/lit.cfg.py
@@ -38,6 +38,7 @@
 config.substitutions.append(('%llvm_obj_root', config.llvm_obj_root))
 config.substitutions.append(('%polygeist_src_root', config.polygeist_src_root))
 config.substitutions.append(('%polygeist_obj_root', config.polygeist_obj_root))
+config.substitutions.append(('%polymer_enabled', config.polymer_enabled))
 
 llvm_config.with_system_environment(['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])
 

diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
@@ -36,6 +36,7 @@ config.polygeist_obj_root = "@POLYGEIST_BINARY_DIR@"
 config.polygeist_tools_dir = "@POLYGEIST_TOOLS_DIR@"
 config.polygeist_shlib_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
 config.verilator_path = "@VERILATOR_PATH@"
+config.polymer_enabled = "@POLYGEIST_ENABLE_POLYMER@"
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.

diff --git a/test/polygeist-opt/affine-opt.mlir b/test/polygeist-opt/affine-opt.mlir
@@ -1,4 +1,4 @@
-// RUN: polygeist-opt --affine-opt %s 2>&1 | FileCheck %s
+// RUN: if [ %polymer_enabled == 1 ]; then polygeist-opt --affine-opt %s 2>&1 | FileCheck %s; fi
 
 // CHECK: <OpenScop>
 // CHECK: </OpenScop>

diff --git a/tools/cgeist/Test/CUDA/polybench-cuda/3mm/3mm.cu b/tools/cgeist/Test/CUDA/polybench-cuda/3mm/3mm.cu
@@ -1,5 +1,6 @@
 // clang-format off
-// XFAIL: cgeist %s %stdinclude %cudaopts -O3 -o %s.execm && %s.execm
+// XFAIL: *
+// RUN: cgeist %s %stdinclude %cudaopts -O3 -o %s.execm && %s.execm
 // clang-format on
 /**
  * 3mm.c: This file is part of the PolyBench/C 3.2 test suite.

diff --git a/tools/cgeist/Test/CUDA/polybench-cuda/mvt/mvt.cu b/tools/cgeist/Test/CUDA/polybench-cuda/mvt/mvt.cu
@@ -1,5 +1,6 @@
 // clang-format off
-// XFAIL: cgeist %s %stdinclude %cudaopts -O3 -o %s.execm && %s.execm
+// XFAIL: *
+// RUN: cgeist %s %stdinclude %cudaopts -O3 -o %s.execm && %s.execm
 // clang-format on
 /**
  * mvt.c: This file is part of the PolyBench 3.0 test suite.

diff --git a/tools/cgeist/Test/CUDA/polybench-cuda/reduction/reduction.cu b/tools/cgeist/Test/CUDA/polybench-cuda/reduction/reduction.cu
@@ -1,5 +1,6 @@
 // clang-format off
-// XFAIL: cgeist %s %stdinclude %cudaopts -O3 -o %s.execm && %s.execm 10
+// XFAIL: *
+// RUN: cgeist %s %stdinclude %cudaopts -O3 -o %s.execm && %s.execm 10
 // clang-format on
 // This program performs sum reduction with an optimization
 // removing warp divergence