Renaming check module.
diff --git a/iree/modules/check/BUILD b/iree/modules/check/BUILD
index 20caac1..7edc3f9 100644
--- a/iree/modules/check/BUILD
+++ b/iree/modules/check/BUILD
@@ -10,11 +10,28 @@
licenses = ["notice"], # Apache 2.0
)
+cc_library(
+ name = "check",
+ testonly = True,
+ srcs = ["module.cc"],
+ hdrs = ["module.h"],
+ deps = [
+ "//iree/base",
+ "//iree/base:status",
+ "//iree/base/internal",
+ "//iree/hal",
+ "//iree/modules/hal",
+ "//iree/testing:gtest",
+ "//iree/vm",
+ "//iree/vm:cc",
+ ],
+)
+
cc_test(
name = "check_test",
srcs = ["check_test.cc"],
deps = [
- ":native_module",
+ ":check",
"//iree/base",
"//iree/base:logging",
"//iree/base:status",
@@ -30,20 +47,3 @@
"//iree/vm:cc",
],
)
-
-cc_library(
- name = "native_module",
- testonly = True,
- srcs = ["native_module.cc"],
- hdrs = ["native_module.h"],
- deps = [
- "//iree/base",
- "//iree/base:status",
- "//iree/base/internal",
- "//iree/hal",
- "//iree/modules/hal",
- "//iree/testing:gtest",
- "//iree/vm",
- "//iree/vm:cc",
- ],
-)
diff --git a/iree/modules/check/CMakeLists.txt b/iree/modules/check/CMakeLists.txt
index f391497..479f8fc 100644
--- a/iree/modules/check/CMakeLists.txt
+++ b/iree/modules/check/CMakeLists.txt
@@ -6,6 +6,26 @@
iree_add_all_subdirs()
+iree_cc_library(
+ NAME
+ check
+ HDRS
+ "module.h"
+ SRCS
+ "module.cc"
+ DEPS
+ iree::base
+ iree::base::internal
+ iree::base::status
+ iree::hal
+ iree::modules::hal
+ iree::testing::gtest
+ iree::vm
+ iree::vm::cc
+ TESTONLY
+ PUBLIC
+)
+
# Doesn't use bazel_to_cmake because IREE_HAL_DRIVER_VMVX filtering is custom logic
if(${IREE_HAL_DRIVER_VMVX})
iree_cc_test(
@@ -14,7 +34,7 @@
SRCS
"check_test.cc"
DEPS
- ::native_module
+ ::check
iree::base
iree::base::internal
iree::base::internal::span
@@ -30,24 +50,3 @@
iree::vm::cc
)
endif()
-
-
-iree_cc_library(
- NAME
- native_module
- HDRS
- "native_module.h"
- SRCS
- "native_module.cc"
- DEPS
- iree::base
- iree::base::internal
- iree::base::status
- iree::hal
- iree::modules::hal
- iree::testing::gtest
- iree::vm
- iree::vm::cc
- TESTONLY
- PUBLIC
-)
diff --git a/iree/modules/check/check_test.cc b/iree/modules/check/check_test.cc
index 730ba58..30c5e9c 100644
--- a/iree/modules/check/check_test.cc
+++ b/iree/modules/check/check_test.cc
@@ -17,7 +17,7 @@
#include "iree/base/status.h"
#include "iree/hal/api.h"
#include "iree/hal/vmvx/registration/driver_module.h"
-#include "iree/modules/check/native_module.h"
+#include "iree/modules/check/module.h"
#include "iree/modules/hal/module.h"
#include "iree/testing/gtest.h"
#include "iree/testing/status_matchers.h"
diff --git a/iree/modules/check/native_module.cc b/iree/modules/check/module.cc
similarity index 99%
rename from iree/modules/check/native_module.cc
rename to iree/modules/check/module.cc
index 1c01b71..2a14530 100644
--- a/iree/modules/check/native_module.cc
+++ b/iree/modules/check/module.cc
@@ -4,8 +4,6 @@
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#include "iree/modules/check/native_module.h"
-
#include <cassert>
#include <cmath>
#include <cstdint>
@@ -21,6 +19,7 @@
#include "iree/base/internal/math.h"
#include "iree/base/status.h"
#include "iree/hal/api.h"
+#include "iree/modules/check/module.h"
#include "iree/modules/hal/module.h"
#include "iree/testing/gtest.h"
#include "iree/vm/native_module_cc.h"
diff --git a/iree/modules/check/native_module.h b/iree/modules/check/module.h
similarity index 81%
rename from iree/modules/check/native_module.h
rename to iree/modules/check/module.h
index 7155c05..5264b49 100644
--- a/iree/modules/check/native_module.h
+++ b/iree/modules/check/module.h
@@ -4,8 +4,8 @@
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#ifndef IREE_MODULES_CHECK_NATIVE_MODULE_H_
-#define IREE_MODULES_CHECK_NATIVE_MODULE_H_
+#ifndef IREE_MODULES_CHECK_MODULE_H_
+#define IREE_MODULES_CHECK_MODULE_H_
#include <stdint.h>
@@ -24,4 +24,4 @@
} // extern "C"
#endif // __cplusplus
-#endif // IREE_MODULES_CHECK_NATIVE_MODULE_H_
+#endif // IREE_MODULES_CHECK_MODULE_H_
diff --git a/iree/tools/BUILD b/iree/tools/BUILD
index e352642..c8a25ff 100644
--- a/iree/tools/BUILD
+++ b/iree/tools/BUILD
@@ -52,7 +52,7 @@
"//iree/base/internal:flags",
"//iree/hal",
"//iree/hal/drivers",
- "//iree/modules/check:native_module",
+ "//iree/modules/check",
"//iree/modules/hal",
"//iree/testing:gtest",
"//iree/tools/utils:vm_util",
diff --git a/iree/tools/CMakeLists.txt b/iree/tools/CMakeLists.txt
index ebd07e7..f979904 100644
--- a/iree/tools/CMakeLists.txt
+++ b/iree/tools/CMakeLists.txt
@@ -93,7 +93,7 @@
iree::base::tracing
iree::hal
iree::hal::drivers
- iree::modules::check::native_module
+ iree::modules::check
iree::modules::hal
iree::testing::gtest
iree::tools::utils::vm_util
diff --git a/iree/tools/iree-check-module-main.cc b/iree/tools/iree-check-module-main.cc
index 90aadc0..b2a65b5 100644
--- a/iree/tools/iree-check-module-main.cc
+++ b/iree/tools/iree-check-module-main.cc
@@ -21,7 +21,7 @@
#include "iree/base/tracing.h"
#include "iree/hal/api.h"
#include "iree/hal/drivers/init.h"
-#include "iree/modules/check/native_module.h"
+#include "iree/modules/check/module.h"
#include "iree/modules/hal/module.h"
#include "iree/testing/gtest.h"
#include "iree/testing/status_matchers.h"
