commit 075a7018825bebf108e5dc3f5d1d8c07140f930b
author Lun Dong <lundong@google.com> Thu Dec 15 16:46:09 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 15 16:46:09 2022 +0000
tree 5cbef4a2fe93353f48f18d16aecc3030bfb23aef
parent be87a174da71d213ed0bff298482109f26d47e73

Revert "Disable person_detection VMVX compilation"

This reverts commit be87a174da71d213ed0bff298482109f26d47e73.

Reason for revert: upstream bug has been fixed.

Change-Id: I9b5b3c3bffb1b0bad73a75cdebf4190229cd6fc6
BUG: 262578831

quant_models/CMakeLists.txt

diff --git a/quant_models/CMakeLists.txt b/quant_models/CMakeLists.txt
index 868940e..6dba090 100644
--- a/quant_models/CMakeLists.txt
+++ b/quant_models/CMakeLists.txt
@@ -61,8 +61,7 @@
     "-iree-input-type=tosa"
     "-riscv-v-vector-bits-min=512"
     "-riscv-v-fixed-length-vector-lmul-max=8"
-# TODO(b/262578831): Temporarily disable VMVX targets
-#  VMVX
+  VMVX
   PUBLIC
 )
 
@@ -234,44 +233,43 @@
     "iree_exec/mobilenet_v2_test.filecheck"
 )
 
-# TODO(b/262578831): Temporarily disable VMVX targets
-#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
-#    iree::vm::bytecode_module
-#    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
+    iree::vm::bytecode_module
+    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_static