Fix Highway hook: change optarch in pre_prepare_hook and reset it in post_prepare_hook

eb_hooks.py

@@ -116,6 +116,9 @@ def pre_prepare_hook(self, *args, **kwargs):
         print_msg("Updated rpath_override_dirs (to allow overriding MPI family %s): %s",
                   mpi_family, rpath_override_dirs)
 
+    if self.name in PRE_PREPARE_HOOKS:
+        PRE_PREPARE_HOOKS[self.name](self, *args, **kwargs)
+
 
 def post_prepare_hook_gcc_prefixed_ld_rpath_wrapper(self, *args, **kwargs):
     """
@@ -290,26 +293,42 @@ def parse_hook_lammps_remove_deps_for_CI_aarch64(ec, *args, **kwargs):
         raise EasyBuildError("LAMMPS-specific hook triggered for non-LAMMPS easyconfig?!")
 
 
-def parse_hook_highway_handle_test_compilation_issues(ec, eprefix):
+def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwargs):
     """
     Solve issues with compiling or running the tests on both
     neoverse_n1 and neoverse_v1 with Highway 1.0.4 and GCC 12.3.0:
       - for neoverse_n1 we set optarch to GENERIC
       - for neoverse_v1 we completely disable the tests
     cfr. https://github.com/EESSI/software-layer/issues/469
     """
-    if ec.name == 'Highway':
-        tcname, tcversion = ec['toolchain']['name'], ec['toolchain']['version']
+    if self.name == 'Highway':
+        tcname, tcversion = self.toolchain.name, self.toolchain.version
         cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
-        if ec.version in ['1.0.4'] and tcname == 'GCCcore' and tcversion == '12.3.0':
+        # note: keep condition in sync with the one used in 
+        # post_prepare_hook_highway_handle_test_compilation_issues
+        if self.version in ['1.0.4'] and tcname == 'GCCcore' and tcversion == '12.3.0':
             if cpu_target == CPU_TARGET_NEOVERSE_V1:
-                ec.update('configopts', '-DHWY_ENABLE_TESTS=OFF')
+                self.cfg.update('configopts', '-DHWY_ENABLE_TESTS=OFF')
             if cpu_target == CPU_TARGET_NEOVERSE_N1:
+                self.orig_optarch = build_option('optarch')
                 update_build_option('optarch', OPTARCH_GENERIC)
     else:
         raise EasyBuildError("Highway-specific hook triggered for non-Highway easyconfig?!")
 
 
+def post_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwargs):
+    """
+    Post-prepare hook for Highway to reset optarch build option.
+    """
+    if self.name == 'Highway':
+        tcname, tcversion = self.toolchain.name, self.toolchain.version
+        cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
+        # note: keep condition in sync with the one used in 
+        # pre_prepare_hook_highway_handle_test_compilation_issues
+        if self.version in ['1.0.4'] and tcname == 'GCCcore' and tcversion == '12.3.0':
+            if cpu_target == CPU_TARGET_NEOVERSE_N1:
+                update_build_option('optarch', self.orig_optarch)
+
 def pre_configure_hook(self, *args, **kwargs):
     """Main pre-configure hook: trigger custom functions based on software name."""
     if self.name in PRE_CONFIGURE_HOOKS:
@@ -629,16 +648,20 @@ def inject_gpu_property(ec):
     'casacore': parse_hook_casacore_disable_vectorize,
     'CGAL': parse_hook_cgal_toolchainopts_precise,
     'fontconfig': parse_hook_fontconfig_add_fonts,
-    'Highway': parse_hook_highway_handle_test_compilation_issues,
     'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64,
     'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
     'pybind11': parse_hook_pybind11_replace_catch2,
     'Qt5': parse_hook_qt5_check_qtwebengine_disable,
     'UCX': parse_hook_ucx_eprefix,
 }
 
+PRE_PREPARE_HOOKS = {
+    'Highway': pre_prepare_hook_highway_handle_test_compilation_issues,
+}
+
 POST_PREPARE_HOOKS = {
     'GCCcore': post_prepare_hook_gcc_prefixed_ld_rpath_wrapper,
+    'Highway': post_prepare_hook_highway_handle_test_compilation_issues,
 }
 
 PRE_CONFIGURE_HOOKS = {