Restruct P4Tools to easily add new modules.

p4lang · Nov 10, 2022 · 0974b37 · 0974b37
1 parent c59597f
commit 0974b37
Show file tree

Hide file tree

Showing 223 changed files with 686 additions and 1,003 deletions.
diff --git a/backends/p4tools/CMakeLists.txt b/backends/p4tools/CMakeLists.txt
@@ -80,8 +80,23 @@ set(ENABLE_TESTING ON)
 
 # Include sub projects.
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/testgen)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/p4check)
+
+file(GLOB tools_modules RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/modules ${CMAKE_CURRENT_SOURCE_DIR}/modules/*)
+foreach(ext ${tools_modules})
+  set (tools_dir  ${CMAKE_CURRENT_SOURCE_DIR}/modules/${ext})
+  if(EXISTS ${tools_dir}/CMakeLists.txt AND IS_DIRECTORY ${tools_dir})
+    # Generate an option that makes it possible to disable this extension.
+    string(MAKE_C_IDENTIFIER ${ext} EXT_AS_IDENTIFIER)
+    string(TOUPPER ${EXT_AS_IDENTIFIER} EXT_AS_OPTION_NAME)
+    string(CONCAT ENABLE_EXT_OPTION "ENABLE_TOOLS_MODULE_" ${EXT_AS_OPTION_NAME})
+    string(CONCAT EXT_HELP_TEXT "Build the " ${ext} " module")
+    option(${ENABLE_EXT_OPTION} ${EXT_HELP_TEXT} ON)
+    if(${ENABLE_EXT_OPTION})
+      message("-- Enabling P4Tools module ${ext}")
+      add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/modules/${ext})
+    endif()
+  endif()
+endforeach(ext)
 
 # Custom IR constructs for P4Tools.
 set(IR_DEF_FILES ${IR_DEF_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/common/testgen.def PARENT_SCOPE)
diff --git a/backends/p4tools/cmake/common.cmake b/backends/p4tools/cmake/common.cmake
@@ -34,17 +34,3 @@ function(add_p4tools_library target)
     PUBLIC "${CMAKE_BINARY_DIR}"
   )
 endfunction(add_p4tools_library)
-
-# Helper for adding a subproject and configuring it for linting.
-function(add_and_lint_subdirectory dir cpplint_dir)
-  add_subdirectory(${dir})
-  get_filename_component(basedir ${dir} NAME_WE)
-  add_test(
-    NAME "testgen-cpplint-${basedir}"
-    COMMAND sh -c "find '${dir}' \
-        -iname \\*.h -o -iname \\*.hpp -o -iname \\*.c -o -iname \\*.cpp \
-      | xargs python3 ${cpplint_dir}/cpplint.py \
-          --quiet "
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-endfunction(add_and_lint_subdirectory)
diff --git a/backends/p4tools/testgen/CMakeLists.txt → ...ds/p4tools/modules/testgen/CMakeLists.txt b/backends/p4tools/testgen/CMakeLists.txt → ...ds/p4tools/modules/testgen/CMakeLists.txt
@@ -11,7 +11,6 @@ set(
   options.cpp
   testgen.cpp
 
-
   core/arch_spec.cpp
   core/externs.cpp
   core/program_info.cpp
@@ -70,9 +69,10 @@ set(
   inja
 )
 
-file(GLOB tools_targets RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/targets ${CMAKE_CURRENT_SOURCE_DIR}/targets/*)
-foreach(ext ${tools_targets})
-  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/targets/${ext}/CMakeLists.txt)
+file(GLOB testgen_targets RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/targets ${CMAKE_CURRENT_SOURCE_DIR}/targets/*)
+foreach(ext ${testgen_targets})
+  set(testgen_targets_dir ${CMAKE_CURRENT_SOURCE_DIR}/targets/${ext}/)
+  if(EXISTS ${testgen_targets_dir}/CMakeLists.txt AND IS_DIRECTORY ${testgen_targets_dir})
     # Generate an option that makes it possible to disable this extension.
     string(MAKE_C_IDENTIFIER ${ext} EXT_AS_IDENTIFIER)
     string(TOUPPER ${EXT_AS_IDENTIFIER} EXT_AS_OPTION_NAME)
@@ -82,9 +82,9 @@ foreach(ext ${tools_targets})
     if(${ENABLE_EXT_OPTION})
       message("-- Enabling target ${ext}")
       add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/targets/${ext})
-      set(include_statements "${include_statements}#include \"backends/p4tools/testgen/targets/${ext}/register.h\"\n")
-      set(compiler_targets "${compiler_targets}    ${ext}_registerCompilerTarget();\n")
-      set(testgen_targets "${testgen_targets}    ${ext}_registerTestgenTarget();\n")
+      set(include_statements_var "${include_statements_var}#include \"backends/p4tools/modules/testgen/targets/${ext}/register.h\"\n")
+      set(compiler_targets_var "${compiler_targets_var}    ${ext}_registerCompilerTarget();\n")
+      set(testgen_targets_var "${testgen_targets_var}    ${ext}_registerTestgenTarget();\n")
     endif()
   endif()
 endforeach(ext)
@@ -96,13 +96,29 @@ endforeach()
 # Fill the template
 configure_file(register.h.in register.h)
 
-add_p4tools_library(p4testgen ${TESTGEN_SOURCES})
+add_p4tools_library(testgen ${TESTGEN_SOURCES})
+
+target_link_libraries(
+  testgen
+  ${TESTGEN_LIBS}
+)
+
+add_p4tools_executable(p4testgen main.cpp)
 
 target_link_libraries(
   p4testgen
+  testgen
   ${TESTGEN_LIBS}
 )
 
+add_custom_target(
+  linkp4testgen
+  # Add some convenience links for invoking p4testgen.
+  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_BINARY_DIR}/p4testgen ${CMAKE_BINARY_DIR}/p4testgen
+)
+
+add_dependencies(p4testgen linkp4testgen)
+
 if(ENABLE_GTESTS)
   add_executable(testgen-gtest ${TESTGEN_GTEST_SOURCES})
   target_include_directories(
@@ -112,7 +128,7 @@ if(ENABLE_GTESTS)
   )
   target_link_libraries(
     testgen-gtest
-    PRIVATE p4testgen
+    PRIVATE testgen
     PRIVATE gtest
   )
 
@@ -139,5 +155,5 @@ if(ENABLE_GTESTS)
 endif()
 
 if(ENABLE_IWYU)
-  set_property(TARGET p4testgen PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${iwyu_path})
+  set_property(TARGET testgen PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${iwyu_path})
 endif()
diff --git a/backends/p4tools/testgen/README.md → backends/p4tools/modules/testgen/README.md b/backends/p4tools/testgen/README.md → backends/p4tools/modules/testgen/README.md
diff --git a/backends/p4tools/testgen/cmake/README.md → ...s/p4tools/modules/testgen/cmake/README.md b/backends/p4tools/testgen/cmake/README.md → ...s/p4tools/modules/testgen/cmake/README.md
diff --git a/...nds/p4tools/testgen/cmake/TestUtils.cmake → ...ols/modules/testgen/cmake/TestUtils.cmake b/...nds/p4tools/testgen/cmake/TestUtils.cmake → ...ols/modules/testgen/cmake/TestUtils.cmake
diff --git a/backends/p4tools/testgen/core/arch_spec.cpp → ...4tools/modules/testgen/core/arch_spec.cpp b/backends/p4tools/testgen/core/arch_spec.cpp → ...4tools/modules/testgen/core/arch_spec.cpp
@@ -1,4 +1,4 @@
-#include "backends/p4tools/testgen/core/arch_spec.h"
+#include "backends/p4tools/modules/testgen/core/arch_spec.h"
 
 #include "lib/exceptions.h"
 

diff --git a/backends/p4tools/testgen/core/arch_spec.h → .../p4tools/modules/testgen/core/arch_spec.h b/backends/p4tools/testgen/core/arch_spec.h → .../p4tools/modules/testgen/core/arch_spec.h
@@ -1,5 +1,5 @@
-#ifndef BACKENDS_P4TOOLS_TESTGEN_CORE_ARCH_SPEC_H_
-#define BACKENDS_P4TOOLS_TESTGEN_CORE_ARCH_SPEC_H_
+#ifndef BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_ARCH_SPEC_H_
+#define BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_ARCH_SPEC_H_
 
 #include <map>
 #include <vector>
@@ -61,4 +61,4 @@ class ArchSpec {
 
 }  // namespace P4Tools
 
-#endif /* BACKENDS_P4TOOLS_TESTGEN_CORE_ARCH_SPEC_H_ */
+#endif /* BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_ARCH_SPEC_H_ */
diff --git a/backends/p4tools/testgen/core/constants.h → .../p4tools/modules/testgen/core/constants.h b/backends/p4tools/testgen/core/constants.h → .../p4tools/modules/testgen/core/constants.h
@@ -1,5 +1,5 @@
-#ifndef BACKENDS_P4TOOLS_TESTGEN_CORE_CONSTANTS_H_
-#define BACKENDS_P4TOOLS_TESTGEN_CORE_CONSTANTS_H_
+#ifndef BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_CONSTANTS_H_
+#define BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_CONSTANTS_H_
 
 #include "ir/ir.h"
 
@@ -37,4 +37,4 @@ class P4Constants {
 
 }  // namespace P4Tools
 
-#endif /* BACKENDS_P4TOOLS_TESTGEN_CORE_CONSTANTS_H_ */
+#endif /* BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_CONSTANTS_H_ */
diff --git a/...oration_strategy/exploration_strategy.cpp → ...oration_strategy/exploration_strategy.cpp b/...oration_strategy/exploration_strategy.cpp → ...oration_strategy/exploration_strategy.cpp
@@ -1,4 +1,4 @@
-#include "backends/p4tools/testgen/core/exploration_strategy/exploration_strategy.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/exploration_strategy.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -21,10 +21,10 @@
 #include "lib/exceptions.h"
 #include "lib/log.h"
 
-#include "backends/p4tools/testgen/lib/continuation.h"
-#include "backends/p4tools/testgen/lib/exceptions.h"
-#include "backends/p4tools/testgen/lib/logging.h"
-#include "backends/p4tools/testgen/options.h"
+#include "backends/p4tools/modules/testgen/lib/continuation.h"
+#include "backends/p4tools/modules/testgen/lib/exceptions.h"
+#include "backends/p4tools/modules/testgen/lib/logging.h"
+#include "backends/p4tools/modules/testgen/options.h"
 
 namespace P4Tools {
 

diff --git a/...ploration_strategy/exploration_strategy.h → ...ploration_strategy/exploration_strategy.h b/...ploration_strategy/exploration_strategy.h → ...ploration_strategy/exploration_strategy.h
@@ -1,5 +1,5 @@
-#ifndef BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_EXPLORATION_STRATEGY_H_
-#define BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_EXPLORATION_STRATEGY_H_
+#ifndef BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_EXPLORATION_STRATEGY_H_
+#define BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_EXPLORATION_STRATEGY_H_
 
 #include <cstdint>
 #include <ctime>
@@ -19,10 +19,10 @@
 #include "backends/p4tools/common/lib/formulae.h"
 #include "gsl/gsl-lite.hpp"
 
-#include "backends/p4tools/testgen/core/program_info.h"
-#include "backends/p4tools/testgen/core/small_step/small_step.h"
-#include "backends/p4tools/testgen/lib/execution_state.h"
-#include "backends/p4tools/testgen/lib/final_state.h"
+#include "backends/p4tools/modules/testgen/core/program_info.h"
+#include "backends/p4tools/modules/testgen/core/small_step/small_step.h"
+#include "backends/p4tools/modules/testgen/lib/execution_state.h"
+#include "backends/p4tools/modules/testgen/lib/final_state.h"
 
 namespace P4Tools {
 
@@ -102,4 +102,4 @@ class ExplorationStrategy {
 
 }  // namespace P4Tools
 
-#endif /* BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_EXPLORATION_STRATEGY_H_ */
+#endif /* BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_EXPLORATION_STRATEGY_H_ */
diff --git a/...rategy/incremental_max_coverage_stack.cpp → ...rategy/incremental_max_coverage_stack.cpp b/...rategy/incremental_max_coverage_stack.cpp → ...rategy/incremental_max_coverage_stack.cpp
@@ -1,4 +1,4 @@
-#include "backends/p4tools/testgen/core/exploration_strategy/incremental_max_coverage_stack.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/incremental_max_coverage_stack.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -22,10 +22,10 @@
 #include "lib/exceptions.h"
 #include "lib/log.h"
 
-#include "backends/p4tools/testgen/core/small_step/small_step.h"
-#include "backends/p4tools/testgen/lib/continuation.h"
-#include "backends/p4tools/testgen/lib/exceptions.h"
-#include "backends/p4tools/testgen/options.h"
+#include "backends/p4tools/modules/testgen/core/small_step/small_step.h"
+#include "backends/p4tools/modules/testgen/lib/continuation.h"
+#include "backends/p4tools/modules/testgen/lib/exceptions.h"
+#include "backends/p4tools/modules/testgen/options.h"
 
 namespace P4Tools {
 

diff --git a/...strategy/incremental_max_coverage_stack.h → ...strategy/incremental_max_coverage_stack.h b/...strategy/incremental_max_coverage_stack.h → ...strategy/incremental_max_coverage_stack.h
@@ -1,5 +1,5 @@
-#ifndef BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_MAX_COVERAGE_STACK_H_
-#define BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_MAX_COVERAGE_STACK_H_
+#ifndef BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_MAX_COVERAGE_STACK_H_
+#define BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_MAX_COVERAGE_STACK_H_
 
 #include <cstdint>
 #include <ctime>
@@ -21,11 +21,11 @@
 #include "gsl/gsl-lite.hpp"
 #include "ir/ir.h"
 
-#include "backends/p4tools/testgen/core/exploration_strategy/exploration_strategy.h"
-#include "backends/p4tools/testgen/core/program_info.h"
-#include "backends/p4tools/testgen/core/small_step/small_step.h"
-#include "backends/p4tools/testgen/lib/execution_state.h"
-#include "backends/p4tools/testgen/lib/final_state.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/exploration_strategy.h"
+#include "backends/p4tools/modules/testgen/core/program_info.h"
+#include "backends/p4tools/modules/testgen/core/small_step/small_step.h"
+#include "backends/p4tools/modules/testgen/lib/execution_state.h"
+#include "backends/p4tools/modules/testgen/lib/final_state.h"
 
 namespace P4Tools {
 
@@ -87,4 +87,5 @@ class IncrementalMaxCoverageStack : public ExplorationStrategy {
 
 }  // namespace P4Tools
 
-#endif /* BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_MAX_COVERAGE_STACK_H_ */
+#endif /* BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_MAX_COVERAGE_STACK_H_ \
+        */
diff --git a/...xploration_strategy/incremental_stack.cpp → ...xploration_strategy/incremental_stack.cpp b/...xploration_strategy/incremental_stack.cpp → ...xploration_strategy/incremental_stack.cpp
@@ -1,4 +1,4 @@
-#include "backends/p4tools/testgen/core/exploration_strategy/incremental_stack.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/incremental_stack.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -21,9 +21,9 @@
 #include "lib/exceptions.h"
 #include "lib/log.h"
 
-#include "backends/p4tools/testgen/lib/continuation.h"
-#include "backends/p4tools/testgen/lib/exceptions.h"
-#include "backends/p4tools/testgen/options.h"
+#include "backends/p4tools/modules/testgen/lib/continuation.h"
+#include "backends/p4tools/modules/testgen/lib/exceptions.h"
+#include "backends/p4tools/modules/testgen/options.h"
 
 namespace P4Tools {
 

diff --git a/.../exploration_strategy/incremental_stack.h → .../exploration_strategy/incremental_stack.h b/.../exploration_strategy/incremental_stack.h → .../exploration_strategy/incremental_stack.h
@@ -1,5 +1,5 @@
-#ifndef BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_STACK_H_
-#define BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_STACK_H_
+#ifndef BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_STACK_H_
+#define BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_STACK_H_
 
 #include <cstdint>
 #include <ctime>
@@ -20,10 +20,10 @@
 #include "gsl/gsl-lite.hpp"
 #include "ir/ir.h"
 
-#include "backends/p4tools/testgen/core/exploration_strategy/exploration_strategy.h"
-#include "backends/p4tools/testgen/core/program_info.h"
-#include "backends/p4tools/testgen/lib/execution_state.h"
-#include "backends/p4tools/testgen/lib/final_state.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/exploration_strategy.h"
+#include "backends/p4tools/modules/testgen/core/program_info.h"
+#include "backends/p4tools/modules/testgen/lib/execution_state.h"
+#include "backends/p4tools/modules/testgen/lib/final_state.h"
 
 namespace P4Tools {
 
@@ -94,4 +94,4 @@ class IncrementalStack : public ExplorationStrategy {
 
 }  // namespace P4Tools
 
-#endif /* BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_STACK_H_ */
+#endif /* BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_INCREMENTAL_STACK_H_ */
diff --git a/...ploration_strategy/linear_enumeration.cpp → ...ploration_strategy/linear_enumeration.cpp b/...ploration_strategy/linear_enumeration.cpp → ...ploration_strategy/linear_enumeration.cpp
@@ -1,4 +1,4 @@
-#include "backends/p4tools/testgen/core/exploration_strategy/linear_enumeration.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/linear_enumeration.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -21,10 +21,10 @@
 #include "lib/exceptions.h"
 #include "lib/log.h"
 
-#include "backends/p4tools/testgen/core/small_step/small_step.h"
-#include "backends/p4tools/testgen/lib/continuation.h"
-#include "backends/p4tools/testgen/lib/exceptions.h"
-#include "backends/p4tools/testgen/options.h"
+#include "backends/p4tools/modules/testgen/core/small_step/small_step.h"
+#include "backends/p4tools/modules/testgen/lib/continuation.h"
+#include "backends/p4tools/modules/testgen/lib/exceptions.h"
+#include "backends/p4tools/modules/testgen/options.h"
 
 namespace P4Tools {
 

diff --git a/...exploration_strategy/linear_enumeration.h → ...exploration_strategy/linear_enumeration.h b/...exploration_strategy/linear_enumeration.h → ...exploration_strategy/linear_enumeration.h
@@ -1,5 +1,5 @@
-#ifndef BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_LINEAR_ENUMERATION_H_
-#define BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_LINEAR_ENUMERATION_H_
+#ifndef BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_LINEAR_ENUMERATION_H_
+#define BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_LINEAR_ENUMERATION_H_
 
 #include <cstdint>
 #include <ctime>
@@ -20,11 +20,11 @@
 #include "gsl/gsl-lite.hpp"
 #include "ir/ir.h"
 
-#include "backends/p4tools/testgen/core/exploration_strategy/exploration_strategy.h"
-#include "backends/p4tools/testgen/core/program_info.h"
-#include "backends/p4tools/testgen/core/small_step/small_step.h"
-#include "backends/p4tools/testgen/lib/execution_state.h"
-#include "backends/p4tools/testgen/lib/final_state.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/exploration_strategy.h"
+#include "backends/p4tools/modules/testgen/core/program_info.h"
+#include "backends/p4tools/modules/testgen/core/small_step/small_step.h"
+#include "backends/p4tools/modules/testgen/lib/execution_state.h"
+#include "backends/p4tools/modules/testgen/lib/final_state.h"
 
 namespace P4Tools {
 
@@ -65,4 +65,4 @@ class LinearEnumeration : public ExplorationStrategy {
 
 }  // namespace P4Tools
 
-#endif /* BACKENDS_P4TOOLS_TESTGEN_CORE_EXPLORATION_STRATEGY_LINEAR_ENUMERATION_H_ */
+#endif /* BACKENDS_P4TOOLS_MODULES_TESTGEN_CORE_EXPLORATION_STRATEGY_LINEAR_ENUMERATION_H_ */
diff --git a/...n_strategy/random_access_max_coverage.cpp → ...n_strategy/random_access_max_coverage.cpp b/...n_strategy/random_access_max_coverage.cpp → ...n_strategy/random_access_max_coverage.cpp
@@ -1,4 +1,4 @@
-#include "backends/p4tools/testgen/core/exploration_strategy/random_access_max_coverage.h"
+#include "backends/p4tools/modules/testgen/core/exploration_strategy/random_access_max_coverage.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -22,10 +22,10 @@
 #include "lib/exceptions.h"
 #include "lib/log.h"
 
-#include "backends/p4tools/testgen/core/small_step/small_step.h"
-#include "backends/p4tools/testgen/lib/continuation.h"
-#include "backends/p4tools/testgen/lib/exceptions.h"
-#include "backends/p4tools/testgen/options.h"
+#include "backends/p4tools/modules/testgen/core/small_step/small_step.h"
+#include "backends/p4tools/modules/testgen/lib/continuation.h"
+#include "backends/p4tools/modules/testgen/lib/exceptions.h"
+#include "backends/p4tools/modules/testgen/options.h"
 
 namespace P4Tools {