IP block installation

SoCMakeConfig.cmake

@@ -16,6 +16,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/utils/option.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/utils/find_python.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/utils/print_list.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/utils/uniquify_files_by_basename.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/utils/install/install.cmake")
 
 # ====================================
 # ======== Additional utilities ======

cmake/hwip.cmake

@@ -269,10 +269,10 @@ function(ip_sources IP_LIB LANGUAGE)
     set(headers_property ${LANGUAGE}_${ARG_FILE_SET}_HEADERS)
     set(get_sources_fileset_arg FILE_SETS ${ARG_FILE_SET})
 
-    get_property(filesets TARGET ${_reallib} PROPERTY FILE_SETS)
+    get_property(filesets TARGET ${_reallib} PROPERTY LANG_FILE_SETS)
     set(file_set "${LANGUAGE}::${ARG_FILE_SET}")
     if(NOT file_set IN_LIST filesets)
-        set_property(TARGET ${_reallib} APPEND PROPERTY FILE_SETS ${file_set})
+        set_property(TARGET ${_reallib} APPEND PROPERTY LANG_FILE_SETS ${file_set})
     endif()
 
     list(REMOVE_ITEM ARGN "${ARG_FILE_SET}")
@@ -304,14 +304,12 @@ function(ip_sources IP_LIB LANGUAGE)
     endif()
     # Set the target property with the new list of source and header files
     set_property(TARGET ${_reallib} PROPERTY ${sources_property} ${_sources})
-    # set_property(TARGET ${_reallib} APPEND PROPERTY EXPORT_PROPERTIES ${sources_property}) # TODO don't add if already there
     if(ARG_HEADERS)
         foreach(header ${_headers})
             cmake_path(GET header PARENT_PATH header_incdir)
             ip_include_directories(${IP_LIB} ${LANGUAGE} ${header_incdir})
         endforeach()
         set_property(TARGET ${_reallib} PROPERTY ${headers_property} ${_headers})
-        # set_property(TARGET ${_reallib} APPEND PROPERTY EXPORT_PROPERTIES ${headers_property}) # TODO don't add if already there
     endif()
 endfunction()
 
@@ -355,16 +353,18 @@ function(get_ip_sources OUTVAR IP_LIB LANGUAGE)
 
     # In case FILE_SETS function argument is not specified, return all defined file sets
     # Otherwise return only files in listed file sets
-    get_ip_property(ip_filesets ${_reallib} FILE_SETS ${_no_deps})
+    get_ip_property(ip_filesets ${_reallib} LANG_FILE_SETS ${_no_deps})
     if(NOT ARG_FILE_SETS)
         set(filesets ${ip_filesets})
     else()
+        list(REMOVE_ITEM ARGN ${ARG_FILE_SETS})
+        list(REMOVE_ITEM ARGN "FILE_SETS")
         unset(filesets)
-        foreach(fileset ${ARG_FILE_SETS})
-            list(APPEND filesets "${LANGUAGE}::${fileset}")
-            list(REMOVE_ITEM ARGN "${fileset}")
+        foreach(lang ${LANGUAGE} ${ARGN})
+            foreach(fileset_name ${ARG_FILE_SETS})
+                list(APPEND filesets ${lang}::${fileset_name})
+            endforeach()
         endforeach()
-        list(REMOVE_ITEM ARGN "FILE_SETS")
     endif()
 
     unset(SOURCES)
@@ -415,11 +415,11 @@ function(ip_include_directories IP_LIB LANGUAGE)
     endif()
     set(incdir_property ${LANGUAGE}_${ARG_FILE_SET}_INCLUDE_DIRECTORIES)
 
-    # Add the file set to the FILE_SETS property
-    get_property(filesets TARGET ${_reallib} PROPERTY FILE_SETS)
+    # Add the file set to the LANG_FILE_SETS property
+    get_property(filesets TARGET ${_reallib} PROPERTY LANG_FILE_SETS)
     set(file_set "${LANGUAGE}::${ARG_FILE_SET}")
     if(NOT file_set IN_LIST filesets)
-        set_property(TARGET ${_reallib} APPEND PROPERTY FILE_SETS ${file_set})
+        set_property(TARGET ${_reallib} APPEND PROPERTY LANG_FILE_SETS ${file_set})
     endif()
     # Remove the FILE_SET argument and its value from ARGN to not interfere with directory list
     list(REMOVE_ITEM ARGN "${ARG_FILE_SET}")
@@ -457,17 +457,19 @@ function(get_ip_include_directories OUTVAR IP_LIB LANGUAGE)
     alias_dereference(_reallib ${IP_LIB})
 
     # In case FILE_SETS function argument is not specified, return all defined file sets
-    # Otherwise return only directories in listed file sets
-    get_ip_property(ip_filesets ${_reallib} FILE_SETS ${_no_deps})
+    # Otherwise return only files in listed file sets
+    get_ip_property(ip_filesets ${_reallib} LANG_FILE_SETS ${_no_deps})
     if(NOT ARG_FILE_SETS)
         set(filesets ${ip_filesets})
     else()
+        list(REMOVE_ITEM ARGN ${ARG_FILE_SETS})
+        list(REMOVE_ITEM ARGN "FILE_SETS")
         unset(filesets)
-        foreach(fileset ${ARG_FILE_SETS})
-            list(APPEND filesets "${LANGUAGE}::${fileset}")
-            list(REMOVE_ITEM ARGN "${fileset}")
+        foreach(lang ${LANGUAGE} ${ARGN})
+            foreach(fileset_name ${ARG_FILE_SETS})
+                list(APPEND filesets ${lang}::${fileset_name})
+            endforeach()
         endforeach()
-        list(REMOVE_ITEM ARGN "FILE_SETS")
     endif()
 
     # ARGN contains extra languages passed, it might also include NO_DEPS so remove it from the list
@@ -509,7 +511,7 @@ function(check_languages LANGUAGE)
     # The user can add addition languages using the SOCMAKE_ADDITIONAL_LANGUAGES variable and global property
     get_socmake_languages(SOCMAKE_SUPPORTED_LANGUAGES)
 
-    if(NOT ${LANGUAGE} IN_LIST SOCMAKE_SUPPORTED_LANGUAGES)
+    if(NOT "${LANGUAGE}" IN_LIST SOCMAKE_SUPPORTED_LANGUAGES)
         if(SOCMAKE_UNSUPPORTED_LANGUAGE_FATAL)
             set(_verbosity FATAL_ERROR)
         else()
@@ -720,11 +722,11 @@ function(ip_compile_definitions IP_LIB LANGUAGE)
     endif()
     set(comp_def_property ${LANGUAGE}_${ARG_FILE_SET}_COMPILE_DEFINITIONS)
 
-    # Add the file set to the FILE_SETS property
-    get_property(filesets TARGET ${_reallib} PROPERTY FILE_SETS)
+    # Add the file set to the LANG_FILE_SETS property
+    get_property(filesets TARGET ${_reallib} PROPERTY LANG_FILE_SETS)
     set(file_set "${LANGUAGE}::${ARG_FILE_SET}")
     if(NOT file_set IN_LIST filesets)
-        set_property(TARGET ${_reallib} APPEND PROPERTY FILE_SETS ${file_set})
+        set_property(TARGET ${_reallib} APPEND PROPERTY LANG_FILE_SETS ${file_set})
     endif()
     # Remove the FILE_SET argument and its value from ARGN to not interfere with directory list
     list(REMOVE_ITEM ARGN "${ARG_FILE_SET}")
@@ -768,17 +770,19 @@ function(get_ip_compile_definitions OUTVAR IP_LIB LANGUAGE)
     alias_dereference(_reallib ${IP_LIB})
 
     # In case FILE_SETS function argument is not specified, return all defined file sets
-    # Otherwise return only directories in listed file sets
-    get_ip_property(ip_filesets ${_reallib} FILE_SETS ${_no_deps})
+    # Otherwise return only files in listed file sets
+    get_ip_property(ip_filesets ${_reallib} LANG_FILE_SETS ${_no_deps})
     if(NOT ARG_FILE_SETS)
         set(filesets ${ip_filesets})
     else()
+        list(REMOVE_ITEM ARGN ${ARG_FILE_SETS})
+        list(REMOVE_ITEM ARGN "FILE_SETS")
         unset(filesets)
-        foreach(fileset ${ARG_FILE_SETS})
-            list(APPEND filesets "${LANGUAGE}::${fileset}")
-            list(REMOVE_ITEM ARGN "${fileset}")
+        foreach(lang ${LANGUAGE} ${ARGN})
+            foreach(fileset_name ${ARG_FILE_SETS})
+                list(APPEND filesets ${lang}::${fileset_name})
+            endforeach()
         endforeach()
-        list(REMOVE_ITEM ARGN "FILE_SETS")
     endif()
 
     # ARGN contains extra languages passed, it might also include NO_DEPS so remove it from the list

cmake/misc/verible_obfuscate.cmake

@@ -0,0 +1,70 @@
+include_guard(GLOBAL)
+
+function(verible_obfuscate IP_LIB)
+    cmake_parse_arguments(ARG "NO_DEPS" "OUTDIR" "FILE_SETS" ${ARGN})
+    if(ARG_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} passed unrecognized argument " "${ARG_UNPARSED_ARGUMENTS}")
+    endif()
+
+    alias_dereference(IP_LIB ${IP_LIB})
+    get_target_property(BINARY_DIR ${IP_LIB} BINARY_DIR)
+
+    if(NOT ARG_OUTDIR)
+        set(OUTDIR ${BINARY_DIR}/${IP_LIB}_${CMAKE_CURRENT_FUNCTION})
+    else()
+        set(OUTDIR ${ARG_OUTDIR})
+    endif()
+    file(MAKE_DIRECTORY ${OUTDIR})
+
+    if(ARG_FILE_SETS)
+        set(FILE_SETS_FUNC_ARG FILE_SETS ${ARG_FILE_SETS})
+    endif()
+
+    if(ARG_NO_DEPS)
+        set(ips ${IP_LIB})
+    else()
+        get_ip_links(ips ${IP_LIB})
+    endif()
+
+    unset(all_gen_files)
+    foreach(ip IN LISTS ips)
+        get_property(filesets TARGET ${ip} PROPERTY LANG_FILE_SETS)
+
+        set(languages VERILOG SYSTEMVERILOG)
+
+        foreach(fileset IN LISTS filesets)
+            string(REPLACE "::" ";" fileset_list "${fileset}")
+            list(GET fileset_list 0 fileset_language)
+            list(GET fileset_list 1 fileset_name)
+            if(fileset_language IN_LIST languages)
+                get_ip_sources(sources ${ip} ${fileset_language} FILE_SETS ${fileset_name} NO_DEPS)
+                unset(replace_sources)
+                foreach(source ${sources})
+                    cmake_path(GET source FILENAME source_fn)
+                    set(source_new "${OUTDIR}/${source_fn}")
+
+                    list(APPEND replace_sources "${source_new}")
+
+                    add_custom_command(
+                        OUTPUT ${source_new}
+                        COMMAND verible-verilog-obfuscate < ${source} > ${source_new}
+                        DEPENDS ${source}
+                        COMMENT "Obfuscate ${source_fn} of ${IP_LIB} with Verible"
+                        )
+                    list(APPEND all_gen_files ${source_new})
+                endforeach()
+                ip_sources(${ip} ${fileset_language} FILE_SET ${fileset_name} REPLACE "${replace_sources}")
+
+            endif()
+        endforeach()
+    endforeach()
+
+
+    set(DESCRIPTION "Obfuscating Verilog/SV files of ${IP_LIB} with Verible obfuscate")
+    add_custom_target(${IP_LIB}_verible_obfuscate
+        DEPENDS ${all_gen_files}
+    )
+    set_property(TARGET ${IP_LIB}_verible_obfuscate PROPERTY DESCRIPTION ${DESCRIPTION})
+
+endfunction()
+

cmake/sim/siemens/modelsim_encrypt.cmake

@@ -0,0 +1,76 @@
+include_guard(GLOBAL)
+
+function(modelsim_encrypt IP_LIB)
+    cmake_parse_arguments(ARG "NO_DEPS;QUIET" "OUTDIR" "FILE_SETS" ${ARGN})
+    if(ARG_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} passed unrecognized argument " "${ARG_UNPARSED_ARGUMENTS}")
+    endif()
+
+    include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../../hwip.cmake")
+    include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../sim_utils.cmake")
+
+    alias_dereference(IP_LIB ${IP_LIB})
+    get_target_property(BINARY_DIR ${IP_LIB} BINARY_DIR)
+
+    if(NOT ARG_OUTDIR)
+        set(OUTDIR ${BINARY_DIR}/${IP_LIB}_${CMAKE_CURRENT_FUNCTION})
+    else()
+        set(OUTDIR ${ARG_OUTDIR})
+    endif()
+    file(MAKE_DIRECTORY ${OUTDIR})
+
+    if(ARG_FILE_SETS)
+        set(FILE_SETS_FUNC_ARG FILE_SETS ${ARG_FILE_SETS})
+    endif()
+
+    if(ARG_NO_DEPS)
+        set(ips ${IP_LIB})
+    else()
+        get_ip_links(ips ${IP_LIB})
+    endif()
+
+    unset(all_gen_files)
+    foreach(ip IN LISTS ips)
+        get_property(filesets TARGET ${ip} PROPERTY LANG_FILE_SETS)
+
+        set(languages VERILOG SYSTEMVERILOG VHDL)
+
+        foreach(fileset IN LISTS filesets)
+            string(REPLACE "::" ";" fileset_list "${fileset}")
+            list(GET fileset_list 0 fileset_language)
+            list(GET fileset_list 1 fileset_name)
+            if(fileset_language IN_LIST languages)
+                get_ip_sources(sources ${ip} ${fileset_language} FILE_SETS ${fileset_name} NO_DEPS)
+                unset(replace_sources)
+                foreach(source ${sources})
+                    cmake_path(GET source EXTENSION LAST_ONLY ext)
+                    set(new_ext "${ext}p")
+                    cmake_path(GET source FILENAME source_fn)
+                    cmake_path(REPLACE_EXTENSION source_fn LAST_ONLY "${new_ext}" OUTPUT_VARIABLE source_new)
+                    string(REPLACE "." "" new_ext "${new_ext}")
+                    set(source_new "${OUTDIR}/${source_new}")
+
+                    list(APPEND replace_sources "${source_new}")
+
+                    add_custom_command(
+                        OUTPUT ${source_new}
+                        COMMAND vencrypt ${source} -e "${new_ext}" -d ${OUTDIR} $<$<BOOL:${ARG_QUIET}>:-quiet>
+                        DEPENDS ${source}
+                        COMMENT "Encrypt ${source_fn} of ${IP_LIB} with modelsim vencrypt"
+                        )
+                    list(APPEND all_gen_files ${source_new})
+                endforeach()
+                ip_sources(${ip} ${fileset_language} FILE_SET ${fileset_name} REPLACE "${replace_sources}")
+
+            endif()
+        endforeach()
+    endforeach()
+
+
+    set(DESCRIPTION "Encrypting HDL files of ${IP_LIB} with modelsim vencrypt")
+    add_custom_target(${IP_LIB}_modelsim_encrypt
+        DEPENDS ${all_gen_files}
+    )
+    set_property(TARGET ${IP_LIB}_modelsim_encrypt PROPERTY DESCRIPTION ${DESCRIPTION})
+
+endfunction()

cmake/utils/file_paths.cmake

@@ -11,10 +11,12 @@
 function(convert_paths_to_absolute OUTPUT_LIST)
     unset(output_list)
     foreach(path ${ARGN})
-        cmake_path(ABSOLUTE_PATH path 
-            BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} NORMALIZE
-            OUTPUT_VARIABLE path
-        )
+        if(NOT "${path}" MATCHES "\\$\{_IMPORT_PREFIX\}")
+            cmake_path(ABSOLUTE_PATH path 
+                BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} NORMALIZE
+                OUTPUT_VARIABLE path
+            )
+        endif()
         list(APPEND output_list ${path} )
     endforeach()
 

cmake/utils/get_all_targets.cmake

@@ -12,6 +12,7 @@ macro(__get_all_targets_recursive targets dir)
         __get_all_targets_recursive(${targets} ${subdir})
     endforeach()
 
-    get_property(current_targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
-    list(APPEND ${targets} ${current_targets})
+    get_property(current_targets  DIRECTORY "${dir}" PROPERTY BUILDSYSTEM_TARGETS)
+    get_property(imported_targets DIRECTORY "${dir}" PROPERTY IMPORTED_TARGETS)
+    list(APPEND ${targets} ${current_targets} ${imported_targets})
 endmacro()