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.

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

[microTVM] Update Zephyr 2.5 #7786

Merged
merged 22 commits into from
Apr 4, 2021
Merged

Conversation

mehrdadh
Copy link
Member

@mehrdadh mehrdadh commented Apr 1, 2021

This PR makes these changes:

  • Updates zephyr project on reference virtual machine setup files to 2.5
  • Updates zephyr SDK to 12.3
  • Adjust required changes to pass zephyr tests on qemu_x86, nucleo and NRF board

Note: tlcpack/zephyr reference machine will have a new release soon based on these changes.

@mehrdadh
Copy link
Member Author

mehrdadh commented Apr 1, 2021

cc @areusch @gromero

@areusch areusch self-assigned this Apr 2, 2021
Copy link
Contributor

@areusch areusch left a comment

Choose a reason for hiding this comment

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

thanks @mehrdadh !

@areusch
Copy link
Contributor

areusch commented Apr 2, 2021

NOTE: 9941632 passed ci-docker-staging, the pr-merge failure remains identical between 9941632 and 9ffd377, and Vagrantfile changes have no bearing on CI

@areusch
Copy link
Contributor

areusch commented Apr 2, 2021

@mehrdadh ah that's right, can't override the CI even though we're quite sure this won't break. I think the easiest way around this is to try and fix the build error. I think the issue is k_heap_aligned_alloc doesn't exist in 2.4.0; turns out, we don't need to use that because the docs for sys_heap_alloc say:

The allocated memory is guaranteed to have a starting
 * address which is a multiple of sizeof(void *).  If a bigger alignment
 * is necessary then sys_heap_aligned_alloc() should be used instead.
 *

so, want to try changing to k_heap_alloc and see if it passes?

@mehrdadh
Copy link
Member Author

mehrdadh commented Apr 2, 2021

@areusch changed it.

@mehrdadh
Copy link
Member Author

mehrdadh commented Apr 4, 2021

@areusch I think you already approved this. Does it need another reviewer to approve?

@areusch
Copy link
Contributor

areusch commented Apr 4, 2021

@mehrdadh nah we should be good. let's merge this.

@areusch areusch merged commit 2f109a7 into apache:main Apr 4, 2021
@mehrdadh mehrdadh deleted the update-zephyr-2.5 branch April 9, 2021 18:23
trevor-m pushed a commit to trevor-m/tvm that referenced this pull request May 6, 2021
* update to zephyr 2.5

* unbreak test_zephyr

* fix stack size

* always create packer.log

* add qemu debugging

* fix transport with debug false

* size down ring buf, shouldn't need to be so large

* update to zephyr 2.5

* fix buffer size

* cleanup

* cleanup

* remove debugger

* nit

* update ci script

* remove debug mode

* fix packer log

* comment

* update ci_qemu

* change zephyr version on Vagrant

* make it compatible to zephyr 2.4

Co-authored-by: Andrew Reusch <areusch@octoml.ai>
trevor-m pushed a commit to trevor-m/tvm that referenced this pull request May 6, 2021
* update to zephyr 2.5

* unbreak test_zephyr

* fix stack size

* always create packer.log

* add qemu debugging

* fix transport with debug false

* size down ring buf, shouldn't need to be so large

* update to zephyr 2.5

* fix buffer size

* cleanup

* cleanup

* remove debugger

* nit

* update ci script

* remove debug mode

* fix packer log

* comment

* update ci_qemu

* change zephyr version on Vagrant

* make it compatible to zephyr 2.4

Co-authored-by: Andrew Reusch <areusch@octoml.ai>
trevor-m pushed a commit to trevor-m/tvm that referenced this pull request May 6, 2021
* update to zephyr 2.5

* unbreak test_zephyr

* fix stack size

* always create packer.log

* add qemu debugging

* fix transport with debug false

* size down ring buf, shouldn't need to be so large

* update to zephyr 2.5

* fix buffer size

* cleanup

* cleanup

* remove debugger

* nit

* update ci script

* remove debug mode

* fix packer log

* comment

* update ci_qemu

* change zephyr version on Vagrant

* make it compatible to zephyr 2.4

Co-authored-by: Andrew Reusch <areusch@octoml.ai>
trevor-m pushed a commit to neo-ai/tvm that referenced this pull request May 11, 2021
* update to zephyr 2.5

* unbreak test_zephyr

* fix stack size

* always create packer.log

* add qemu debugging

* fix transport with debug false

* size down ring buf, shouldn't need to be so large

* update to zephyr 2.5

* fix buffer size

* cleanup

* cleanup

* remove debugger

* nit

* update ci script

* remove debug mode

* fix packer log

* comment

* update ci_qemu

* change zephyr version on Vagrant

* make it compatible to zephyr 2.4

Co-authored-by: Andrew Reusch <areusch@octoml.ai>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants