Merge "Revert "Temporarily disable VMVX targets for person_detection""

quant_models/CMakeLists.txt

diff --git a/quant_models/CMakeLists.txt b/quant_models/CMakeLists.txt
index 3e6d159..fd18344 100644
--- a/quant_models/CMakeLists.txt
+++ b/quant_models/CMakeLists.txt
@@ -45,8 +45,6 @@
     "-riscv-v-fixed-length-vector-lmul-max=8"
 )
 
-# TODO(lundong): Re-enable VMVX after
-# github.com/openxla/iree/issues/12836 is resolved
 springbok_modules(
   NAME
     person_detection
@@ -57,6 +55,7 @@
   FLAGS
     "-iree-input-type=tosa"
     "-riscv-v-fixed-length-vector-lmul-max=8"
+  VMVX
 )
 
 # ------------------------------------------------------------------------------
@@ -229,43 +228,41 @@
     "iree_exec/mobilenet_v2_test.filecheck"
 )
 
-# TODO(lundong): Re-enable VMVX after
-# github.com/openxla/iree/issues/12836 is resolved
-#iree_cc_binary(
-#  NAME
-#    person_detection_bytecode_vmvx
-#  SRCS
-#    "iree_exec/person_detection.c"
-#  DEPS
-#    ::person_detection_bytecode_module_vmvx_c
-#    ::person_detection_quant_input_c
-#    model_util::util_vmvx
-#  LINKOPTS
-#    "LINKER:--defsym=__stack_size__=128k"
-#    "LINKER:--defsym=__heap_size__=200k"
-#  COPTS
-#    "-DBUILD_VMVX"
-#)
-#
-#springbok_test(
-#  NAME
-#    person_detection_emitc_vmvx
-#  SRCS
-#    "iree_exec/person_detection.c"
-#  DEPS
-#    ::person_detection_c_module_vmvx_emitc
-#    ::person_detection_quant_input_c
-#    model_util::util_vmvx
-#  LINKOPTS
-#    "LINKER:--defsym=__stack_size__=128k"
-#    "LINKER:--defsym=__heap_size__=200k"
-#  COPTS
-#    "-DBUILD_EMITC"
-#    "-DBUILD_VMVX"
-#  TESTFILES
-#    "iree_exec/person_detection_vmvx_test.run"
-#    "iree_exec/person_detection_test.filecheck"
-#)
+iree_cc_binary(
+  NAME
+    person_detection_bytecode_vmvx
+  SRCS
+    "iree_exec/person_detection.c"
+  DEPS
+    ::person_detection_bytecode_module_vmvx_c
+    ::person_detection_quant_input_c
+    model_util::util_vmvx
+  LINKOPTS
+    "LINKER:--defsym=__stack_size__=128k"
+    "LINKER:--defsym=__heap_size__=200k"
+  COPTS
+    "-DBUILD_VMVX"
+)
+
+springbok_test(
+  NAME
+    person_detection_emitc_vmvx
+  SRCS
+    "iree_exec/person_detection.c"
+  DEPS
+    ::person_detection_c_module_vmvx_emitc
+    ::person_detection_quant_input_c
+    model_util::util_vmvx
+  LINKOPTS
+    "LINKER:--defsym=__stack_size__=128k"
+    "LINKER:--defsym=__heap_size__=200k"
+  COPTS
+    "-DBUILD_EMITC"
+    "-DBUILD_VMVX"
+  TESTFILES
+    "iree_exec/person_detection_vmvx_test.run"
+    "iree_exec/person_detection_test.filecheck"
+)
 
 iree_cc_binary(
   NAME