fixed multiple DANA runs with different configs

emsec · Apr 29, 2024 · 8041b76 · 8041b76
1 parent 5f59f81
commit 8041b76
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/plugins/dataflow_analysis/include/dataflow_analysis/processing/pass_collection.h b/plugins/dataflow_analysis/include/dataflow_analysis/processing/pass_collection.h
@@ -54,8 +54,9 @@ namespace hal
             namespace pass_collection
             {
                 std::vector<PassConfiguration> get_passes(const Configuration& config, const std::vector<std::vector<pass_id>>& previous_passes);
+                void clear();
             }    // namespace pass_collection
 
-        }        // namespace processing
-    }            // namespace dataflow
+        }    // namespace processing
+    }    // namespace dataflow
 }    // namespace hal
diff --git a/plugins/dataflow_analysis/include/dataflow_analysis/processing/processing.h b/plugins/dataflow_analysis/include/dataflow_analysis/processing/processing.h
@@ -1,20 +1,20 @@
 // MIT License
-// 
+//
 // Copyright (c) 2019 Ruhr University Bochum, Chair for Embedded Security. All Rights reserved.
 // Copyright (c) 2019 Marc Fyrbiak, Sebastian Wallat, Max Hoffmann ("ORIGINAL AUTHORS"). All rights reserved.
 // Copyright (c) 2021 Max Planck Institute for Security and Privacy. All Rights reserved.
 // Copyright (c) 2021 Jörn Langheinrich, Julian Speith, Nils Albartus, René Walendy, Simon Klix ("ORIGINAL AUTHORS"). All Rights reserved.
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,6 +37,7 @@ namespace hal
         namespace processing
         {
             processing::Result run(const processing::Configuration& config, const std::shared_ptr<Grouping>& initial_grouping);
+            void clear();
         }    // namespace processing
-    }        // namespace dataflow
+    }    // namespace dataflow
 }    // namespace hal
diff --git a/plugins/dataflow_analysis/src/api/dataflow.cpp b/plugins/dataflow_analysis/src/api/dataflow.cpp
@@ -49,7 +49,7 @@ namespace hal
 
             std::shared_ptr<dataflow::Grouping> initial_grouping = nullptr;
             auto netlist_abstr                                   = dataflow::pre_processing::run(config, initial_grouping);
-            std::shared_ptr<dataflow::Grouping> final_grouping;
+            std::shared_ptr<dataflow::Grouping> final_grouping   = nullptr;
 
             u32 iteration = 0;
             while (true)
@@ -73,6 +73,8 @@ namespace hal
                 iteration++;
             }
 
+            dataflow::processing::clear();
+
             total_time = (double)std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - begin_time).count() / 1000;
 
             log_info("dataflow", "dataflow processing finished in {:3.2f}s", total_time);

diff --git a/plugins/dataflow_analysis/src/processing/pass_collection.cpp b/plugins/dataflow_analysis/src/processing/pass_collection.cpp
@@ -32,7 +32,7 @@ namespace hal
                     std::vector<PassConfiguration> m_all_passes;
                     std::vector<PassConfiguration> m_intermediate_passes;
                     std::unordered_map<pass_id, std::unordered_set<pass_id>> m_useless_follow_ups;
-                    bool m_initialized;
+                    bool m_initialized = false;
 
                     PassConfiguration group_by_ctrl_sigs;
 
@@ -129,7 +129,12 @@ namespace hal
                     return passes;
                 }
 
+                void clear()
+                {
+                    m_initialized = false;
+                }
+
             }    // namespace pass_collection
-        }        // namespace processing
-    }            // namespace dataflow
+        }    // namespace processing
+    }    // namespace dataflow
 }    // namespace hal
diff --git a/plugins/dataflow_analysis/src/processing/processing.cpp b/plugins/dataflow_analysis/src/processing/processing.cpp
@@ -115,7 +115,8 @@ namespace hal
                     }
                 }
 
-                std::vector<std::pair<std::shared_ptr<Grouping>, PassConfiguration>> generate_pass_combinations(Context& ctx, const Configuration& config, const std::shared_ptr<Grouping>& initial_grouping)
+                std::vector<std::pair<std::shared_ptr<Grouping>, PassConfiguration>>
+                    generate_pass_combinations(Context& ctx, const Configuration& config, const std::shared_ptr<Grouping>& initial_grouping)
                 {
                     // create current layer of pass combinations;
                     std::vector<std::pair<std::shared_ptr<Grouping>, PassConfiguration>> output;
@@ -258,10 +259,15 @@ namespace hal
                     }
                     log_info("dataflow", "  total: {} unique states", ctx.result.unique_groupings.size());
                 }
-                
+
                 return ctx.result;
             }
 
+            void clear()
+            {
+                pass_collection::clear();
+            }
+
         }    // namespace processing
-    }        // namespace dataflow
+    }    // namespace dataflow
 }    // namespace hal