Reenable inlineHAL VMVX targets Reenable inlineHAL VMVX targets as upstream issue has been fixed. Change-Id: Ia63a69faa36c70f97bad7a107f420cc108036862
diff --git a/cmake/springbok_modules.cmake b/cmake/springbok_modules.cmake index 206374c..ba3c6bc 100644 --- a/cmake/springbok_modules.cmake +++ b/cmake/springbok_modules.cmake
@@ -79,8 +79,6 @@ EMITC ) - # TODO(lundong): Re-enable InlineHAL VMVX after - # github.com/openxla/iree/issues/12620 is resolved if (${_RULE_VMVX}) springbok_vmvx_module( NAME @@ -91,6 +89,7 @@ "${_RULE_C_IDENTIFIER}_bytecode_module_vmvx" FLAGS "${_RULE_FLAGS}" + "${_INLINE_HAL_ARG}" ) springbok_vmvx_module( @@ -100,6 +99,7 @@ "${_RULE_SRC}" FLAGS "${_RULE_FLAGS}" + "${_INLINE_HAL_ARG}" EMITC ) endif()
diff --git a/samples/simple_vec_mul/CMakeLists.txt b/samples/simple_vec_mul/CMakeLists.txt index 31a0060..071461f 100644 --- a/samples/simple_vec_mul/CMakeLists.txt +++ b/samples/simple_vec_mul/CMakeLists.txt
@@ -4,8 +4,6 @@ # https://github.com/llvm/llvm-project/blob/0eeab8b/llvm/lib/Target/RISCV/RISCVSubtarget.cpp#L30-L51 #------------------------------------------------------------------------------- -# TODO(lundong): Re-enable InlineHAL VMVX after -# github.com/openxla/iree/issues/12620 is resolved springbok_modules( NAME simple_float_mul @@ -51,8 +49,6 @@ # # to increase it. -# TODO(lundong): Re-enable InlineHAL VMVX after -# github.com/openxla/iree/issues/12620 is resolved iree_cc_binary( NAME simple_float_vec_mul_bytecode_vmvx @@ -60,7 +56,7 @@ "float_vec.c" DEPS ::simple_float_mul_bytecode_module_vmvx_c - model_util::util_vmvx + model_util::util_vmvx_inline LINKOPTS "LINKER:--defsym=__stack_size__=20k" COPTS @@ -74,7 +70,7 @@ "float_vec.c" DEPS ::simple_float_mul_c_module_vmvx_emitc - model_util::util_vmvx + model_util::util_vmvx_inline LINKOPTS "LINKER:--defsym=__stack_size__=20k" COPTS @@ -111,8 +107,6 @@ "-DBUILD_EMITC" ) -# TODO(lundong): Re-enable InlineHAL VMVX after -# github.com/openxla/iree/issues/12620 is resolved iree_cc_binary( NAME simple_int_vec_mul_bytecode_vmvx @@ -120,7 +114,7 @@ "int_vec.c" DEPS ::simple_int_mul_bytecode_module_vmvx_c - model_util::util_vmvx + model_util::util_vmvx_inline LINKOPTS "LINKER:--defsym=__stack_size__=20k" COPTS @@ -134,7 +128,7 @@ "int_vec.c" DEPS ::simple_int_mul_c_module_vmvx_emitc - model_util::util_vmvx + model_util::util_vmvx_inline LINKOPTS "LINKER:--defsym=__stack_size__=20k" COPTS