From 98da4815ed592506e20d7f729741e77339807c97 Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Fri, 19 Jan 2024 16:58:59 +0500 Subject: [PATCH 1/4] Update CMakeLists.txt to disable the call of non available dirs --- CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab06e9d7e..eb46b4147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,19 +129,21 @@ endif() if (PRODUCTION_BUILD) string(CONCAT FLEX_LM_LDLIBS - "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_trl.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/libcrvs.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/libsb.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/activation/lib/libnoact.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_dongle.a " + #TODO enable Flexlm + # "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_trl.a " + # "${FLEX_LM_SRC_DIR}/x64_lsb/libcrvs.a " + # "${FLEX_LM_SRC_DIR}/x64_lsb/libsb.a " + # "${FLEX_LM_SRC_DIR}/x64_lsb/activation/lib/libnoact.a " + # "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_dongle.a " "${CMAKE_BINARY_DIR}/Raptor_Tools/Flex_LM/rs_licenseManager.a " ) list(APPEND YOSYS_MK_ARGS "PRODUCTION_BUILD=1" "EXTRA_LDLIBS=${FLEX_LM_LDLIBS} -lstdc++" "EXTRA_CXX_FLAGS=-I${FLEX_LM_SRC_DIR} -I${FLEX_LM_SRC_DIR}/machind -DPRODUCTION_BUILD=1" - "EXTRA_OBJS=${FLEX_LM_SRC_DIR}/x64_lsb/lm_new_pic.o" - "EXTRA_LD_FLAGS=-fPIC -fvisibility=hidden -no-pie -lrt -Wl,--no-as-needed -ldl -pthread" + #TODO enable Flexlm + #"EXTRA_OBJS=${FLEX_LM_SRC_DIR}/x64_lsb/lm_new_pic.o" + #"EXTRA_LD_FLAGS=-fPIC -fvisibility=hidden -no-pie -lrt -Wl,--no-as-needed -ldl -pthread" ) endif() From 0974a1c4cb63ae99d4a4acd0c3661a017bd63d27 Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Fri, 19 Jan 2024 17:40:46 +0500 Subject: [PATCH 2/4] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb46b4147..9544909b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,7 @@ if (PRODUCTION_BUILD) "EXTRA_CXX_FLAGS=-I${FLEX_LM_SRC_DIR} -I${FLEX_LM_SRC_DIR}/machind -DPRODUCTION_BUILD=1" #TODO enable Flexlm #"EXTRA_OBJS=${FLEX_LM_SRC_DIR}/x64_lsb/lm_new_pic.o" - #"EXTRA_LD_FLAGS=-fPIC -fvisibility=hidden -no-pie -lrt -Wl,--no-as-needed -ldl -pthread" + "EXTRA_LD_FLAGS=-fPIC -fvisibility=hidden -no-pie -lrt -Wl,--no-as-needed -ldl -pthread" ) endif() From e008a848ee54ed13c7806b6759444faa6f91453e Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Fri, 19 Jan 2024 18:05:59 +0500 Subject: [PATCH 3/4] Update CMakeLists.txt to disable just the pic.o lib only --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9544909b1..6e6316d82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,11 +130,11 @@ endif() if (PRODUCTION_BUILD) string(CONCAT FLEX_LM_LDLIBS #TODO enable Flexlm - # "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_trl.a " - # "${FLEX_LM_SRC_DIR}/x64_lsb/libcrvs.a " - # "${FLEX_LM_SRC_DIR}/x64_lsb/libsb.a " - # "${FLEX_LM_SRC_DIR}/x64_lsb/activation/lib/libnoact.a " - # "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_dongle.a " + "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_trl.a " + "${FLEX_LM_SRC_DIR}/x64_lsb/libcrvs.a " + "${FLEX_LM_SRC_DIR}/x64_lsb/libsb.a " + "${FLEX_LM_SRC_DIR}/x64_lsb/activation/lib/libnoact.a " + "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_dongle.a " "${CMAKE_BINARY_DIR}/Raptor_Tools/Flex_LM/rs_licenseManager.a " ) list(APPEND YOSYS_MK_ARGS From b03ac8d3be63b732d7bd7046feacc475d9cddd74 Mon Sep 17 00:00:00 2001 From: NadeemYaseen Date: Sat, 20 Jan 2024 20:22:58 +0500 Subject: [PATCH 4/4] purge flexlm --- .gitmodules | 3 --- CMakeLists.txt | 10 +--------- RTL_Benchmark | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 160000 RTL_Benchmark diff --git a/.gitmodules b/.gitmodules index 020b4dece..0d542bd16 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "logic_synthesis-rs"] path = logic_synthesis-rs url = https://github.com/os-fpga/logic_synthesis-rs.git -[submodule "RTL_Benchmark"] - path = RTL_Benchmark - url = https://github.com/os-fpga/RTL_Benchmark.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e6316d82..41c6929fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,20 +129,12 @@ endif() if (PRODUCTION_BUILD) string(CONCAT FLEX_LM_LDLIBS - #TODO enable Flexlm - "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_trl.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/libcrvs.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/libsb.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/activation/lib/libnoact.a " - "${FLEX_LM_SRC_DIR}/x64_lsb/liblmgr_dongle.a " "${CMAKE_BINARY_DIR}/Raptor_Tools/Flex_LM/rs_licenseManager.a " ) list(APPEND YOSYS_MK_ARGS "PRODUCTION_BUILD=1" "EXTRA_LDLIBS=${FLEX_LM_LDLIBS} -lstdc++" - "EXTRA_CXX_FLAGS=-I${FLEX_LM_SRC_DIR} -I${FLEX_LM_SRC_DIR}/machind -DPRODUCTION_BUILD=1" - #TODO enable Flexlm - #"EXTRA_OBJS=${FLEX_LM_SRC_DIR}/x64_lsb/lm_new_pic.o" + "EXTRA_CXX_FLAGS=-DPRODUCTION_BUILD=1" "EXTRA_LD_FLAGS=-fPIC -fvisibility=hidden -no-pie -lrt -Wl,--no-as-needed -ldl -pthread" ) endif() diff --git a/RTL_Benchmark b/RTL_Benchmark deleted file mode 160000 index 1b9edd8b5..000000000 --- a/RTL_Benchmark +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1b9edd8b5a4fdee2dded95aad87b1b9456098845