Start to clean up Tofino specs.

Signed-off-by: fruffy <[email protected]>
p4lang · Dec 15, 2024 · c2a9d68 · c2a9d68
1 parent b0f775c
commit c2a9d68
Show file tree

Hide file tree

Showing 196 changed files with 1,860 additions and 2,741 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -404,6 +404,8 @@ add_subdirectory (ir)
 
 # add extensions - before the frontends as they produce IR and extra frontend sources
 set(EXTENSION_IR_SOURCES)
+# extra libraries that need to be linked with the generated IR.
+set(EXTENSION_IR_LIBS)
 # extra sources that need to be linked directly into p4test so that
 # extensions can provide specific conversions (e.g., for externs)
 set(EXTENSION_P4_14_CONV_SOURCES)
@@ -534,7 +536,7 @@ add_custom_target(genIR DEPENDS ${IR_GENERATED_SRCS})
 set_source_files_properties(${IR_GENERATOR} PROPERTIES GENERATED TRUE)
 add_library(ir-generated OBJECT ${IR_GENERATED_SRCS} ${EXTENSION_IR_SOURCES})
 add_dependencies(ir-generated ir genIR)
-target_link_libraries(ir-generated PUBLIC ir ${P4C_LIB_DEPS})
+target_link_libraries(ir-generated PUBLIC ir ${P4C_LIB_DEPS} ${EXTENSION_IR_LIBS})
 
 
 ######################################## IR Generation End ########################################

diff --git a/backends/tofino/CMakeLists.txt b/backends/tofino/CMakeLists.txt
@@ -218,7 +218,6 @@ set (BF_P4C_IR_SRCS
   bf-p4c/ir/control_flow_visitor.cpp
   bf-p4c/ir/ir_enums.cpp
   bf-p4c/ir/gateway_control_flow.cpp
-  bf-p4c/ir/gress.cpp
   bf-p4c/ir/mau.cpp
   bf-p4c/ir/thread_visitor.cpp
   bf-p4c/ir/tofino.cpp
@@ -238,5 +237,6 @@ foreach(src IN LISTS BF_P4C_IR_SRCS)
   set(QUAL_BF_P4C_IR_SRCS ${QUAL_BF_P4C_IR_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/${src})
 endforeach()
 set(EXTENSION_IR_SOURCES ${EXTENSION_IR_SOURCES} ${QUAL_BF_P4C_IR_SRCS} PARENT_SCOPE)
+set(EXTENSION_IR_LIBS ${EXTENSION_IR_LIBS} tofinospecs PARENT_SCOPE)
 
 add_subdirectory(bf-p4c)
diff --git a/backends/tofino/bf-p4c/CMakeLists.txt b/backends/tofino/bf-p4c/CMakeLists.txt
@@ -12,7 +12,7 @@
 # specific language governing permissions and limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
-# # # #### Barefoot back-end
+# # ##### Barefoot back-end
 
 MESSAGE("-- Adding p4c-barefoot")
 
@@ -90,6 +90,19 @@ set (P4C_LIB_DEPS ${P4C_LIB_DEPS} PARENT_SCOPE)
 
 add_subdirectory(logging)
 
+set (BF_P4C_SPEC_SRCS
+  specs/arch_spec.cpp
+  specs/device.cpp
+  specs/gress.cpp
+  specs/mau_spec.cpp
+  specs/match_register_spec.cpp
+  specs/phv.cpp
+  specs/phv_spec.cpp
+)
+
+add_library(tofinospecs STATIC ${BF_P4C_SPEC_SRCS})
+target_link_libraries(tofinospecs PUBLIC p4ctoolkit)
+
 set (BF_P4C_MIDEND_SRCS
   midend/annotate_with_in_hash.cpp
   midend/check_design_pattern.cpp
@@ -214,7 +227,6 @@ set (BF_P4C_BACKEND_MAU_SRCS
   mau/jbay_next_table.cpp
   mau/mau_alloc.cpp
   mau/mau_power.cpp
-  mau/mau_spec.cpp
   mau/memories.cpp
   mau/payload_gateway.cpp
   mau/reduction_or.cpp
@@ -242,7 +254,6 @@ set (BF_P4C_BACKEND_MAU_TOFINO_SRCS
   mau/tofino/action_data_bus.cpp
   mau/tofino/asm_output.cpp
   mau/tofino/input_xbar.cpp
-  mau/tofino/mau_spec.cpp
   mau/tofino/memories.cpp
   )
 
@@ -325,7 +336,6 @@ set (BF_P4C_BACKEND_PHV_SRCS
   phv/phv_analysis.cpp
   phv/phv_fields.cpp
   phv/phv_parde_mau_use.cpp
-  phv/phv_spec.cpp
   phv/split_padding.cpp
   phv/table_phv_constraints.cpp
   phv/validate_allocation.cpp
@@ -391,7 +401,6 @@ set (BF_P4C_BACKEND_PHV_SRCS
 
 set (BF_P4C_BACKEND_ARCH_SRCS
   arch/arch.cpp
-  arch/arch_spec.cpp
   arch/add_t2na_meta.cpp
   arch/intrinsic_metadata.cpp
   arch/bridge_metadata.cpp
@@ -443,7 +452,6 @@ set (BF_P4C_BACKEND_MAIN_SRCS
   asm.cpp
   backend.cpp
   bf-p4c-options.cpp
-  device.cpp
   midend.cpp
   )
 
@@ -806,7 +814,7 @@ endif()
 install (FILES ${P4C_BINARY_DIR}/p4c_src/main.py
   DESTINATION ${P4C_ARTIFACTS_OUTPUT_DIRECTORY}/p4c_src)
 
-# # # ############# Proto
+# # ############## Proto
 set (BFN_P4RUNTIME_DIR ${CMAKE_CURRENT_SOURCE_DIR}/control-plane/proto)
 set (BFN_P4RUNTIME_INFO_PROTO ${BFN_P4RUNTIME_DIR}/barefoot/p4info.proto)
 set (BFN_P4RUNTIME_INFO_GEN_SRCS ${P4C_BINARY_DIR}/control-plane/barefoot/p4info.pb.cc)
@@ -840,7 +848,7 @@ target_link_libraries(bfn_p4runtime PUBLIC controlplane-gen PRIVATE absl::prefet
 set_source_files_properties(${BFN_P4RUNTIME_INFO_GEN_SRCS} PROPERTIES GENERATED TRUE)
 add_dependencies(bfn_p4runtime barefootdir controlplane)
 
-# # # ############# Testing
+# # ############## Testing
 
 if (ENABLE_GTESTS)
   # # Tofino-specific GTests.

diff --git a/backends/tofino/bf-p4c/arch/arch.cpp b/backends/tofino/bf-p4c/arch/arch.cpp
@@ -26,7 +26,7 @@
 #include "backends/tofino/bf-p4c/arch/v1model.h"
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
 #include "backends/tofino/bf-p4c/common/pragma/collect_global_pragma.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/p4/methodInstance.h"
 #include "ir/declaration.h"
 #include "ir/id.h"

diff --git a/backends/tofino/bf-p4c/arch/arch.h b/backends/tofino/bf-p4c/arch/arch.h
@@ -30,9 +30,9 @@
 
 #include "backends/tofino/bf-p4c/arch/program_structure.h"
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
-#include "backends/tofino/bf-p4c/ir/gress.h"
 #include "backends/tofino/bf-p4c/lib/assoc.h"
 #include "backends/tofino/bf-p4c/midend/type_checker.h"
+#include "backends/tofino/bf-p4c/specs/gress.h"
 #include "frontends/common/options.h"
 #include "frontends/common/resolveReferences/referenceMap.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"

diff --git a/backends/tofino/bf-p4c/arch/bridge_metadata.h b/backends/tofino/bf-p4c/arch/bridge_metadata.h
@@ -20,8 +20,8 @@
 #define BF_P4C_ARCH_BRIDGE_METADATA_H_
 
 #include "backends/tofino/bf-p4c/arch/program_structure.h"
-#include "backends/tofino/bf-p4c/ir/gress.h"
 #include "backends/tofino/bf-p4c/midend/path_linearizer.h"
+#include "backends/tofino/bf-p4c/specs/gress.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"
 #include "frontends/p4/evaluator/evaluator.h"
 #include "ir/ir.h"

diff --git a/backends/tofino/bf-p4c/arch/check_extern_invocation.cpp b/backends/tofino/bf-p4c/arch/check_extern_invocation.cpp
@@ -18,7 +18,7 @@
 
 #include "check_extern_invocation.h"
 
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "lib/bitvec.h"
 
 namespace BFN {

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/mirror.cpp b/backends/tofino/bf-p4c/arch/fromv1.0/mirror.cpp
@@ -21,8 +21,8 @@
 #include "backends/tofino/bf-p4c/arch/bridge_metadata.h"
 #include "backends/tofino/bf-p4c/arch/intrinsic_metadata.h"
 #include "backends/tofino/bf-p4c/common/ir_utils.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/lib/pad_alignment.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/p4-14/fromv1.0/v1model.h"
 #include "frontends/p4/cloner.h"
 #include "frontends/p4/coreLibrary.h"

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/parser_counter.cpp b/backends/tofino/bf-p4c/arch/fromv1.0/parser_counter.cpp
@@ -21,7 +21,7 @@
 #include <boost/range/adaptor/reversed.hpp>
 
 #include "backends/tofino/bf-p4c/common/utils.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "ir/ir.h"
 
 namespace BFN {

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/phase0.cpp b/backends/tofino/bf-p4c/arch/fromv1.0/phase0.cpp
@@ -24,12 +24,12 @@
 #include "backends/tofino/bf-p4c/arch/fromv1.0/programStructure.h"
 #include "backends/tofino/bf-p4c/arch/tna.h"
 #include "backends/tofino/bf-p4c/common/asm_output.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/lib/pad_alignment.h"
 #include "backends/tofino/bf-p4c/midend/path_linearizer.h"
 #include "backends/tofino/bf-p4c/midend/type_categories.h"
 #include "backends/tofino/bf-p4c/midend/type_checker.h"
 #include "backends/tofino/bf-p4c/parde/field_packing.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/common/resolveReferences/referenceMap.h"
 #include "frontends/p4-14/fromv1.0/v1model.h"
 #include "frontends/p4/cloner.h"

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/primitives.cpp b/backends/tofino/bf-p4c/arch/fromv1.0/primitives.cpp
@@ -20,7 +20,7 @@
 
 #include "backends/tofino/bf-p4c/arch/fromv1.0/programStructure.h"
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/p4-14/fromv1.0/converters.h"
 
 namespace P4 {

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/programStructure.cpp b/backends/tofino/bf-p4c/arch/fromv1.0/programStructure.cpp
@@ -23,7 +23,7 @@
 #include "backends/tofino/bf-p4c/arch/fromv1.0/phase0.h"
 #include "backends/tofino/bf-p4c/arch/intrinsic_metadata.h"
 #include "backends/tofino/bf-p4c/common/pragma/all_pragmas.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/p4-14/fromv1.0/converters.h"
 #include "frontends/p4-14/header_type.h"
 #include "frontends/p4-14/typecheck.h"

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/resubmit.cpp b/backends/tofino/bf-p4c/arch/fromv1.0/resubmit.cpp
@@ -19,8 +19,8 @@
 #include "resubmit.h"
 
 #include "backends/tofino/bf-p4c/arch/intrinsic_metadata.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/parde/parde_visitor.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/p4-14/fromv1.0/v1model.h"
 #include "frontends/p4/cloner.h"
 #include "frontends/p4/coreLibrary.h"

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/v1_converters.cpp b/backends/tofino/bf-p4c/arch/fromv1.0/v1_converters.cpp
@@ -22,7 +22,7 @@
 
 #include "backends/tofino/bf-p4c/arch/bridge_metadata.h"
 #include "backends/tofino/bf-p4c/common/utils.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "lib/map.h"
 #include "lib/ordered_map.h"
 #include "v1_program_structure.h"

diff --git a/backends/tofino/bf-p4c/arch/fromv1.0/v1_program_structure.h b/backends/tofino/bf-p4c/arch/fromv1.0/v1_program_structure.h
@@ -20,7 +20,7 @@
 #define BACKENDS_TOFINO_BF_P4C_ARCH_FROMV1_0_V1_PROGRAM_STRUCTURE_H_
 
 #include "backends/tofino/bf-p4c/arch/program_structure.h"
-#include "backends/tofino/bf-p4c/ir/gress.h"
+#include "backends/tofino/bf-p4c/specs/gress.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"
 #include "frontends/p4/evaluator/evaluator.h"
 #include "ir/ir.h"

diff --git a/backends/tofino/bf-p4c/arch/intrinsic_metadata.h b/backends/tofino/bf-p4c/arch/intrinsic_metadata.h
@@ -20,8 +20,8 @@
 #define BF_P4C_ARCH_INTRINSIC_METADATA_H_
 
 #include "backends/tofino/bf-p4c/arch/bridge_metadata.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/midend/type_checker.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/p4/cloner.h"
 #include "frontends/p4/typeChecking/typeChecker.h"
 #include "ir/ir.h"

diff --git a/backends/tofino/bf-p4c/arch/program_structure.h b/backends/tofino/bf-p4c/arch/program_structure.h
@@ -19,7 +19,7 @@
 #ifndef BACKENDS_TOFINO_BF_P4C_ARCH_PROGRAM_STRUCTURE_H_
 #define BACKENDS_TOFINO_BF_P4C_ARCH_PROGRAM_STRUCTURE_H_
 
-#include "backends/tofino/bf-p4c/ir/gress.h"
+#include "backends/tofino/bf-p4c/specs/gress.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"
 #include "frontends/p4/evaluator/evaluator.h"
 #include "ir/ir.h"

diff --git a/backends/tofino/bf-p4c/arch/psa/programStructure.h b/backends/tofino/bf-p4c/arch/psa/programStructure.h
@@ -21,9 +21,9 @@
 
 #include "backends/tofino/bf-p4c/arch/program_structure.h"
 #include "backends/tofino/bf-p4c/arch/psa/psa_model.h"
-#include "backends/tofino/bf-p4c/ir/gress.h"
 #include "backends/tofino/bf-p4c/midend/path_linearizer.h"
 #include "backends/tofino/bf-p4c/midend/type_categories.h"
+#include "backends/tofino/bf-p4c/specs/gress.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"
 #include "frontends/p4/evaluator/evaluator.h"
 #include "ir/ir.h"

diff --git a/backends/tofino/bf-p4c/arch/psa/psa.cpp b/backends/tofino/bf-p4c/arch/psa/psa.cpp
@@ -25,8 +25,8 @@
 #include "backends/tofino/bf-p4c/arch/fromv1.0/add_metadata_parser_states.h"
 #include "backends/tofino/bf-p4c/arch/intrinsic_metadata.h"
 #include "backends/tofino/bf-p4c/arch/rewrite_action_selector.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/midend/type_checker.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "ir/ir.h"
 #include "lib/bitops.h"
 #include "midend/convertEnums.h"

diff --git a/backends/tofino/bf-p4c/arch/psa/psa.h b/backends/tofino/bf-p4c/arch/psa/psa.h
@@ -30,7 +30,7 @@
 
 #include "backends/tofino/bf-p4c/arch/arch.h"
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
-#include "backends/tofino/bf-p4c/ir/gress.h"
+#include "backends/tofino/bf-p4c/specs/gress.h"
 #include "frontends/common/options.h"
 #include "frontends/p4/cloner.h"
 #include "frontends/p4/coreLibrary.h"

diff --git a/backends/tofino/bf-p4c/arch/tna.cpp b/backends/tofino/bf-p4c/arch/tna.cpp
@@ -23,9 +23,9 @@
 #include "backends/tofino/bf-p4c/arch/fromv1.0/phase0.h"
 #include "backends/tofino/bf-p4c/arch/rewrite_action_selector.h"
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/midend/type_checker.h"
 #include "backends/tofino/bf-p4c/parde/field_packing.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"
 #include "frontends/p4/cloner.h"
 #include "frontends/p4/evaluator/evaluator.h"

diff --git a/backends/tofino/bf-p4c/arch/tna/primitives.cpp b/backends/tofino/bf-p4c/arch/tna/primitives.cpp
@@ -21,7 +21,7 @@
 #include "backends/tofino/bf-p4c/arch/fromv1.0/programStructure.h"
 #include "backends/tofino/bf-p4c/arch/intrinsic_metadata.h"
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/p4-14/fromv1.0/converters.h"
 
 // Converters for converting from P4-14 to TNA For a full list of supported

diff --git a/backends/tofino/bf-p4c/arch/v1model.cpp b/backends/tofino/bf-p4c/arch/v1model.cpp
@@ -27,9 +27,9 @@
 #include "backends/tofino/bf-p4c/arch/fromv1.0/checksum.h"
 #include "backends/tofino/bf-p4c/arch/fromv1.0/parser_counter.h"
 #include "backends/tofino/bf-p4c/arch/program_structure.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/midend.h"
 #include "backends/tofino/bf-p4c/midend/type_checker.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"
 #include "ir/annotations.h"
 #include "lib/bitops.h"

diff --git a/backends/tofino/bf-p4c/arch/v1model.h b/backends/tofino/bf-p4c/arch/v1model.h
@@ -32,7 +32,7 @@
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
 #include "backends/tofino/bf-p4c/common/pragma/all_pragmas.h"
 #include "backends/tofino/bf-p4c/common/pragma/collect_global_pragma.h"
-#include "backends/tofino/bf-p4c/ir/gress.h"
+#include "backends/tofino/bf-p4c/specs/gress.h"
 #include "frontends/common/options.h"
 #include "frontends/p4/cloner.h"
 #include "frontends/p4/coreLibrary.h"

diff --git a/backends/tofino/bf-p4c/asm.cpp b/backends/tofino/bf-p4c/asm.cpp
@@ -29,7 +29,7 @@
 
 // #include "bf-asm/version.h"
 #include "backends/tofino/bf-p4c/common/run_id.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 
 namespace BFN {
 

diff --git a/backends/tofino/bf-p4c/backend.cpp b/backends/tofino/bf-p4c/backend.cpp
@@ -79,7 +79,6 @@
 #include "backends/tofino/bf-p4c/common/multiple_apply.h"
 #include "backends/tofino/bf-p4c/common/size_of.h"
 #include "backends/tofino/bf-p4c/common/utils.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/logging/filelog.h"
 #include "backends/tofino/bf-p4c/logging/phv_logging.h"
 #include "backends/tofino/bf-p4c/mau/adjust_byte_count.h"
@@ -128,6 +127,7 @@
 #include "backends/tofino/bf-p4c/phv/split_padding.h"
 #include "backends/tofino/bf-p4c/phv/utils/slice_alloc.h"
 #include "backends/tofino/bf-p4c/phv/v2/metadata_initialization.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "ir/pass_manager.h"
 #include "lib/indent.h"
 

diff --git a/backends/tofino/bf-p4c/common/bridged_packing.h b/backends/tofino/bf-p4c/common/bridged_packing.h
@@ -33,8 +33,8 @@
 #include "backends/tofino/bf-p4c/midend/type_checker.h"
 #include "backends/tofino/bf-p4c/phv/action_phv_constraints.h"
 #include "backends/tofino/bf-p4c/phv/constraints/constraints.h"
-#include "backends/tofino/bf-p4c/phv/phv.h"
 #include "backends/tofino/bf-p4c/phv/phv_fields.h"
+#include "backends/tofino/bf-p4c/specs/phv.h"
 #include "frontends/common/resolveReferences/referenceMap.h"
 #include "frontends/common/resolveReferences/resolveReferences.h"
 #include "frontends/p4/methodInstance.h"

diff --git a/backends/tofino/bf-p4c/common/extract_maupipe.h b/backends/tofino/bf-p4c/common/extract_maupipe.h
@@ -24,11 +24,11 @@
 #include "backends/tofino/bf-p4c/arch/arch.h"
 #include "backends/tofino/bf-p4c/arch/fromv1.0/mirror.h"
 #include "backends/tofino/bf-p4c/arch/fromv1.0/resubmit.h"
-#include "backends/tofino/bf-p4c/device.h"
 #include "backends/tofino/bf-p4c/lib/assoc.h"
 #include "backends/tofino/bf-p4c/logging/source_info_logging.h"
 #include "backends/tofino/bf-p4c/mau/mau_visitor.h"
 #include "backends/tofino/bf-p4c/midend/param_binding.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "frontends/common/options.h"
 #include "frontends/common/resolveReferences/referenceMap.h"
 #include "frontends/p4/externInstance.h"

diff --git a/backends/tofino/bf-p4c/common/utils.cpp b/backends/tofino/bf-p4c/common/utils.cpp
@@ -21,7 +21,7 @@
 #include <regex>
 
 #include "backends/tofino/bf-p4c/bf-p4c-options.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 
 bool ghost_only_on_other_pipes(int pipe_id) {
     if (pipe_id < 0) return false;  // invalid pipe id

diff --git a/backends/tofino/bf-p4c/control-plane/bfruntime_arch_handler.h b/backends/tofino/bf-p4c/control-plane/bfruntime_arch_handler.h
@@ -33,7 +33,7 @@
 #include "backends/tofino/bf-p4c/control-plane/bfruntime.h"
 #include "backends/tofino/bf-p4c/control-plane/p4runtime_force_std.h"
 #include "backends/tofino/bf-p4c/control-plane/runtime.h"
-#include "backends/tofino/bf-p4c/device.h"
+#include "backends/tofino/bf-p4c/specs/device.h"
 #include "barefoot/p4info.pb.h"
 #include "control-plane/flattenHeader.h"
 #include "control-plane/p4RuntimeArchHandler.h"