Move the solver file from the lib folder to the ir folder. (p4lang#4188)

komaljai · Oct 10, 2023 · 9c921cf · 9c921cf
1 parent 06104e4
commit 9c921cf
Show file tree

Hide file tree

Showing 47 changed files with 49 additions and 49 deletions.
diff --git a/backends/p4tools/common/core/z3_solver.h b/backends/p4tools/common/core/z3_solver.h
@@ -11,10 +11,10 @@
 
 #include "ir/ir.h"
 #include "ir/json_generator.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/ordered_map.h"
 #include "lib/safe_vector.h"
-#include "lib/solver.h"
 
 namespace P4Tools {
 

diff --git a/backends/p4tools/common/lib/model.h b/backends/p4tools/common/lib/model.h
@@ -8,8 +8,8 @@
 #include <boost/container/flat_map.hpp>
 
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "ir/visitor.h"
-#include "lib/solver.h"
 
 namespace P4Tools {
 

diff --git a/backends/p4tools/modules/testgen/core/small_step/abstract_stepper.h b/backends/p4tools/modules/testgen/core/small_step/abstract_stepper.h
@@ -7,9 +7,9 @@
 
 #include "ir/ir.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
 #include "ir/visitor.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/small_step.h"

diff --git a/backends/p4tools/modules/testgen/core/small_step/cmd_stepper.cpp b/backends/p4tools/modules/testgen/core/small_step/cmd_stepper.cpp
@@ -20,12 +20,12 @@
 #include "ir/id.h"
 #include "ir/indexed_vector.h"
 #include "ir/irutils.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
 #include "lib/cstring.h"
 #include "lib/exceptions.h"
 #include "lib/log.h"
 #include "lib/null.h"
-#include "lib/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h b/backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h
@@ -6,8 +6,8 @@
 #include <vector>
 
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/abstract_stepper.h"

diff --git a/backends/p4tools/modules/testgen/core/small_step/expr_stepper.cpp b/backends/p4tools/modules/testgen/core/small_step/expr_stepper.cpp
@@ -14,10 +14,10 @@
 #include "ir/declaration.h"
 #include "ir/irutils.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "lib/exceptions.h"
 #include "lib/log.h"
 #include "lib/null.h"
-#include "lib/solver.h"
 #include "lib/source_file.h"
 #include "midend/coverage.h"
 #include "midend/saturationElim.h"

diff --git a/backends/p4tools/modules/testgen/core/small_step/expr_stepper.h b/backends/p4tools/modules/testgen/core/small_step/expr_stepper.h
@@ -6,9 +6,9 @@
 
 #include "ir/id.h"
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
 #include "lib/cstring.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/abstract_stepper.h"

diff --git a/backends/p4tools/modules/testgen/core/small_step/small_step.cpp b/backends/p4tools/modules/testgen/core/small_step/small_step.cpp
@@ -15,10 +15,10 @@
 #include "ir/ir.h"
 #include "ir/irutils.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "lib/error.h"
 #include "lib/exceptions.h"
 #include "lib/null.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

diff --git a/backends/p4tools/modules/testgen/core/small_step/small_step.h b/backends/p4tools/modules/testgen/core/small_step/small_step.h
@@ -9,7 +9,7 @@
 
 #include "backends/p4tools/common/compiler/reachability.h"
 #include "ir/node.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/depth_first.cpp b/backends/p4tools/modules/testgen/core/symbolic_executor/depth_first.cpp
@@ -4,8 +4,8 @@
 #include <iterator>
 #include <vector>
 
+#include "ir/solver.h"
 #include "lib/error.h"
-#include "lib/solver.h"
 #include "lib/timer.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/depth_first.h b/backends/p4tools/modules/testgen/core/symbolic_executor/depth_first.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/greedy_node_cov.cpp b/backends/p4tools/modules/testgen/core/symbolic_executor/greedy_node_cov.cpp
@@ -6,8 +6,8 @@
 #include <optional>
 #include <vector>
 
+#include "ir/solver.h"
 #include "lib/error.h"
-#include "lib/solver.h"
 #include "lib/timer.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/greedy_node_cov.h b/backends/p4tools/modules/testgen/core/symbolic_executor/greedy_node_cov.h
@@ -5,7 +5,7 @@
 #include <optional>
 #include <vector>
 
-#include "lib/solver.h"
+#include "ir/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/random_backtrack.cpp b/backends/p4tools/modules/testgen/core/symbolic_executor/random_backtrack.cpp
@@ -3,8 +3,8 @@
 #include <functional>
 #include <vector>
 
+#include "ir/solver.h"
 #include "lib/error.h"
-#include "lib/solver.h"
 #include "lib/timer.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/random_backtrack.h b/backends/p4tools/modules/testgen/core/symbolic_executor/random_backtrack.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/selected_branches.cpp b/backends/p4tools/modules/testgen/core/symbolic_executor/selected_branches.cpp
@@ -6,9 +6,9 @@
 #include <utility>
 #include <vector>
 
+#include "ir/solver.h"
 #include "lib/error.h"
 #include "lib/exceptions.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/selected_branches.h b/backends/p4tools/modules/testgen/core/symbolic_executor/selected_branches.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.cpp b/backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.cpp
@@ -9,8 +9,8 @@
 
 #include "backends/p4tools/common/lib/util.h"
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "lib/error.h"
-#include "lib/solver.h"
 #include "lib/timer.h"
 #include "midend/coverage.h"
 

diff --git a/backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h b/backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h
@@ -5,7 +5,7 @@
 #include <iosfwd>
 #include <vector>
 
-#include "lib/solver.h"
+#include "ir/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/core/target.h b/backends/p4tools/modules/testgen/core/target.h
@@ -10,8 +10,8 @@
 #include "backends/p4tools/common/core/target.h"
 #include "backends/p4tools/common/lib/arch_spec.h"
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

diff --git a/backends/p4tools/modules/testgen/lib/execution_state.h b/backends/p4tools/modules/testgen/lib/execution_state.h
@@ -20,9 +20,9 @@
 #include "ir/declaration.h"
 #include "ir/ir.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/exceptions.h"
-#include "lib/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/lib/continuation.h"

diff --git a/backends/p4tools/modules/testgen/lib/final_state.cpp b/backends/p4tools/modules/testgen/lib/final_state.cpp
@@ -14,9 +14,9 @@
 #include "frontends/p4/optimizeExpressions.h"
 #include "ir/ir.h"
 #include "ir/irutils.h"
+#include "ir/solver.h"
 #include "lib/error.h"
 #include "lib/null.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/lib/execution_state.h"
 #include "backends/p4tools/modules/testgen/lib/packet_vars.h"

diff --git a/backends/p4tools/modules/testgen/lib/final_state.h b/backends/p4tools/modules/testgen/lib/final_state.h
@@ -7,7 +7,7 @@
 
 #include "backends/p4tools/common/lib/model.h"
 #include "backends/p4tools/common/lib/trace_event.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 #include "midend/coverage.h"
 
 #include "backends/p4tools/modules/testgen/lib/concolic.h"

diff --git a/backends/p4tools/modules/testgen/targets/bmv2/cmd_stepper.cpp b/backends/p4tools/modules/testgen/targets/bmv2/cmd_stepper.cpp
@@ -14,11 +14,11 @@
 #include "ir/id.h"
 #include "ir/ir.h"
 #include "ir/irutils.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/error.h"
 #include "lib/exceptions.h"
 #include "lib/ordered_map.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

diff --git a/backends/p4tools/modules/testgen/targets/bmv2/cmd_stepper.h b/backends/p4tools/modules/testgen/targets/bmv2/cmd_stepper.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "ir/ir.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

diff --git a/backends/p4tools/modules/testgen/targets/bmv2/expr_stepper.cpp b/backends/p4tools/modules/testgen/targets/bmv2/expr_stepper.cpp
@@ -21,12 +21,12 @@
 #include "ir/ir-generated.h"
 #include "ir/irutils.h"
 #include "ir/node.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/error.h"
 #include "lib/exceptions.h"
 #include "lib/log.h"
 #include "lib/ordered_map.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/externs.h"
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/targets/bmv2/expr_stepper.h b/backends/p4tools/modules/testgen/targets/bmv2/expr_stepper.h
@@ -6,8 +6,8 @@
 
 #include "ir/id.h"
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/expr_stepper.h"

diff --git a/backends/p4tools/modules/testgen/targets/bmv2/target.cpp b/backends/p4tools/modules/testgen/targets/bmv2/target.cpp
@@ -5,10 +5,10 @@
 #include <vector>
 
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/exceptions.h"
 #include "lib/ordered_map.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/targets/bmv2/target.h b/backends/p4tools/modules/testgen/targets/bmv2/target.h
@@ -7,7 +7,7 @@
 
 #include "backends/p4tools/common/lib/arch_spec.h"
 #include "ir/ir.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/targets/ebpf/cmd_stepper.cpp b/backends/p4tools/modules/testgen/targets/ebpf/cmd_stepper.cpp
@@ -13,9 +13,9 @@
 #include "ir/id.h"
 #include "ir/ir.h"
 #include "ir/irutils.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/ordered_map.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

diff --git a/backends/p4tools/modules/testgen/targets/ebpf/cmd_stepper.h b/backends/p4tools/modules/testgen/targets/ebpf/cmd_stepper.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "ir/ir.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

diff --git a/backends/p4tools/modules/testgen/targets/ebpf/expr_stepper.cpp b/backends/p4tools/modules/testgen/targets/ebpf/expr_stepper.cpp
@@ -8,10 +8,10 @@
 #include "backends/p4tools/common/lib/taint.h"
 #include "backends/p4tools/common/lib/variables.h"
 #include "ir/irutils.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/error.h"
 #include "lib/log.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/externs.h"
 #include "backends/p4tools/modules/testgen/core/program_info.h"

diff --git a/backends/p4tools/modules/testgen/targets/ebpf/expr_stepper.h b/backends/p4tools/modules/testgen/targets/ebpf/expr_stepper.h
@@ -5,8 +5,8 @@
 
 #include "ir/id.h"
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "ir/vector.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/expr_stepper.h"

diff --git a/backends/p4tools/modules/testgen/targets/ebpf/target.cpp b/backends/p4tools/modules/testgen/targets/ebpf/target.cpp
@@ -5,11 +5,11 @@
 #include <vector>
 
 #include "ir/ir.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/error.h"
 #include "lib/exceptions.h"
 #include "lib/ordered_map.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/targets/ebpf/target.h b/backends/p4tools/modules/testgen/targets/ebpf/target.h
@@ -7,7 +7,7 @@
 
 #include "backends/p4tools/common/lib/arch_spec.h"
 #include "ir/ir.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/symbolic_executor/symbolic_executor.h"

diff --git a/backends/p4tools/modules/testgen/targets/pna/dpdk/cmd_stepper.cpp b/backends/p4tools/modules/testgen/targets/pna/dpdk/cmd_stepper.cpp
@@ -10,9 +10,9 @@
 #include "backends/p4tools/common/lib/arch_spec.h"
 #include "ir/ir.h"
 #include "ir/irutils.h"
+#include "ir/solver.h"
 #include "lib/cstring.h"
 #include "lib/ordered_map.h"
-#include "lib/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/core/small_step/cmd_stepper.h"

diff --git a/backends/p4tools/modules/testgen/targets/pna/dpdk/cmd_stepper.h b/backends/p4tools/modules/testgen/targets/pna/dpdk/cmd_stepper.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "ir/ir.h"
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/program_info.h"
 #include "backends/p4tools/modules/testgen/lib/continuation.h"

diff --git a/backends/p4tools/modules/testgen/targets/pna/dpdk/expr_stepper.cpp b/backends/p4tools/modules/testgen/targets/pna/dpdk/expr_stepper.cpp
@@ -1,6 +1,6 @@
 #include "backends/p4tools/modules/testgen/targets/pna/dpdk/expr_stepper.h"
 
-#include "lib/solver.h"
+#include "ir/solver.h"
 
 #include "backends/p4tools/modules/testgen/core/externs.h"
 #include "backends/p4tools/modules/testgen/core/program_info.h"