Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the Tofino spec files independent of the generated IR. #5063

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Start to clean up Tofino specs.
Signed-off-by: fruffy <fruffy@nyu.edu>
  • Loading branch information
fruffy committed Dec 15, 2024
commit 90e3c0a1f3dc4cd9c23e923a2ecb0eb654fed5fe
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 ########################################
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
24 changes: 16 additions & 8 deletions backends/tofino/bf-p4c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -443,7 +452,6 @@ set (BF_P4C_BACKEND_MAIN_SRCS
asm.cpp
backend.cpp
bf-p4c-options.cpp
device.cpp
midend.cpp
)

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/arch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/bridge_metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/check_extern_invocation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/fromv1.0/mirror.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/fromv1.0/parser_counter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/fromv1.0/phase0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/fromv1.0/primitives.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/fromv1.0/programStructure.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/fromv1.0/resubmit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/fromv1.0/v1_converters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/intrinsic_metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/program_structure.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/psa/programStructure.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/psa/psa.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/psa/psa.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/tna.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/tna/primitives.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/v1model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/arch/v1model.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/asm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/backend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/common/bridged_packing.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/common/extract_maupipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backends/tofino/bf-p4c/common/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading