From a14c7579e9ebab7e57bf61514a628774b30a7e04 Mon Sep 17 00:00:00 2001
From: Mark Dokter <mark@dokter.cc>
Date: Sun, 6 Oct 2024 11:22:26 +0200
Subject: [PATCH] [DAPHNE-#830] Fix anonymous namespace issue when compiling
 with Clang

When compiling with clang, there is a issue at runtime (LLVM complaining about anonymous namespaces not allowed in various places). These are hereby replaced with a non-anonymous namespace. For the lack of creativity these are all called "file_local".
---
 src/compiler/lowering/AggAllOpLowering.cpp             |  8 ++++----
 src/compiler/lowering/DaphneOptPass.cpp                | 10 ++++++----
 src/compiler/lowering/DistributeComputationsPass.cpp   |  8 ++++----
 src/compiler/lowering/EwOpsLowering.cpp                | 10 ++++++----
 src/compiler/lowering/LowerToLLVMPass.cpp              |  8 ++++----
 src/compiler/lowering/MapOpLowering.cpp                | 10 ++++++----
 src/compiler/lowering/MatMulOpLowering.cpp             | 10 +++++-----
 src/compiler/lowering/ModOpLowering.cpp                | 10 ++++++----
 src/compiler/lowering/PhyOperatorSelectionPass.cpp     | 10 ++++++----
 src/compiler/lowering/RewriteSqlOpPass.cpp             |  8 ++++----
 src/compiler/lowering/RewriteToCallKernelOpPass.cpp    | 10 ++++++----
 .../lowering/SpecializeGenericFunctionsPass.cpp        |  8 ++++----
 src/compiler/lowering/VectorizeComputationsPass.cpp    |  8 ++++----
 13 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/src/compiler/lowering/AggAllOpLowering.cpp b/src/compiler/lowering/AggAllOpLowering.cpp
index 031f814d0..79e29304a 100644
--- a/src/compiler/lowering/AggAllOpLowering.cpp
+++ b/src/compiler/lowering/AggAllOpLowering.cpp
@@ -174,7 +174,7 @@ class SumAllOpLowering : public OpConversionPattern<daphne::AllAggSumOp> {
     }
 };
 
-namespace {
+namespace file_local {
 /**
  * @brief Lowers the daphne::AggAll operator to a set of affine loops and
  * performs the aggregation on a MemRef which is created from the input
@@ -198,9 +198,9 @@ struct AggAllLoweringPass : public mlir::PassWrapper<AggAllLoweringPass, mlir::O
     }
     void runOnOperation() final;
 };
-} // end anonymous namespace
+} // namespace file_local
 
-void AggAllLoweringPass::runOnOperation() {
+void file_local::AggAllLoweringPass::runOnOperation() {
     mlir::ConversionTarget target(getContext());
     mlir::RewritePatternSet patterns(&getContext());
     LowerToLLVMOptions llvmOptions(&getContext());
@@ -236,5 +236,5 @@ void AggAllLoweringPass::runOnOperation() {
 }
 
 std::unique_ptr<mlir::Pass> mlir::daphne::createAggAllOpLoweringPass() {
-    return std::make_unique<AggAllLoweringPass>();
+    return std::make_unique<file_local::AggAllLoweringPass>();
 }
diff --git a/src/compiler/lowering/DaphneOptPass.cpp b/src/compiler/lowering/DaphneOptPass.cpp
index 4b4ea2493..006f3536e 100644
--- a/src/compiler/lowering/DaphneOptPass.cpp
+++ b/src/compiler/lowering/DaphneOptPass.cpp
@@ -43,7 +43,7 @@ class IntegerModOpt : public mlir::OpConversionPattern<mlir::daphne::EwModOp> {
     }
 };
 
-namespace {
+namespace file_local {
 /**
  * @brief This pass transforms operations (currently limited to the EwModOp) in
  * the DaphneDialect to a different set of operations also from the
@@ -64,9 +64,9 @@ struct DenseMatrixOptPass : public mlir::PassWrapper<DenseMatrixOptPass, mlir::O
                "also from the DaphneDialect.";
     }
 };
-} // end anonymous namespace
+} // namespace file_local
 
-void DenseMatrixOptPass::runOnOperation() {
+void file_local::DenseMatrixOptPass::runOnOperation() {
     mlir::ConversionTarget target(getContext());
     mlir::RewritePatternSet patterns(&getContext());
     mlir::LowerToLLVMOptions llvmOptions(&getContext());
@@ -89,4 +89,6 @@ void DenseMatrixOptPass::runOnOperation() {
     }
 }
 
-std::unique_ptr<mlir::Pass> mlir::daphne::createDaphneOptPass() { return std::make_unique<DenseMatrixOptPass>(); }
+std::unique_ptr<mlir::Pass> mlir::daphne::createDaphneOptPass() {
+    return std::make_unique<file_local::DenseMatrixOptPass>();
+}
diff --git a/src/compiler/lowering/DistributeComputationsPass.cpp b/src/compiler/lowering/DistributeComputationsPass.cpp
index 8f9428587..34cc372ed 100644
--- a/src/compiler/lowering/DistributeComputationsPass.cpp
+++ b/src/compiler/lowering/DistributeComputationsPass.cpp
@@ -27,7 +27,7 @@
 
 using namespace mlir;
 
-namespace {
+namespace file_local {
 struct Distribute : public OpInterfaceConversionPattern<daphne::Distributable> {
     using OpInterfaceConversionPattern::OpInterfaceConversionPattern;
 
@@ -71,13 +71,13 @@ struct DistributeComputationsPass : public PassWrapper<DistributeComputationsPas
     StringRef getArgument() const final { return "distribute-computation"; }
     StringRef getDescription() const final { return "TODO"; }
 };
-} // namespace
+} // namespace file_local
 
 bool onlyMatrixOperands(Operation *op) {
     return llvm::all_of(op->getOperandTypes(), [](Type t) { return llvm::isa<daphne::MatrixType>(t); });
 }
 
-void DistributeComputationsPass::runOnOperation() {
+void file_local::DistributeComputationsPass::runOnOperation() {
     auto module = getOperation();
 
     RewritePatternSet patterns(&getContext());
@@ -105,5 +105,5 @@ void DistributeComputationsPass::runOnOperation() {
 }
 
 std::unique_ptr<Pass> daphne::createDistributeComputationsPass() {
-    return std::make_unique<DistributeComputationsPass>();
+    return std::make_unique<file_local::DistributeComputationsPass>();
 }
diff --git a/src/compiler/lowering/EwOpsLowering.cpp b/src/compiler/lowering/EwOpsLowering.cpp
index d04960c83..1274e781f 100644
--- a/src/compiler/lowering/EwOpsLowering.cpp
+++ b/src/compiler/lowering/EwOpsLowering.cpp
@@ -200,7 +200,7 @@ using DivOpLowering = BinaryOpLowering<mlir::daphne::EwDivOp, mlir::arith::DivSI
 using PowOpLowering = BinaryOpLowering<mlir::daphne::EwPowOp, mlir::math::PowFOp, mlir::math::PowFOp>;
 // clang-format on
 
-namespace {
+namespace file_local {
 /**
  * @brief This pass lowers element-wise operations to affine loop
  * structures and arithmetic operations.
@@ -223,7 +223,7 @@ struct EwOpLoweringPass : public mlir::PassWrapper<EwOpLoweringPass, mlir::Opera
                "structures and arithmetic operations.";
     }
 };
-} // end anonymous namespace
+} // namespace file_local
 
 void populateLowerEwOpConversionPatterns(mlir::LLVMTypeConverter &typeConverter, mlir::RewritePatternSet &patterns) {
     // clang-format off
@@ -238,7 +238,7 @@ void populateLowerEwOpConversionPatterns(mlir::LLVMTypeConverter &typeConverter,
     // clang-format on
 }
 
-void EwOpLoweringPass::runOnOperation() {
+void file_local::EwOpLoweringPass::runOnOperation() {
     mlir::ConversionTarget target(getContext());
     mlir::RewritePatternSet patterns(&getContext());
     mlir::LowerToLLVMOptions llvmOptions(&getContext());
@@ -286,4 +286,6 @@ void EwOpLoweringPass::runOnOperation() {
         signalPassFailure();
 }
 
-std::unique_ptr<mlir::Pass> mlir::daphne::createEwOpLoweringPass() { return std::make_unique<EwOpLoweringPass>(); }
+std::unique_ptr<mlir::Pass> mlir::daphne::createEwOpLoweringPass() {
+    return std::make_unique<file_local::EwOpLoweringPass>();
+}
diff --git a/src/compiler/lowering/LowerToLLVMPass.cpp b/src/compiler/lowering/LowerToLLVMPass.cpp
index 0f14ab0cf..25823aa7a 100644
--- a/src/compiler/lowering/LowerToLLVMPass.cpp
+++ b/src/compiler/lowering/LowerToLLVMPass.cpp
@@ -879,7 +879,7 @@ class GenericCallOpLowering : public OpConversionPattern<daphne::GenericCallOp>
     }
 };
 
-namespace {
+namespace file_local {
 struct DaphneLowerToLLVMPass : public PassWrapper<DaphneLowerToLLVMPass, OperationPass<ModuleOp>> {
     explicit DaphneLowerToLLVMPass(const DaphneUserConfig &cfg) : cfg(cfg) {}
     const DaphneUserConfig &cfg;
@@ -889,9 +889,9 @@ struct DaphneLowerToLLVMPass : public PassWrapper<DaphneLowerToLLVMPass, Operati
     }
     void runOnOperation() final;
 };
-} // end anonymous namespace
+} // namespace file_local
 
-void DaphneLowerToLLVMPass::runOnOperation() {
+void file_local::DaphneLowerToLLVMPass::runOnOperation() {
     auto module = getOperation();
 
     RewritePatternSet patterns(&getContext());
@@ -950,5 +950,5 @@ void DaphneLowerToLLVMPass::runOnOperation() {
 }
 
 std::unique_ptr<Pass> daphne::createLowerToLLVMPass(const DaphneUserConfig &cfg) {
-    return std::make_unique<DaphneLowerToLLVMPass>(cfg);
+    return std::make_unique<file_local::DaphneLowerToLLVMPass>(cfg);
 }
diff --git a/src/compiler/lowering/MapOpLowering.cpp b/src/compiler/lowering/MapOpLowering.cpp
index fa6ac9016..688233753 100644
--- a/src/compiler/lowering/MapOpLowering.cpp
+++ b/src/compiler/lowering/MapOpLowering.cpp
@@ -81,7 +81,7 @@ class InlineMapOpLowering : public mlir::OpConversionPattern<mlir::daphne::MapOp
     }
 };
 
-namespace {
+namespace file_local {
 /**
  * @brief The MapOpLoweringPass rewrites the daphne::MapOp operator
  * to a set of perfectly nested affine loops and inserts for each element a call
@@ -107,9 +107,9 @@ struct MapOpLoweringPass : public mlir::PassWrapper<MapOpLoweringPass, mlir::Ope
                "UDF.";
     }
 };
-} // end anonymous namespace
+} // namespace file_local
 
-void MapOpLoweringPass::runOnOperation() {
+void file_local::MapOpLoweringPass::runOnOperation() {
     mlir::ConversionTarget target(getContext());
     mlir::RewritePatternSet patterns(&getContext());
     mlir::LowerToLLVMOptions llvmOptions(&getContext());
@@ -127,4 +127,6 @@ void MapOpLoweringPass::runOnOperation() {
     }
 }
 
-std::unique_ptr<mlir::Pass> mlir::daphne::createMapOpLoweringPass() { return std::make_unique<MapOpLoweringPass>(); }
+std::unique_ptr<mlir::Pass> mlir::daphne::createMapOpLoweringPass() {
+    return std::make_unique<file_local::MapOpLoweringPass>();
+}
diff --git a/src/compiler/lowering/MatMulOpLowering.cpp b/src/compiler/lowering/MatMulOpLowering.cpp
index c0aef46db..045c0a6e7 100644
--- a/src/compiler/lowering/MatMulOpLowering.cpp
+++ b/src/compiler/lowering/MatMulOpLowering.cpp
@@ -606,7 +606,7 @@ class MatMulLowering : public OpConversionPattern<daphne::MatMulOp> {
     }
 };
 
-namespace {
+namespace file_local {
 /**
  * @brief The MatMulLoweringPass rewrites the MatMulOp from the DaphneDialect
  * to a affine loop structure implementing a multi tiled loop structure.
@@ -663,9 +663,9 @@ struct MatMulLoweringPass : public impl::MatMulOpLoweringPassBase<MatMulLowering
         return sizes;
     }
 };
-} // end anonymous namespace
+} // namespace file_local
 
-void MatMulLoweringPass::runOnOperation() {
+void file_local::MatMulLoweringPass::runOnOperation() {
     auto module = getOperation();
     mlir::ConversionTarget target(getContext());
     mlir::RewritePatternSet patterns(&getContext());
@@ -725,7 +725,7 @@ std::unique_ptr<OperationPass<ModuleOp>> mlir::daphne::createMatMulOpLoweringPas
     bool matmul_tile, int matmul_vec_size_bits, std::vector<unsigned> matmul_fixed_tile_sizes,
     bool matmul_use_fixed_tile_sizes, int matmul_unroll_factor, int matmul_unroll_jam_factor,
     int matmul_num_vec_registers, bool matmul_invert_loops) {
-    return std::make_unique<MatMulLoweringPass>(
+    return std::make_unique<file_local::MatMulLoweringPass>(
         matmul_tile, matmul_vec_size_bits, matmul_fixed_tile_sizes, matmul_use_fixed_tile_sizes, matmul_unroll_factor,
         matmul_unroll_jam_factor, matmul_num_vec_registers, matmul_invert_loops);
 }
@@ -733,5 +733,5 @@ std::unique_ptr<OperationPass<ModuleOp>> mlir::daphne::createMatMulOpLoweringPas
 // This is used by daphne-opt and automatically inserts the options provided on
 // the command line into the pass.
 std::unique_ptr<OperationPass<ModuleOp>> mlir::daphne::createMatMulOpLoweringPass() {
-    return std::make_unique<MatMulLoweringPass>();
+    return std::make_unique<file_local::MatMulLoweringPass>();
 }
diff --git a/src/compiler/lowering/ModOpLowering.cpp b/src/compiler/lowering/ModOpLowering.cpp
index 8d047726e..0de777e2a 100644
--- a/src/compiler/lowering/ModOpLowering.cpp
+++ b/src/compiler/lowering/ModOpLowering.cpp
@@ -128,7 +128,7 @@ class EwModOpLowering : public mlir::OpConversionPattern<mlir::daphne::EwModOp>
     }
 };
 
-namespace {
+namespace file_local {
 /**
  * @brief Performs an integer mod optimization on the EwModOp operator by
  * lowering to an affine loop structure and performing the mod op on values
@@ -153,9 +153,9 @@ struct ModOpLoweringPass : public mlir::PassWrapper<ModOpLoweringPass, mlir::Ope
                "and performing the mod op on values loaded from a MemRef.";
     }
 };
-} // end anonymous namespace
+} // namespace file_local
 
-void ModOpLoweringPass::runOnOperation() {
+void file_local::ModOpLoweringPass::runOnOperation() {
     mlir::ConversionTarget target(getContext());
     mlir::RewritePatternSet patterns(&getContext());
     mlir::LowerToLLVMOptions llvmOptions(&getContext());
@@ -184,4 +184,6 @@ void ModOpLoweringPass::runOnOperation() {
     }
 }
 
-std::unique_ptr<mlir::Pass> mlir::daphne::createModOpLoweringPass() { return std::make_unique<ModOpLoweringPass>(); }
+std::unique_ptr<mlir::Pass> mlir::daphne::createModOpLoweringPass() {
+    return std::make_unique<file_local::ModOpLoweringPass>();
+}
diff --git a/src/compiler/lowering/PhyOperatorSelectionPass.cpp b/src/compiler/lowering/PhyOperatorSelectionPass.cpp
index 798784df9..969338df5 100644
--- a/src/compiler/lowering/PhyOperatorSelectionPass.cpp
+++ b/src/compiler/lowering/PhyOperatorSelectionPass.cpp
@@ -64,14 +64,14 @@ class MatMulOpLowering : public OpConversionPattern<daphne::MatMulOp> {
     }
 };
 
-namespace {
+namespace file_local {
 struct PhyOperatorSelectionPass : public PassWrapper<PhyOperatorSelectionPass, OperationPass<ModuleOp>> {
     explicit PhyOperatorSelectionPass() {}
     void runOnOperation() final;
 };
-} // end anonymous namespace
+} // namespace file_local
 
-void PhyOperatorSelectionPass::runOnOperation() {
+void file_local::PhyOperatorSelectionPass::runOnOperation() {
     auto module = getOperation();
 
     ConversionTarget target(getContext());
@@ -108,4 +108,6 @@ void PhyOperatorSelectionPass::runOnOperation() {
         signalPassFailure();
 }
 
-std::unique_ptr<Pass> daphne::createPhyOperatorSelectionPass() { return std::make_unique<PhyOperatorSelectionPass>(); }
\ No newline at end of file
+std::unique_ptr<Pass> daphne::createPhyOperatorSelectionPass() {
+    return std::make_unique<file_local::PhyOperatorSelectionPass>();
+}
\ No newline at end of file
diff --git a/src/compiler/lowering/RewriteSqlOpPass.cpp b/src/compiler/lowering/RewriteSqlOpPass.cpp
index 02509516e..e399f15e2 100644
--- a/src/compiler/lowering/RewriteSqlOpPass.cpp
+++ b/src/compiler/lowering/RewriteSqlOpPass.cpp
@@ -33,7 +33,7 @@
 
 using namespace mlir;
 
-namespace {
+namespace file_local {
 
 std::unordered_map<std::string, mlir::Value> tables;
 struct SqlReplacement : public RewritePattern {
@@ -81,9 +81,9 @@ struct RewriteSqlOpPass : public PassWrapper<RewriteSqlOpPass, OperationPass<Mod
     StringRef getArgument() const final { return "rewrite-sqlop"; }
     StringRef getDescription() const final { return "TODO"; }
 };
-} // namespace
+} // namespace file_local
 
-void RewriteSqlOpPass::runOnOperation() {
+void file_local::RewriteSqlOpPass::runOnOperation() {
     auto module = getOperation();
 
     RewritePatternSet patterns(&getContext());
@@ -98,4 +98,4 @@ void RewriteSqlOpPass::runOnOperation() {
         signalPassFailure();
 }
 
-std::unique_ptr<Pass> daphne::createRewriteSqlOpPass() { return std::make_unique<RewriteSqlOpPass>(); }
+std::unique_ptr<Pass> daphne::createRewriteSqlOpPass() { return std::make_unique<file_local::RewriteSqlOpPass>(); }
diff --git a/src/compiler/lowering/RewriteToCallKernelOpPass.cpp b/src/compiler/lowering/RewriteToCallKernelOpPass.cpp
index f99c9e472..0e537399e 100644
--- a/src/compiler/lowering/RewriteToCallKernelOpPass.cpp
+++ b/src/compiler/lowering/RewriteToCallKernelOpPass.cpp
@@ -37,7 +37,6 @@
 #include <memory>
 #include <sstream>
 #include <stdexcept>
-#include <string_view>
 #include <tuple>
 #include <unordered_map>
 #include <utility>
@@ -504,6 +503,7 @@ class DistributedPipelineKernelReplacement : public OpConversionPattern<daphne::
 
   public:
     using OpConversionPattern::OpConversionPattern;
+
     DistributedPipelineKernelReplacement(MLIRContext *mctx, Value dctx, const DaphneUserConfig &userConfig,
                                          std::unordered_map<std::string, bool> &usedLibPaths,
                                          PatternBenefit benefit = 2)
@@ -584,7 +584,9 @@ class DistributedPipelineKernelReplacement : public OpConversionPattern<daphne::
         return success();
     }
 };
+} // namespace
 
+namespace file_local {
 struct RewriteToCallKernelOpPass : public PassWrapper<RewriteToCallKernelOpPass, OperationPass<func::FuncOp>> {
     const DaphneUserConfig &userConfig;
     std::unordered_map<std::string, bool> &usedLibPaths;
@@ -594,9 +596,9 @@ struct RewriteToCallKernelOpPass : public PassWrapper<RewriteToCallKernelOpPass,
 
     void runOnOperation() final;
 };
-} // namespace
+} // namespace file_local
 
-void RewriteToCallKernelOpPass::runOnOperation() {
+void file_local::RewriteToCallKernelOpPass::runOnOperation() {
     func::FuncOp func = getOperation();
 
     RewritePatternSet patterns(&getContext());
@@ -628,5 +630,5 @@ void RewriteToCallKernelOpPass::runOnOperation() {
 
 std::unique_ptr<Pass> daphne::createRewriteToCallKernelOpPass(const DaphneUserConfig &cfg,
                                                               std::unordered_map<std::string, bool> &usedLibPaths) {
-    return std::make_unique<RewriteToCallKernelOpPass>(cfg, usedLibPaths);
+    return std::make_unique<file_local::RewriteToCallKernelOpPass>(cfg, usedLibPaths);
 }
diff --git a/src/compiler/lowering/SpecializeGenericFunctionsPass.cpp b/src/compiler/lowering/SpecializeGenericFunctionsPass.cpp
index e6b98bc8a..03e4f4a11 100644
--- a/src/compiler/lowering/SpecializeGenericFunctionsPass.cpp
+++ b/src/compiler/lowering/SpecializeGenericFunctionsPass.cpp
@@ -33,7 +33,7 @@
 
 using namespace mlir;
 
-namespace {
+namespace file_local {
 
 /**
  * @brief Checks if the function is untyped, i.e., if at least one of the inputs
@@ -413,7 +413,7 @@ class SpecializeGenericFunctionsPass : public PassWrapper<SpecializeGenericFunct
     StringRef getArgument() const final { return "specialize-generic-funcs"; }
     StringRef getDescription() const final { return "TODO"; }
 };
-} // namespace
+} // namespace file_local
 
 /**
  * @brief Generate and call specialized functions from template definitions and
@@ -433,7 +433,7 @@ class SpecializeGenericFunctionsPass : public PassWrapper<SpecializeGenericFunct
  * Finally we delete all the template functions such that the MLIR code can be
  * verified for correct input and output types.
  */
-void SpecializeGenericFunctionsPass::runOnOperation() {
+void file_local::SpecializeGenericFunctionsPass::runOnOperation() {
     auto module = getOperation();
 
     module.walk([&](func::FuncOp funcOp) { functions.insert({funcOp.getSymName().str(), funcOp}); });
@@ -469,5 +469,5 @@ void SpecializeGenericFunctionsPass::runOnOperation() {
 }
 
 std::unique_ptr<Pass> daphne::createSpecializeGenericFunctionsPass(const DaphneUserConfig &cfg) {
-    return std::make_unique<SpecializeGenericFunctionsPass>(cfg);
+    return std::make_unique<file_local::SpecializeGenericFunctionsPass>(cfg);
 }
diff --git a/src/compiler/lowering/VectorizeComputationsPass.cpp b/src/compiler/lowering/VectorizeComputationsPass.cpp
index 985c6442e..cfba68d55 100644
--- a/src/compiler/lowering/VectorizeComputationsPass.cpp
+++ b/src/compiler/lowering/VectorizeComputationsPass.cpp
@@ -28,7 +28,7 @@
 
 using namespace mlir;
 
-namespace {
+namespace file_local {
 /**
  * @brief Recursive function checking if the given value is transitively
  * dependant on the operation `op`.
@@ -182,9 +182,9 @@ void movePipelineInterleavedOperations(Block::iterator pipelinePosition,
 struct VectorizeComputationsPass : public PassWrapper<VectorizeComputationsPass, OperationPass<func::FuncOp>> {
     void runOnOperation() final;
 };
-} // namespace
+} // namespace file_local
 
-void VectorizeComputationsPass::runOnOperation() {
+void file_local::VectorizeComputationsPass::runOnOperation() {
     auto func = getOperation();
     // TODO: fuse pipelines that have the matching inputs, even if no output of
     // the one pipeline is used by the other.
@@ -405,5 +405,5 @@ void VectorizeComputationsPass::runOnOperation() {
 }
 
 std::unique_ptr<Pass> daphne::createVectorizeComputationsPass() {
-    return std::make_unique<VectorizeComputationsPass>();
+    return std::make_unique<file_local::VectorizeComputationsPass>();
 }