Merge "Revert "Temporarily disable VMVX targets for person_detection""
diff --git a/float_models/iree_exec/mobilenet_v1.c b/float_models/iree_exec/mobilenet_v1.c
index 04329ee..5a92940 100644
--- a/float_models/iree_exec/mobilenet_v1.c
+++ b/float_models/iree_exec/mobilenet_v1.c
@@ -49,7 +49,7 @@
}
iree_hal_executable_library_query_fn_t library_query(void) {
- return &mobilenet_v1_0_25_224_float_linked_llvm_cpu_library_query;
+ return &llvm_module_linked_llvm_cpu_library_query;
}
iree_status_t load_input_data(const MlModel *model, void **buffer,
diff --git a/quant_models/iree_exec/hps.c b/quant_models/iree_exec/hps.c
index 68cd767..d337ffe 100644
--- a/quant_models/iree_exec/hps.c
+++ b/quant_models/iree_exec/hps.c
@@ -53,7 +53,7 @@
}
iree_hal_executable_library_query_fn_t library_query(void) {
- return &hps_quant_linked_llvm_cpu_library_query;
+ return &llvm_module_linked_llvm_cpu_library_query;
}
iree_status_t load_input_data(const MlModel *model, void **buffer,
diff --git a/quant_models/iree_exec/mobilenet_v1.c b/quant_models/iree_exec/mobilenet_v1.c
index badf53d..1cf0afc 100644
--- a/quant_models/iree_exec/mobilenet_v1.c
+++ b/quant_models/iree_exec/mobilenet_v1.c
@@ -49,7 +49,7 @@
}
iree_hal_executable_library_query_fn_t library_query(void) {
- return &mobilenet_v1_0_25_224_quant_linked_llvm_cpu_library_query;
+ return &llvm_module_linked_llvm_cpu_library_query;
}
iree_status_t load_input_data(const MlModel *model, void **buffer,
diff --git a/quant_models/iree_exec/mobilenet_v1_test.run b/quant_models/iree_exec/mobilenet_v1_test.run
index ad4a1d5..3ccc914 100644
--- a/quant_models/iree_exec/mobilenet_v1_test.run
+++ b/quant_models/iree_exec/mobilenet_v1_test.run
@@ -1,4 +1,3 @@
-// XFAIL: renode
// RUN: ${TEST_RUNNER_CMD} %S/mobilenet_v1_bytecode_static 2>&1 | tee %t
// RUN: cat %t | FileCheck %S/mobilenet_v1_test.filecheck
diff --git a/quant_models/iree_exec/mobilenet_v2.c b/quant_models/iree_exec/mobilenet_v2.c
index e6c09b7..f54d466 100644
--- a/quant_models/iree_exec/mobilenet_v2.c
+++ b/quant_models/iree_exec/mobilenet_v2.c
@@ -49,7 +49,7 @@
}
iree_hal_executable_library_query_fn_t library_query(void) {
- return &mobilenet_v2_1_0_224_quant_linked_llvm_cpu_library_query;
+ return &llvm_module_linked_llvm_cpu_library_query;
}
iree_status_t load_input_data(const MlModel *model, void **buffer,
diff --git a/quant_models/iree_exec/person_detection.c b/quant_models/iree_exec/person_detection.c
index 0edcdcc..d6c9993 100644
--- a/quant_models/iree_exec/person_detection.c
+++ b/quant_models/iree_exec/person_detection.c
@@ -63,7 +63,7 @@
#if !defined(BUILD_VMVX)
iree_hal_executable_library_query_fn_t library_query(void) {
- return &person_detection_linked_llvm_cpu_library_query;
+ return &llvm_module_linked_llvm_cpu_library_query;
}
#endif
diff --git a/quant_models/iree_exec/person_detection_test.run b/quant_models/iree_exec/person_detection_test.run
index fb129f7..6f59441 100644
--- a/quant_models/iree_exec/person_detection_test.run
+++ b/quant_models/iree_exec/person_detection_test.run
@@ -1,4 +1,3 @@
-// XFAIL: renode
// RUN: ${TEST_RUNNER_CMD} %S/person_detection_bytecode_static 2>&1 | tee %t
// RUN: cat %t | FileCheck %S/person_detection_test.filecheck
