Skip to content

Use extractor generated CLK pin XML if possible #1711

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Use extractor generated CLK pin XML if possible #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
732e39c
Use extractor generated CLK pin XML if possible
chungshien-chai Oct 1, 2024
2fd11d6
Incremented patch version
chungshien-chai Oct 1, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ set(VERSION_MINOR 0)
# Add the spdlog directory to the include path
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/third_party/exprtk ${CMAKE_CURRENT_SOURCE_DIR}/third_party/scope_guard)

set(VERSION_PATCH 432)
set(VERSION_PATCH 433)


option(
Expand Down
13 changes: 11 additions & 2 deletions src/Compiler/CompilerOpenFPGA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3469,8 +3469,17 @@ std::string CompilerOpenFPGA::FinishOpenFPGAScript(const std::string& script) {
}
result = ReplaceAll(result, "${OPENFPGA_BITSTREAM_SETTING_FILE}",
m_runtime_OpenFpgaBitstreamSettingFile.string());
result = ReplaceAll(result, "${OPENFPGA_PIN_CONSTRAINTS}",
m_OpenFpgaPinConstraintXml.string());

// Use run time generated clk pin XML if exists
std::filesystem::path clk_pin_xml =
FilePath(Action::Synthesis) / "clk_pin.xml";
if (std::filesystem::exists(clk_pin_xml)) {
result =
ReplaceAll(result, "${OPENFPGA_PIN_CONSTRAINTS}", clk_pin_xml.string());
} else {
result = ReplaceAll(result, "${OPENFPGA_PIN_CONSTRAINTS}",
m_OpenFpgaPinConstraintXml.string());
}

if (m_bitstreamMoreOpt.find("wl_decremental_order") != std::string::npos) {
result = ReplaceAll(result, "${WL_ORDER_OPTION}", "--wl_decremental_order");
Expand Down