[microTVM]Refactor crt_config.h header file generation #13955

mehrdadh · 2023-02-10T23:38:07Z

This PR:

refactors crt_config.h generation to a single template file and use CMake configure_file func to generate in build
Refactor Zephyr.cmake, CRT.cmake and Arduino.cmake to Micro.cmake

tvm-bot · 2023-02-10T23:38:10Z

Thanks for contributing to TVM! Please refer to the contributing guidelines https://tvm.apache.org/docs/contribute/ for useful information and tips. Please request code reviews from Reviewers by @-ing them in a comment.

cc @alanmacd, @gromero, @leandron, @mkatanbaf _{See #10317 for details}

_{Generated by tvm-bot}

mehrdadh · 2023-02-13T21:58:55Z

cc @alanmacd @mkatanbaf for review

alanmacd · 2023-02-14T18:37:36Z

src/runtime/crt/crt_config.h.template

-/*!
- * \file tvm/runtime/crt_config.h.template
- * \brief Template for CRT configuration, to be modified on each target.
+ /*!


nit: something happened with spacing and slashes here

alanmacd · 2023-02-14T18:39:08Z

.gitignore


 # GDB history file
 .gdb_history
+


would it makes sense to output these files into the build/ directory and add that directory as an include instead of putting these files into the source tree?

yeah, I moved all the crt_config.h files under apps/microtvm, just need to figure out the file under src/runtime/micro directory.

cmake/modules/StandaloneCrt.cmake

cmake/modules/Micro.cmake

alanmacd · 2023-02-14T18:47:09Z

apps/microtvm/zephyr/template_project/src/host_driven/main.c

-      if (g_num_bytes_in_rx_buffer > RING_BUF_SIZE_BYTES) {
-        TVMPlatformAbort((tvm_crt_error_t)0xbeef3);
-      }
+      // if (g_num_bytes_in_rx_buffer > RING_BUF_SIZE_BYTES) {


delete commented code if not needed

thanks for catching this, uncommented it.

alanmacd · 2023-02-14T18:49:33Z

apps/bundle_deploy/build_model.py

 import logging
 from tvm.relay.backend import Runtime
 from tvm.contrib import cc as _cc
+from tvm.micro import copy_crt_config_header


does this add a dependency on USE_MICRO being enabled that wasn't here previously, should this be conditional on that?

I think these tests were already executed with the assumption of USE_MICRO=ON
check this file: tests/scripts/task_microtvm_cpp_tests.sh

apps/microtvm/zephyr_cmsisnn/model/convert_labels.py

Add CMake module for crt_config

areusch

thanks @mehrdadh !

mehrdadh force-pushed the micro/refactor_crt_config branch 2 times, most recently from a44ddd3 to bc1d597 Compare February 13, 2023 21:56

mehrdadh marked this pull request as ready for review February 13, 2023 21:56

mehrdadh force-pushed the micro/refactor_crt_config branch from bc1d597 to 788373c Compare February 13, 2023 21:58

mehrdadh force-pushed the micro/refactor_crt_config branch 2 times, most recently from 3963745 to 3b30d57 Compare February 14, 2023 18:23

alanmacd reviewed Feb 14, 2023

View reviewed changes

cmake/modules/StandaloneCrt.cmake Outdated Show resolved Hide resolved

alanmacd reviewed Feb 14, 2023

View reviewed changes

cmake/modules/Micro.cmake Outdated Show resolved Hide resolved

alanmacd reviewed Feb 14, 2023

View reviewed changes

mkatanbaf reviewed Feb 14, 2023

View reviewed changes

apps/microtvm/zephyr_cmsisnn/model/convert_labels.py Outdated Show resolved Hide resolved

mkatanbaf approved these changes Feb 14, 2023

View reviewed changes

mehrdadh force-pushed the micro/refactor_crt_config branch 2 times, most recently from 9650e62 to 9efb455 Compare February 14, 2023 23:17

mehrdadh added 12 commits February 14, 2023 15:25

Refactor microTVM cmake modules

3deb3b2

Add CMake module for crt_config

Change zephyr_cmsis

99020e9

Refactor apps/bundle_deploy

fff4367

remove src/runtime/micro/crt_config

b16daf8

refactor ethosu

93288c6

refactor cmsisnn

7a02bd6

refactor stm

085eb88

add generates files to gitignore

9d74fa9

fix errors

e4f18b3

bring back stm crt_config

0b7e5b1

lint

7561fbd

reuse copy_crt_config_header

e9e93c7

mehrdadh added 7 commits February 14, 2023 15:26

lint

c48633e

fixes after rebase

494ec3d

move crt_config to build directory for apps

005725e

undo comment

cb1bb46

address comments

ae28961

fix apps/bundle

040c755

lint

217ce79

mehrdadh force-pushed the micro/refactor_crt_config branch from 9efb455 to 95131c3 Compare February 15, 2023 00:32

generate crt_config.h for standalone in build directory

da9f700

mehrdadh force-pushed the micro/refactor_crt_config branch from 95131c3 to da9f700 Compare February 15, 2023 00:33

mehrdadh requested a review from alanmacd February 15, 2023 00:33

mehrdadh force-pushed the micro/refactor_crt_config branch from 4e0e6fe to d5bc32a Compare February 15, 2023 17:27

revert unintentional changes

900a023

mehrdadh force-pushed the micro/refactor_crt_config branch from d5bc32a to 900a023 Compare February 15, 2023 17:27

areusch approved these changes Feb 15, 2023

View reviewed changes

alanmacd approved these changes Feb 15, 2023

View reviewed changes

mehrdadh merged commit 1e5a830 into apache:main Feb 15, 2023

mehrdadh deleted the micro/refactor_crt_config branch February 15, 2023 23:30

mehrdadh mentioned this pull request Mar 13, 2023

[microTVM]Gemmini code generation using microTVM #13770

Closed

ysh329 mentioned this pull request Apr 17, 2023

[Release] v0.12.0 Release Candidate Notes #14645

Closed

[microTVM]Refactor crt_config.h header file generation #13955

[microTVM]Refactor crt_config.h header file generation #13955

Uh oh!

Conversation

mehrdadh commented Feb 10, 2023

Uh oh!

tvm-bot commented Feb 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mehrdadh commented Feb 13, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

areusch left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

tvm-bot commented Feb 10, 2023 •

edited

Loading