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

[Lang] Support kernel to return a matrix type value #4062

Merged
merged 79 commits into from
Mar 1, 2022
Merged

[Lang] Support kernel to return a matrix type value #4062

merged 79 commits into from
Mar 1, 2022

Conversation

mzmzm
Copy link
Contributor

@mzmzm mzmzm commented Jan 19, 2022

Related issue = #909

mzmzm and others added 25 commits January 12, 2022 17:54
@mzmzm
change FrontReturnStmt and ReturnStmt arg to support return more values
020a09a
@mzmzm
add frontend support
43645d3
@mzmzm
add llvm backend support
8cecbb6
@mzmzm
code_format
e54ce83
@mzmzm
fix bug
99413f9
@mzmzm
fix bug
cb5d1ab
@mzmzm
fix cpptest no kernel
a754b83
@mzmzm
fix backend expected cpu
be08edf
@taichi-gardener
Auto Format
c9921d2
@mzmzm
fix cc and opengl error
a3471e0
@mzmzm
Merge remote-tracking branch 'origin/matrix_return_type1' into matrix…
24ae27f 
…_return_type1
@mzmzm
fix code_format
77e95c0
@mzmzm
add kernelCTX array support
3b6dc84
@mzmzm
spirv ReturnStmt and code_format
277288c
@mzmzm
opengl support and fix bug
aefdeeb
@mzmzm
opengl pass
5a62706
@mzmzm
code_format
9d89e5f
@mzmzm
cc backend pass
f4f2f23
@mzmzm
cc backend pass(fix bug)
a138b05
@mzmzm
add metal supprot
8bc8f61
@mzmzm
add test file
7953ee4
@mzmzm
code_format
af92533
@mzmzm
remove unused function
14735a5
@mzmzm
Merge branch 'master' into matrix_return_type1
5d0cfa0 
# Conflicts:
#	python/taichi/lang/ast/ast_transformer.py
#	taichi/backends/cc/codegen_cc.cpp
#	taichi/backends/metal/codegen_metal.cpp
#	taichi/backends/opengl/codegen_opengl.cpp
#	taichi/codegen/codegen_llvm.cpp
#	taichi/codegen/spirv/spirv_codegen.cpp
#	taichi/inc/constants.h
#	taichi/ir/statements.h
#	taichi/transforms/lower_ast.cpp
#	taichi/transforms/type_check.cpp
@mzmzm
resolve
2fcd1f6
@vercel
Copy link

vercel bot commented Jan 19, 2022 •
edited
Loading

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/taichi-api-docs-preview/taichi/5AJpZJ3nC1X27PZk1e5LHLeK81QM
✅ Preview: https://taichi-git-fork-mzmzm-matrixreturntype1-taichi-api-docs-preview.vercel.app

[Deployment for df16c95 failed]

@netlify
Copy link

netlify bot commented Jan 19, 2022 •
edited
Loading

✔️ Deploy Preview for docsite-preview ready!

🔨 Explore the source changes: eedfc8b

🔍 Inspect the deploy log: https://app.netlify.com/sites/docsite-preview/deploys/621d8bac25217a000740397c

😎 Browse the preview: https://deploy-preview-4062--docsite-preview.netlify.app

@mzmzm mzmzm mentioned this pull request Jan 19, 2022
Closed
6 tasks
@mzmzm mzmzm marked this pull request as ready for review February 18, 2022 06:15
@mzmzm mzmzm requested review from bobcao3 and strongoier February 18, 2022 06:50
@mzmzm mzmzm assigned mzmzm and unassigned mzmzm Feb 21, 2022
strongoier
strongoier suggested changes Feb 24, 2022
View reviewed changes
tests/python/test_matrix_return.py Show resolved Hide resolved
tests/python/test_matrix_return.py Outdated Show resolved Hide resolved
taichi/python/export_lang.cpp Outdated Show resolved Hide resolved
taichi/ir/type_utils.h Outdated Show resolved Hide resolved
taichi/program/kernel.cpp Outdated Show resolved Hide resolved
taichi/transforms/type_check.cpp Outdated Show resolved Hide resolved
taichi/codegen/codegen_llvm.cpp Outdated Show resolved Hide resolved
taichi/backends/cc/cc_program.cpp Show resolved Hide resolved
@mzmzm mzmzm requested a review from strongoier February 25, 2022 05:14
bobcao3
bobcao3 reviewed Feb 25, 2022
View reviewed changes
taichi/codegen/spirv/spirv_codegen.cpp
spirv::Value buffer_val = ir_->make_value(
spv::OpAccessChain,
ir_->get_storage_pointer_type(ir_->get_primitive_type(dt)),
get_buffer_value(BufferType::Rets, PrimitiveType::i32),
get_buffer_value(BufferType::Rets, dt),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Sorry I don't quite get it here. Why would this be able to return a matrix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now we only support return one value, so if the return type is the matrix, its elements will be involved in stmt->values. Likewise, ctx_attribs_->rets()'s size will always be one. dt is the primitive type of the matrix element. And in the spir-v backend, I use a StructType to include an ArrayType, the matrix will be squeezed to an array when compiling. So to access the element, I change the argument of OpAccessChain, 0,i instead of i.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For the scalar return type, I also use an ArrayType to involve this return value. So I can do the same operations when dealing with matrix and scalar.

strongoier
strongoier reviewed Feb 25, 2022
View reviewed changes
taichi/transforms/type_check.cpp Show resolved Hide resolved
taichi/backends/opengl/codegen_opengl.cpp Show resolved Hide resolved
taichi/codegen/spirv/kernel_utils.cpp Outdated Show resolved Hide resolved
taichi/codegen/spirv/spirv_codegen.cpp Outdated Show resolved Hide resolved
@bobcao3
Copy link
Collaborator

bobcao3 commented Feb 28, 2022

/rerun

mzmzm added 3 commits March 1, 2022 10:45
@mzmzm
revert
56b6e23
@mzmzm
Merge remote-tracking branch 'origin/matrix_return_type1' into matrix…
e74f66d 
…_return_type1

# Conflicts:
#	taichi/codegen/spirv/spirv_codegen.cpp
@mzmzm
revert
baa01b4
@mzmzm
Copy link
Contributor Author

mzmzm commented Mar 1, 2022

/format

strongoier
strongoier approved these changes Mar 1, 2022
View reviewed changes
Copy link
Contributor

@strongoier strongoier left a comment

Choose a reason for hiding this comment

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

LGTM!

@strongoier strongoier merged commit 46fc8f5 into taichi-dev:master Mar 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobcao3 bobcao3 bobcao3 left review comments

@strongoier strongoier strongoier 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.
4 participants
@mzmzm @bobcao3 @strongoier @taichi-gardener