-
Notifications
You must be signed in to change notification settings - Fork 266
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
Add Intel specific definitions from https://github.com/KhronosGroup/S… #150
Add Intel specific definitions from https://github.com/KhronosGroup/S… #150
Conversation
51de426
to
66d9b4e
Compare
66d9b4e
to
5125824
Compare
There are several definitions, that are not presenting in spirv.core.grammar.json, like RayFlagsShift which were removed after headers generation. Was it to be expected? |
{ | ||
"opname" : "OpReadPipeBlockingINTEL", | ||
"class" : "Pipe", | ||
"opcode" : 5946, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm concerned about continuing to create gaps here. See issue #151. I think you have all the intervening consecutive opcodes reserved.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The gaps will be partially filled when https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/SPIRV/SPV_INTEL_function_pointers.asciidoc and https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/SPIRV/SPV_INTEL_inline_assembly.asciidoc are published here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nevermind, this particular gap won't be filled by these extensions.
5125824
to
35b581c
Compare
Left only json changes excluding generated headers. |
Could you revisit this? Look at avoiding gaps (there was a comment about that), resolve conflicts. Did you want me to generated the headers? |
I'll take a look what can be done to avoid the gaps now. The problem here is that the values present in https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/master/lib/SPIRV/libSPIRV/spirv.hpp as is. Regarding the headers generation - I can do it myself, was just a little bit confused, that several definitions disappeared, see my comment from above. |
I just rebuilt headers from your other commit, a few minutes ago. It all seemed consistent and okay. It is okay if I build headers. One thing we want to do is reuse enumerant values (from other enums) for the opcodes. If you have any reserved that have been used for other enums, feel free to reuse them for instructions also. |
List of extensions: SPV_INTEL_fpga_memory_attributes https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_fpga_memory_attributes.asciidoc SPV_INTEL_kernel_attributes https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_kernel_attributes.asciidoc SPV_INTEL_fpga_reg https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_fpga_reg.asciidoc SPV_INTEL_blocking_pipes https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_blocking_pipes.asciidoc SPV_INTEL_fpga_loop_controls https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_fpga_loop_controls.asciidoc SPV_INTEL_unstructured_loop_controls https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_unstructured_loop_controls.asciidoc Signed-off-by: Dmitry Sidorov <[email protected]>
35b581c
to
dfa87b6
Compare
Got it. Currently we are filling the op codes interval from 5568 to 5631 with following extensions: will come to the mentioned in this PR gap in the future. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems a couple things need to be fixed.
{ | ||
"opname" : "OpSubgroupAvcSicGetInterRawSadsINTEL", | ||
"class" : "@exclude", | ||
"opcode" : 5816, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems this created two OpSubgroupAvcSicGetInterRawSadsINTEL
. Is one supposed to be an alias, or we can have just one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suppose it's an artifact appeared after rebase, removed.
}, | ||
{ | ||
"enumerant" : "KernelAttributesINTEL", | ||
"value" : 5892, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want to keep these in numerical order.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, thanks!
Signed-off-by: Dmitry Sidorov <[email protected]>
BTW, what are the rules for updating PRs in this repository? Shall fixes be amended into the original commit before updating, or it's OK to have commits, like: "Apply suggestions" and this commits will be squashed during the merge? |
Something like this should go into the repo as a single commit. I'll squash when I remember. It is sometimes important to see feedback addressed as a separate commit, just for efficiency, but better to not have that jitter in master history. Force pushing the PR is okay, when you want to control how the actual history will look. This one is okay as it is now. |
…PIRV-LLVM-Translator
List of extensions:
SPV_INTEL_fpga_memory_attributes
https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_fpga_memory_attributes.asciidoc
SPV_INTEL_kernel_attributes
https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_kernel_attributes.asciidoc
SPV_INTEL_fpga_reg
https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_fpga_reg.asciidoc
SPV_INTEL_blocking_pipes
https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_blocking_pipes.asciidoc
SPV_INTEL_fpga_loop_controls
https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_fpga_loop_controls.asciidoc
SPV_INTEL_unstructured_loop_controls
https://github.com/KhronosGroup/SPIRV-Registry/blob/master/extensions/INTEL/SPV_INTEL_unstructured_loop_controls.asciidoc
Signed-off-by: Dmitry Sidorov [email protected]