cmake: sdp: generate and check separate files for each SoC

Each SoC should have own unique assembly file, since their
configuration may differ.

Signed-off-by: Marcin Szymczyk <[email protected]>

Author: masz-nordic

cmake/sdp.cmake

@@ -5,24 +5,24 @@
 #
 
 function(sdp_assembly_install target hrt_srcs)
-  sdp_assembly_generate("${hrt_srcs}")
-  sdp_assembly_check("${hrt_srcs}")
-  sdp_assembly_prepare_install("${hrt_srcs}")
-  sdp_assembly_target_sources(${target} "${hrt_srcs}")
+  sdp_assembly_generate(${CONFIG_SOC} "${hrt_srcs}")
+  sdp_assembly_check(${CONFIG_SOC} "${hrt_srcs}")
+  sdp_assembly_prepare_install(${CONFIG_SOC} "${hrt_srcs}")
+  sdp_assembly_target_sources(${CONFIG_SOC} ${target} "${hrt_srcs}")
 
   add_dependencies(${target} asm_check)
 endfunction()
 
-function(sdp_assembly_target_sources target hrt_srcs)
+function(sdp_assembly_target_sources soc target hrt_srcs)
   foreach(hrt_src ${hrt_srcs})
     get_filename_component(hrt_dir ${hrt_src} DIRECTORY)  # directory
     get_filename_component(hrt_src_file ${hrt_src} NAME_WE)  # filename without extension
-    set(hrt_s_file "${hrt_dir}/${hrt_src_file}.s")
+    set(hrt_s_file "${hrt_dir}/${hrt_src_file}-${soc}.s")
     target_sources(${target} PRIVATE ${hrt_s_file})
   endforeach()
 endfunction()
 
-function(sdp_assembly_generate hrt_srcs)
+function(sdp_assembly_generate soc hrt_srcs)
   set(hrt_msg "Generating ASM files for Hard Real Time files.")
   set(hrt_opts -g0 -fno-ident -fno-verbose-asm)
 
@@ -56,9 +56,9 @@ function(sdp_assembly_generate hrt_srcs)
     get_filename_component(src_filename ${hrt_src} NAME_WE)  # filename without extension
     add_custom_command(TARGET asm_gen
       PRE_BUILD
-      BYPRODUCTS ${src_filename}-temp.s
-      COMMAND ${CMAKE_C_COMPILER} ${compiler_options} ${hrt_opts} -S ${hrt_src} -o ${src_filename}-temp.s
-      COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_NRF_MODULE_DIR}/scripts/sdp/remove_comments.py ${src_filename}-temp.s
+      BYPRODUCTS ${src_filename}-${soc}-temp.s
+      COMMAND ${CMAKE_C_COMPILER} ${compiler_options} ${hrt_opts} -S ${hrt_src} -o ${src_filename}-${soc}-temp.s
+      COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_NRF_MODULE_DIR}/scripts/sdp/remove_comments.py ${src_filename}-${soc}-temp.s
       COMMAND_EXPAND_LISTS
       COMMENT "Generating ASM file for ${hrt_src}"
     )
@@ -68,7 +68,7 @@ function(sdp_assembly_generate hrt_srcs)
 
 endfunction()
 
-function(sdp_assembly_check hrt_srcs)
+function(sdp_assembly_check soc hrt_srcs)
   set(asm_check_msg "Checking if ASM files for Hard Real Time have changed.")
 
   if(TARGET asm_check)
@@ -80,15 +80,15 @@ function(sdp_assembly_check hrt_srcs)
   string(REPLACE ";" "$<SEMICOLON>" hrt_srcs_semi "${hrt_srcs}")
 
   add_custom_target(asm_check
-    COMMAND ${CMAKE_COMMAND} -D hrt_srcs="${hrt_srcs_semi}" -P ${ZEPHYR_NRF_MODULE_DIR}/cmake/sdp_asm_check.cmake
+    COMMAND ${CMAKE_COMMAND} -D hrt_srcs="${hrt_srcs_semi}" -D soc="${soc}" -P ${ZEPHYR_NRF_MODULE_DIR}/cmake/sdp_asm_check.cmake
     COMMENT ${asm_check_msg}
   )
 
   add_dependencies(asm_check asm_gen)
 
 endfunction()
 
-function(sdp_assembly_prepare_install hrt_srcs)
+function(sdp_assembly_prepare_install soc hrt_srcs)
   set(asm_install_msg "Updating ASM files for Hard Real Time.")
 
   if(TARGET asm_install)
@@ -100,7 +100,7 @@ function(sdp_assembly_prepare_install hrt_srcs)
   string(REPLACE ";" "$<SEMICOLON>" hrt_srcs_semi "${hrt_srcs}")
 
   add_custom_target(asm_install
-    COMMAND ${CMAKE_COMMAND} -D hrt_srcs="${hrt_srcs_semi}" -P ${ZEPHYR_NRF_MODULE_DIR}/cmake/sdp_asm_install.cmake
+    COMMAND ${CMAKE_COMMAND} -D hrt_srcs="${hrt_srcs_semi}" -D soc="${soc}" -P ${ZEPHYR_NRF_MODULE_DIR}/cmake/sdp_asm_install.cmake
     COMMENT ${asm_install_msg}
   )
 

cmake/sdp_asm_check.cmake

@@ -5,23 +5,26 @@
 #
 
 function(asm_check)
+  if(NOT DEFINED soc)
+    message(FATAL_ERROR "asm_check missing soc argument.")
+  endif()
 
   foreach(hrt_src ${hrt_srcs})
     get_filename_component(asm_filename ${hrt_src} NAME_WE)  # filename without extension
     get_filename_component(src_dir ${hrt_src} DIRECTORY)
 
     execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol
-                    ${src_dir}/${asm_filename}.s ${asm_filename}-temp.s
+                    ${src_dir}/${asm_filename}-${soc}.s ${asm_filename}-${soc}-temp.s
                     RESULT_VARIABLE compare_result)
 
     if( compare_result EQUAL 0)
-      message("File ${asm_filename}.s has not changed.")
+      message("File ${asm_filename}-${soc}.s has not changed.")
     elseif( compare_result EQUAL 1)
-      message(WARNING "${asm_filename}.s ASM file content has changed.\
+      message(WARNING "${asm_filename}-${soc}.s ASM file content has changed.\
               If you want to include the new ASM in build, \
               please run `ninja asm_install` in FLPR build directory and build again")
     else()
-      message("Something went wrong when comparing ${asm_filename}.s and ${asm_filename}-temp.s")
+      message("Something went wrong when comparing ${asm_filename}-${soc}.s and ${asm_filename}-${soc}-temp.s")
     endif()
   endforeach()
 

cmake/sdp_asm_install.cmake

@@ -5,17 +5,20 @@
 #
 
 function(asm_install)
+  if(NOT DEFINED soc)
+    message(FATAL_ERROR "asm_install missing soc argument.")
+  endif()
 
   foreach(hrt_src ${hrt_srcs})
     get_filename_component(asm_filename ${hrt_src} NAME_WE)  # filename without extension
     get_filename_component(src_dir ${hrt_src} DIRECTORY)
 
-    file(RENAME ${asm_filename}-temp.s ${src_dir}/${asm_filename}.s RESULT rename_result)
+    file(RENAME ${asm_filename}-${soc}-temp.s ${src_dir}/${asm_filename}-${soc}.s RESULT rename_result)
 
     if (rename_result EQUAL 0)
-        message("Updated ${asm_filename}.s ASM file.")
+        message("Updated ${asm_filename}-${soc}.s ASM file.")
     else()
-        message(WARNING "${asm_filename}.s cannot be updated, new ASM does not exist. Please run ninja asm_gen to create one.")
+        message(WARNING "${asm_filename}-${soc}.s cannot be updated, new ASM does not exist. Please run ninja asm_gen to create one.")
     endif()
 
   endforeach()