AArch64: simplify to_hrl usage with precompiled tests

Signed-off-by: Paul Guyot <[email protected]>

Author: pguyot

tests/erlang_tests/CMakeLists.txt

@@ -70,10 +70,37 @@ endfunction()
 set(TO_HRL_PATH ${CMAKE_CURRENT_LIST_DIR})
 
 function(generate_hrl out_file def_name in_file)
+    if(AVM_DISABLE_JIT)
+        # For non-JIT builds, use the base file
+        set(selected_file ${in_file})
+    else()
+        # For JIT builds, determine the architecture-specific file
+        get_filename_component(base_name ${in_file} NAME_WE)
+        get_filename_component(base_ext ${in_file} EXT)
+        get_filename_component(base_dir ${in_file} DIRECTORY)
+
+        # Check if it's a .avm file (pack) or .beam file
+        if(base_ext STREQUAL ".avm")
+            # For .avm files: name.avm -> name-arch.avm
+            if(base_dir)
+                set(selected_file ${base_dir}/${base_name}-${AVM_JIT_TARGET_ARCH}${base_ext})
+            else()
+                set(selected_file ${base_name}-${AVM_JIT_TARGET_ARCH}${base_ext})
+            endif()
+        else()
+            # For .beam files: name.beam -> arch/name.beam
+            if(base_dir)
+                set(selected_file ${base_dir}/${AVM_JIT_TARGET_ARCH}/${base_name}${base_ext})
+            else()
+                set(selected_file ${AVM_JIT_TARGET_ARCH}/${base_name}${base_ext})
+            endif()
+        endif()
+    endif()
+
     add_custom_command(
         OUTPUT ${out_file}
-        COMMAND escript ${TO_HRL_PATH}/to_hrl.erl ${in_file} ${def_name} ${out_file}
-        DEPENDS ${in_file}
+        COMMAND escript ${TO_HRL_PATH}/to_hrl.erl ${selected_file} ${def_name} ${out_file}
+        DEPENDS ${selected_file}
         COMMENT "Generating ${out_file}"
     )
 endfunction()

tests/erlang_tests/code_load/CMakeLists.txt

@@ -37,9 +37,7 @@ set(code_load_deps
     code_load_pack_data.hrl
 )
 if(NOT AVM_DISABLE_JIT)
-    generate_hrl(export_test_module_data_${AVM_JIT_TARGET_ARCH}.hrl EXPORT_TEST_MODULE_DATA_${AVM_JIT_TARGET_ARCH} ${AVM_JIT_TARGET_ARCH}/export_test_module.beam)
-    generate_hrl(code_load_pack_data_${AVM_JIT_TARGET_ARCH}.hrl CODE_LOAD_PACK_DATA_${AVM_JIT_TARGET_ARCH} code_load_pack-${AVM_JIT_TARGET_ARCH}.avm)
-    set(code_load_deps ${code_load_deps} export_test_module_data_${AVM_JIT_TARGET_ARCH}.hrl code_load_pack_data_${AVM_JIT_TARGET_ARCH}.hrl jit)
+    set(code_load_deps ${code_load_deps} jit)
 endif()
 
 add_custom_target(code_load_files DEPENDS ${code_load_deps})

tests/erlang_tests/test_add_avm_pack_binary.erl

@@ -22,24 +22,10 @@
 
 -export([start/0]).
 
--ifdef(AVM_DISABLE_JIT).
 -include("code_load/code_load_pack_data.hrl").
 
 load_pack_data() ->
     ?CODE_LOAD_PACK_DATA.
--else.
--if(?AVM_JIT_TARGET_ARCH == aarch64).
--include("code_load/code_load_pack_data_aarch64.hrl").
-
-load_pack_data() ->
-    ?CODE_LOAD_PACK_DATA_aarch64.
--elif(?AVM_JIT_TARGET_ARCH == x86_64).
--include("code_load/code_load_pack_data_x86_64.hrl").
-
-load_pack_data() ->
-    ?CODE_LOAD_PACK_DATA_x86_64.
--endif.
--endif.
 
 start() ->
     Bin = load_pack_data(),

tests/erlang_tests/test_close_avm_pack.erl

@@ -22,29 +22,10 @@
 
 -export([start/0]).
 
--ifdef(AVM_DISABLE_JIT).
 -include("code_load/code_load_pack_data.hrl").
 
 load_pack_data() ->
     ?CODE_LOAD_PACK_DATA.
--else.
--if(?AVM_JIT_TARGET_ARCH == aarch64).
--include("code_load/code_load_pack_data_aarch64.hrl").
-
-load_pack_data() ->
-    ?CODE_LOAD_PACK_DATA_aarch64.
--elif(?AVM_JIT_TARGET_ARCH == x86_64).
--include("code_load/code_load_pack_data_x86_64.hrl").
-
-load_pack_data() ->
-    ?CODE_LOAD_PACK_DATA_x86_64.
--else.
--include("code_load/code_load_pack_data_x86_64.hrl").
-
-load_pack_data() ->
-    ?CODE_LOAD_PACK_DATA_x86_64.
--endif.
--endif.
 
 start() ->
     Bin = load_pack_data(),

tests/erlang_tests/test_code_load_binary.erl

@@ -22,24 +22,10 @@
 
 -export([start/0]).
 
--ifdef(AVM_DISABLE_JIT).
 -include("code_load/export_test_module_data.hrl").
 
 export_test_module_data() ->
     ?EXPORT_TEST_MODULE_DATA.
--else.
--if(?AVM_JIT_TARGET_ARCH == aarch64).
--include("code_load/export_test_module_data_aarch64.hrl").
-
-export_test_module_data() ->
-    ?EXPORT_TEST_MODULE_DATA_aarch64.
--elif(?AVM_JIT_TARGET_ARCH == x86_64).
--include("code_load/export_test_module_data_x86_64.hrl").
-
-export_test_module_data() ->
-    ?EXPORT_TEST_MODULE_DATA_x86_64.
--endif.
--endif.
 
 start() ->
     Bin = export_test_module_data(),