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

[3/10] Moved TIR generation from Python to C++ for CMSIS-NN #8951

Merged

areusch merged 3 commits into apache:main from ashutosh-arm:tirincpp

Sep 19, 2021

Contributor

ashutosh-arm commented Sep 7, 2021

This PR moves changes from Python to C++ for Softmax via CMSIS-NN. This is a follow up PR to #8833.

It is step 2a in #8646.

ashutosh-arm requested review from anijain2305, areusch, comaniac, jroesch, junrushao, jwfromm, leandron, MarisaKirisame, mbaret, mbrookhart, merrymercy, slyubomirsky, tqchen, trevor-m, vinx13, wweic, yzhliu, zhiics, ZihengJiang and a team as code owners

September 7, 2021 17:07

ashutosh-arm mentioned this pull request

[RFC][Tracking Issue] CMSIS-NN Integration #8646

Closed

ashutosh-arm changed the title ~~[CMSIS-NN] Moved TIR generation from Python to C++~~ [3/10] Moved TIR generation from Python to C++ for CMSIS-NN

ashutosh-arm mentioned this pull request

[2/10] CMSIS-NN code generator for softmax #8833

Merged

Mousius requested changes

View reviewed changes

Member

Mousius left a comment

This approach feels a lot cleaner overall @ashutosh-arm, could you update the PR title to 2a ? 😸

python/tvm/relay/backend/contrib/cmsisnn/codegen.py Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Show resolved Hide resolved

manupak requested changes

View reviewed changes

Contributor

manupak left a comment

Thanks for the PR! I did a pass, see if you agree.

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

python/tvm/relay/backend/contrib/cmsisnn/codegen.py Outdated Show resolved Hide resolved

python/tvm/relay/backend/contrib/cmsisnn/codegen.py Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

ashutosh-arm commented

View reviewed changes

Contributor Author

ashutosh-arm left a comment

Thanks for the quick reviews @Mousius and @manupa-arm .

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

python/tvm/relay/backend/contrib/cmsisnn/codegen.py Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Outdated Show resolved Hide resolved

manupak requested changes

View reviewed changes

Contributor

manupak left a comment

Another round of comments! :)

Sorry for doing this piecemeal.

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Outdated Show resolved Hide resolved


          [CMSIS-NN] Moved TIR Generation to C++

92d77a8

ashutosh-arm force-pushed the tirincpp branch from e2647a4 to 92d77a8 Compare

September 9, 2021 13:14


          Deleted self import for cmsisnn

1cbc7f5

Change-Id: I2cdcd7a90aa4749877c48bc6c7c4d27328856860


          Reusing CodeGenC VistiExpr for softmax

8dd9d13

Change-Id: Ie41b695fa06468cd3b0bfe428c360e98438a9180

Mousius approved these changes

View reviewed changes

Member

Mousius left a comment

One minor point but happy to see it in the follow up.

src/relay/backend/contrib/cmsisnn/codegen_cmsisnn.cc Show resolved Hide resolved

manupak approved these changes

View reviewed changes

Contributor

manupak left a comment

LGTM

areusch requested changes

View reviewed changes

Contributor

areusch left a comment

thanks @ashutosh-arm for the PR, just a couple questions

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/relay_to_tir.cc

+                  Map<String, ObjectRef> dict_attrs;
+                  dict_attrs.Set("global_symbol", func_name_);
+                  dict_attrs.Set("tir.noalias", Bool(true));

Contributor

areusch Sep 16, 2021

i thiiink this is a no-op on c target, but can you explain what you're going for here?

Contributor Author

ashutosh-arm Sep 17, 2021

What is tir.noalias used for? I am not sure. It is being used everywhere in the tests, so I thought it must be something that is being used in TIR passes.

src/relay/backend/contrib/cmsisnn/tir_to_runtime.cc Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/tir_to_runtime.cc Show resolved Hide resolved

src/relay/backend/contrib/cmsisnn/tir_to_runtime.cc Show resolved Hide resolved

Member

Mousius commented Sep 17, 2021

Hi @areusch, I acknowledge your questions but do we need to block the PR on them rather than moving forwards with the integration? I'm sure @ashutosh-arm will honourably follow up in a future PR in this series.

areusch approved these changes

View reviewed changes

Contributor

areusch left a comment

@Mousius @ashutosh-arm ok given this is part of a larger set of PRs belonging to an RFC in-flight, let us merge this and add a follow-up.

areusch merged commit 44b644c into apache:main

AndrewZhaoLuo added a commit to AndrewZhaoLuo/tvm that referenced this pull request


          Merge branch 'main' into aluo/onnx/unsqueeze-alt

3f5e26d

* main:
  [3/10] Moved TIR generation from Python to C++ for CMSIS-NN (apache#8951)
  Support match pvar with dtype constraint (apache#9016)

areusch mentioned this pull request

Add back missing __init__.py to unbreak CI. #9052

Merged

Mousius mentioned this pull request

[Code Style] Changed code to match the tvm code style conventions. #9040

Merged

ylc pushed a commit to ylc/tvm that referenced this pull request


          [3/10] Moved TIR generation from Python to C++ for CMSIS-NN (apache#8951

9c185bd

)

* [CMSIS-NN] Moved TIR Generation to C++

* Deleted self import for cmsisnn

Change-Id: I2cdcd7a90aa4749877c48bc6c7c4d27328856860

* Reusing CodeGenC VistiExpr for softmax

Change-Id: Ie41b695fa06468cd3b0bfe428c360e98438a9180

junrushao mentioned this pull request

Apache TVM v0.8 Release Note Candidate #9416

Closed

ashutosh-arm deleted the tirincpp branch

December 7, 2021 10:09

ylc pushed a commit to ylc/tvm that referenced this pull request


          [3/10] Moved TIR generation from Python to C++ for CMSIS-NN (apache#8951

e67536a

)

* [CMSIS-NN] Moved TIR Generation to C++

* Deleted self import for cmsisnn

Change-Id: I2cdcd7a90aa4749877c48bc6c7c4d27328856860

* Reusing CodeGenC VistiExpr for softmax

Change-Id: Ie41b695fa06468cd3b0bfe428c360e98438a9180

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Mousius Mousius approved these changes

manupak manupak approved these changes

areusch areusch approved these changes

anijain2305 Awaiting requested review from anijain2305

comaniac Awaiting requested review from comaniac

jroesch Awaiting requested review from jroesch

junrushao Awaiting requested review from junrushao

jwfromm Awaiting requested review from jwfromm

leandron Awaiting requested review from leandron

MarisaKirisame Awaiting requested review from MarisaKirisame

mbaret Awaiting requested review from mbaret

mbrookhart Awaiting requested review from mbrookhart

merrymercy Awaiting requested review from merrymercy

slyubomirsky Awaiting requested review from slyubomirsky

tqchen Awaiting requested review from tqchen

trevor-m Awaiting requested review from trevor-m

vinx13 Awaiting requested review from vinx13

wweic Awaiting requested review from wweic

yzhliu Awaiting requested review from yzhliu

zhiics Awaiting requested review from zhiics

ZihengJiang Awaiting requested review from ZihengJiang

Labels

None yet