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

Translate VM Function to C Code #2842

Merged
merged 22 commits into from Sep 15, 2020
Merged

Translate VM Function to C Code #2842

merged 22 commits into from Sep 15, 2020

Conversation

simon-camp
Copy link
Contributor

@simon-camp simon-camp commented Aug 11, 2020 •
edited

This is a follow up on #2536 and implements the translation of a vm function as outlined in #1173.

Co-authored-by: Marius Brehler marius.brehler@iml.fraunhofer.de

@google-cla google-cla bot added the cla: yes label Aug 11, 2020
@marbre marbre requested a review from benvanik August 12, 2020 08:51
@simon-camp simon-camp mentioned this pull request Aug 12, 2020
Closed
@marbre
Copy link
Contributor

marbre commented Aug 13, 2020

Rebased onto main and bumped EmitC submodule (now taking into account the changed dialect registration in LLVM as well as Simon's changes).

@marbre marbre mentioned this pull request Aug 26, 2020
Closed
@marbre
Copy link
Contributor

marbre commented Sep 11, 2020

Rebased onto main to make Ben's changes introduced with #3091 available and updated the EmitC submodule.

simon-camp and others added 17 commits September 14, 2020 14:27
@simon-camp @marbre
Translate vm function to c function
3129c29 
This partly reuses the emitc translation
@simon-camp @marbre
Use interleave functions from emitc target to cleanup code
1b9d4fe
@simon-camp @marbre
Fix format
23334c3
@marbre
Update EmitC submodule
86e5ddb
@marbre
Update EmitC submodule
191ea6f
@simon-camp @marbre
Add example to show what needs to be generated by the vm to c target
910cd95
@simon-camp @marbre
Add prefix to function name and fix argument names
fb3a9e4
@simon-camp @marbre
Support multiple modules and add some structuring comments to the output
c522106
@simon-camp @marbre
Generate import/export tables and module descriptor
a65f31b
@simon-camp @marbre
Move test to iree/samples
c5e6edb
@simon-camp @marbre
Use autogenerated header in test
d2863bb
@simon-camp @marbre
Mock internal function calls and fix test fixture
5f728a0
@marbre
Refactor the add_module_test header
5071f09 
This is required due to the calling convention introduced in the native
module. We still need to fix the CModuleTarget to generate the correct
code automatically, which is currently hand-written and embedded into
the header.
@marbre
Auto-generate function count and ptr for module descriptor
9966bc6
@marbre
Correct include path
650823c
@marbre
Renable inclusion of auto-generated code
0308310
@marbre
Add CMake Todo
50b942b
@simon-camp simon-camp marked this pull request as ready for review September 15, 2020 12:27
@simon-camp
Copy link
Contributor Author

We added a unit test, which uses (parts of) the generated header. Missing parts will be added in follow up PRs.

benvanik
benvanik requested changes Sep 15, 2020
View reviewed changes
Copy link
Collaborator

@benvanik benvanik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

other than shuffling a file this looks great!

iree/compiler/Dialect/VM/Target/C/vm_c_funcs.h Outdated
@@ -0,0 +1,22 @@
// Copyright 2020 Google LLC
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should move this into iree/vm/; that way all code that is being cross-compiled for targets is not dependent on anything under iree/compiler/ (and you could, in theory, not have iree/compiler/ set up in your build system at all after the code has been generated)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion! I shuffled the file and the build passes locally. Thus, I would appreciate if you could merge the PR if the build pipeline I just triggered passes.

@benvanik benvanik merged commit a398c96 into iree-org:main Sep 15, 2020
@ScottTodd ScottTodd mentioned this pull request Sep 16, 2020
Closed
copybara-service bot pushed a commit that referenced this pull request Sep 16, 2020
@ScottTodd @iree-copybara-bot
Merge main -> google
ac40509 
* 903f809 Script to update to llvm syncpoint (#3155)
* a398c96 Translate VM Function to C Code (#2842)
* f941efb Multistage docker containers with RBE swiftshader support (#3065)
* b7d5710 [spirv] Extract common SPIR-V target functionalities out (NFC) (#3140)
* f5fe759 Use generated function to compute number of workgroups to be launched. (#3095)
* b89191c Merge google -> main (#3143)

COPYBARA_INTEGRATE_REVIEW=#3160 from ScottTodd:main-to-google 903f809
PiperOrigin-RevId: 331891580
ScottTodd added a commit that referenced this pull request Sep 16, 2020
@ScottTodd
Merge main -> google
fbda1cb 
* 903f809 Script to update to llvm syncpoint (#3155)
* a398c96 Translate VM Function to C Code (#2842)
* f941efb Multistage docker containers with RBE swiftshader support (#3065)
* b7d5710 [spirv] Extract common SPIR-V target functionalities out (NFC) (#3140)
* f5fe759 Use generated function to compute number of workgroups to be launched. (#3095)
* b89191c Merge google -> main (#3143)

COPYBARA_INTEGRATE_REVIEW=#3160 from ScottTodd:main-to-google 903f809
PiperOrigin-RevId: 331891580
@marbre marbre deleted the vm-to-cmodule-func-header branch September 16, 2020 04:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marbre marbre marbre left review comments

@benvanik benvanik benvanik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@simon-camp @marbre @benvanik @iree-kokoro-bot