Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moving the HAL module shims into iree/vm/. #5532

Merged
merged 3 commits into from
Apr 20, 2021
Merged

Moving the HAL module shims into iree/vm/. #5532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fc4707
Moving aside the emitc shim file for now until we update it.
benvanik Apr 19, 2021
c485143
Moving HAL shims into iree/vm/.
benvanik Apr 19, 2021
6e6ce0a
Fixing IREE_RESTRICT in C++ code.
benvanik Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions iree/base/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ extern "C" {
#define IREE_RESTRICT __restrict
#elif defined(_MSC_VER)
#define IREE_RESTRICT
#elif defined(__cplusplus)
#define IREE_RESTRICT __restrict__
#else
#define IREE_RESTRICT restrict
#endif // _MSC_VER
Expand Down
2 changes: 2 additions & 0 deletions iree/base/attributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
#define IREE_RESTRICT __restrict
#elif defined(_MSC_VER)
#define IREE_RESTRICT
#elif defined(__cplusplus)
#define IREE_RESTRICT __restrict__
#else
#define IREE_RESTRICT restrict
#endif // _MSC_VER
Expand Down
2 changes: 1 addition & 1 deletion iree/compiler/Dialect/VM/Target/C/CModuleTarget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ LogicalResult translateModuleToC(IREE::VM::ModuleOp moduleOp,

printInclude("iree/vm/api.h");
printInclude("iree/vm/ops.h");
printInclude("iree/vm/shims.h");
printInclude("iree/vm/shims_emitc.h");
output << "\n";

printModuleComment(moduleOp, output);
Expand Down
2 changes: 2 additions & 0 deletions iree/hal/local/executable_library.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
#define IREE_RESTRICT __restrict
#elif defined(_MSC_VER)
#define IREE_RESTRICT
#elif defined(__cplusplus)
#define IREE_RESTRICT __restrict__
#else
#define IREE_RESTRICT restrict
#endif // _MSC_VER
Expand Down
2 changes: 0 additions & 2 deletions iree/modules/hal/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ cc_library(
name = "hal",
srcs = [
"hal_module.c",
"shims.c",
"shims.h",
],
hdrs = [
"hal_module.h",
Expand Down
2 changes: 0 additions & 2 deletions iree/modules/hal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ iree_cc_library(
"exports.inl"
SRCS
"hal_module.c"
"shims.c"
"shims.h"
DEPS
iree::base::api
iree::base::tracing
Expand Down
153 changes: 113 additions & 40 deletions iree/modules/hal/hal_module.c
View file
Open in desktop

Large diffs are not rendered by default.

Loading