From 5fa2bf0c784061ca89ea0c3089c44608252f10cf Mon Sep 17 00:00:00 2001 From: umariqbal-rs Date: Wed, 23 Aug 2023 15:39:44 +0500 Subject: [PATCH 1/2] updating CMAKE so now encryption related files are included from encryption folder --- CMakeLists.txt | 12 ++++++------ analyze/CMakeLists.txt | 11 +++++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 588762625..42ce07854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,12 +90,12 @@ get_filename_component(VERIFIC_HOME "Raptor_Tools/verific_rs" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE) message("VERIFIC_HOME: ${VERIFIC_HOME}") -get_filename_component(READ_VERILOG_SRC_DIR "Raptor_Tools/gatelevel_readers/read_verilog" -REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE) -message("READ_VERILOG_SRC_DIR: ${READ_VERILOG_SRC_DIR}") +get_filename_component(ENCRYPTION_SRC "Raptor_Tools/encryption/" + REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE) +message("ENCRYPTION_SRC: ${ENCRYPTION_SRC}") if (NOT RAPTOR) - add_subdirectory(${READ_VERILOG_SRC_DIR}) + add_subdirectory(${ENCRYPTION_SRC}) endif() set(LIB_READ_VERILOG ${CMAKE_BINARY_DIR}/Raptor_Tools/gatelevel_readers/read_verilog/libreadver.a) @@ -134,14 +134,14 @@ if (PRODUCTION_BUILD) list(APPEND YOSYS_MK_ARGS "PRODUCTION_BUILD=1" "EXTRA_LDLIBS=${FLEX_LM_LDLIBS} -lssl -lcrypto ${LIB_READ_VERILOG} -lstdc++" - "EXTRA_CXX_FLAGS=-I${FLEX_LM_SRC_DIR} -I${FLEX_LM_SRC_DIR}/machind -DPRODUCTION_BUILD=1 -I${READ_VERILOG_SRC_DIR}/src/read_nl/" + "EXTRA_CXX_FLAGS=-I${FLEX_LM_SRC_DIR} -I${FLEX_LM_SRC_DIR}/machind -DPRODUCTION_BUILD=1 -I${ENCRYPTION_SRC}/src/enc_verilog" "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" ) else() list(APPEND YOSYS_MK_ARGS "EXTRA_LDLIBS=${LIB_READ_VERILOG} -lssl -lcrypto -lstdc++" - "EXTRA_CXX_FLAGS=-I${READ_VERILOG_SRC_DIR}/src/read_nl/" + "EXTRA_CXX_FLAGS=-I${ENCRYPTION_SRC}/src/enc_verilog" ) endif() diff --git a/analyze/CMakeLists.txt b/analyze/CMakeLists.txt index 0af37dee7..fa3f9f991 100644 --- a/analyze/CMakeLists.txt +++ b/analyze/CMakeLists.txt @@ -13,11 +13,13 @@ if (PRODUCTION_BUILD) message("FLEX: " ${FLEX_LM_SRC_DIR}) endif(PRODUCTION_BUILD) -get_filename_component(READ_VERILOG_SRC_DIR "../Raptor_Tools/gatelevel_readers/read_verilog" +get_filename_component(ENCRYPTION_SRC "../Raptor_Tools/encryption/" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE) +message("ENCRYPTION_SRC: ${ENCRYPTION_SRC}") + if ((NOT RAPTOR) AND (NOT YOSYS_VERIFIC)) - add_subdirectory(${READ_VERILOG_SRC_DIR} "libreadver") - message("READ_VERILOG_SRC_DIR: ${READ_VERILOG_SRC_DIR}") + add_subdirectory(${ENCRYPTION_SRC} "libreadver") + message("ENCRYPTION_SRC: ${ENCRYPTION_SRC}") endif() find_package(PkgConfig REQUIRED) @@ -78,6 +80,7 @@ message("VERIFIC_HOME: ${VERIFIC_HOME}") file(GLOB_RECURSE LIB_HEADERS ${VERIFIC_HOME}/*/*.h) +list(APPEND LIB_HEADERS ${ENCRYPTION_SRC}/src/enc_verilog/ieee_1735.h) files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS) @@ -90,7 +93,7 @@ endif(PRODUCTION_BUILD) target_include_directories(analyze PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third_party/) target_include_directories(analyze PUBLIC ${LIB_INCLUDE_DIRS}) -target_include_directories(analyze PUBLIC ${READ_VERILOG_SRC_DIR}/src/read_nl/) +target_include_directories(analyze PUBLIC {ENCRYPTION_SRC}/src/enc_verilog/) if (APPLE) set(OS "mac") From 14ff93657e4d283a29b706e81c6f362951104514 Mon Sep 17 00:00:00 2001 From: umariqbal-rs Date: Wed, 23 Aug 2023 11:04:34 +0000 Subject: [PATCH 2/2] Incremented patch version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42ce07854..b24957a10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ endif(NOT CMAKE_BUILD_TYPE) set(VERSION_MAJOR 0) set(VERSION_MINOR 0) -set(VERSION_PATCH 229) +set(VERSION_PATCH 230) project(yosys_verific_rs)