Minor code adjustments

marco-compiler · Nov 27, 2024 · 6b271a4 · 6b271a4
1 parent 1ebfa02
commit 6b271a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/include/public/marco/Dialect/BaseModelica/Transforms/VariablesPruning.h b/include/public/marco/Dialect/BaseModelica/Transforms/VariablesPruning.h
@@ -3,12 +3,11 @@
 
 #include "mlir/Pass/Pass.h"
 
-namespace mlir::bmodelica
-{
+namespace mlir::bmodelica {
 #define GEN_PASS_DECL_VARIABLESPRUNINGPASS
 #include "marco/Dialect/BaseModelica/Transforms/Passes.h.inc"
 
 std::unique_ptr<mlir::Pass> createVariablesPruningPass();
-}
+} // namespace mlir::bmodelica
 
 #endif // MARCO_DIALECT_BASEMODELICA_TRANSFORMS_VARIABLESPRUNING_H
diff --git a/include/public/marco/Modeling/SingleEntryWeaklyConnectedDigraph.h b/include/public/marco/Modeling/SingleEntryWeaklyConnectedDigraph.h
@@ -114,8 +114,9 @@ namespace llvm {
 // that are defined inside LLVM itself. This way we don't have to implement
 // them from scratch.
 template <typename VertexProperty, typename EdgeProperty>
-struct GraphTraits<const marco::modeling::internal::dependency ::
-                       SingleEntryWeaklyConnectedDigraph<VertexProperty, EdgeProperty> *> {
+struct GraphTraits<
+    const marco::modeling::internal::dependency ::
+        SingleEntryWeaklyConnectedDigraph<VertexProperty, EdgeProperty> *> {
   // The LLVM traits require the class specified as Graph to be copyable.
   // We use its address to overcome this limitation.
   using Graph = const marco::modeling::internal::dependency ::

diff --git a/lib/Dialect/BaseModelica/Transforms/VariablesPruning.cpp b/lib/Dialect/BaseModelica/Transforms/VariablesPruning.cpp
@@ -34,7 +34,7 @@ class VariablesPruningPass
   collectUsedVariables(llvm::DenseSet<VariableOp> &usedVariables,
                        mlir::SymbolTableCollection &symbolTableCollection,
                        ModelOp modelOp,
-                       const llvm::DenseSet<VariableOp>& outputVariables,
+                       const llvm::DenseSet<VariableOp> &outputVariables,
                        llvm::ArrayRef<MatchedEquationInstanceOp> equations);
 
   mlir::LogicalResult
@@ -149,20 +149,6 @@ mlir::LogicalResult VariablesPruningPass::processModelOp(ModelOp modelOp) {
   // Collect the used variables.
   llvm::DenseSet<VariableOp> usedVariables;
 
-  /*
-  if (mlir::failed(collectUsedVariables(usedVariables, symbolTableCollection,
-                                        modelOp, outputVariables,
-                                        initialEquations))) {
-    return mlir::failure();
-  }
-
-  if (mlir::failed(collectUsedVariables(usedVariables, symbolTableCollection,
-                                        modelOp, outputVariables,
-                                        dynamicEquations))) {
-    return mlir::failure();
-  }
-  */
-
   if (mlir::failed(collectUsedVariables(usedVariables, symbolTableCollection,
                                         modelOp, outputVariables,
                                         allEquations))) {
@@ -245,7 +231,7 @@ void walkDerivativeVariables(
 mlir::LogicalResult VariablesPruningPass::collectUsedVariables(
     llvm::DenseSet<VariableOp> &usedVariables,
     mlir::SymbolTableCollection &symbolTableCollection, ModelOp modelOp,
-    const llvm::DenseSet<VariableOp>& outputVariables,
+    const llvm::DenseSet<VariableOp> &outputVariables,
     llvm::ArrayRef<MatchedEquationInstanceOp> equations) {
   // Create the dependency graph.
   using DependencyGraph = marco::modeling::ArrayEquationsDependencyGraph<
@@ -351,7 +337,7 @@ mlir::LogicalResult VariablesPruningPass::collectUsedVariables(
     auto writingEquations =
         graph.getWritesMap().equal_range(variablesMap[variableName]);
 
-    for (const auto& writeInfo : llvm::make_range(writingEquations)) {
+    for (const auto &writeInfo : llvm::make_range(writingEquations)) {
       baseGraph->addEdge(baseGraph->getEntryNode(),
                          writeInfo.second.getEquation());
     }