Support OpenCL.DebugInfo.100 extended instruction set by dneto0 · Pull Request #3080 · KhronosGroup/SPIRV-Tools

dneto0 · 2019-11-29T17:00:28Z

The interesting bits are:

The extended instruction set adds enum types, with names that overlap with enum types from the older DebugInfo extension. This affects spv_operand_type_t enum values.
So I added a mechanism to prefix the operand-kind names, so distinguish the cases.
The enums from the old DebugInfo are left unprefixed, but we do add a CLDEBUG100_ prefix to the new ones.

dneto0 · 2019-11-29T17:01:02Z

The OpenCL.DebugInfo.100 extended instruction has been ratified by Khronos but is not yet on the SPIR-V registry.

dneto0 · 2019-11-29T17:01:11Z

cc: @AlexeySotkin

dneto0 · 2019-11-29T19:48:34Z

I don't have an active GN setup, so I took a guess at the BUILD.gn changes. Cc: @dj2 @zoddicus

AlexeySotkin · 2019-12-02T10:30:30Z

👍 @dneto0 Thank you very much!

ehsannas · 2019-12-03T18:35:52Z

Is there going to be a header file for the opcodes of this instruction set?
(similar to this for the GLSL ext set.)

dneto0 · 2019-12-03T19:06:34Z

source/extinst.opencl.debuginfo.100.grammar.json

+        { "kind" : "IdRef", "name" : "'Source'" },
+        { "kind" : "LiteralInteger", "name" : "'Version'" },
+        { "kind" : "LiteralInteger", "name" : "'DWARF Version'" }
+      ]


This is missing some fields, (thanks @jaebaek for finding this)

dneto0 · 2019-12-03T22:11:24Z

Hey @jaebaek please take a look now. I think I fixed the operands to all the instructions now.

dneto0 · 2019-12-03T22:38:14Z

Is there going to be a header file for the opcodes of this instruction set?

The build generates an OpenCLDebugInfo.h file in the build output directly.
Ideally all these grammar files would be migrated into the KhronosGroup/SPIRV-Headers repo, and the tooling to generate headers too.

dneto0 · 2019-12-03T22:42:50Z

The generated header file is at this gist: https://gist.github.com/dneto0/a8fe7e0362b817092fde746a97322204

ehsannas · 2019-12-03T22:45:18Z

SG. Thanks!

jaebaek

I want to check test/ext_inst.cldebug100_test.cpp once more, but before doing that, I found 4 mismatches with the OpenCL.100.debug extension spec.

jaebaek · 2019-12-03T22:25:10Z

source/extinst.opencl.debuginfo.100.grammar.json

+    {
+      "opname" : "DebugTypeFunction",
+      "opcode" : 8,
+      "operands" : [


The first operand must be DebugInfoFlags. I mean { "kind" : "DebugInfoFlags", "name" : "'Flags'" }, is missing.

jaebaek · 2019-12-03T22:27:12Z

source/extinst.opencl.debuginfo.100.grammar.json

+        { "kind" : "IdRef", "name" : "'Source'" },
+        { "kind" : "LiteralInteger", "name" : "'Line'" },
+        { "kind" : "LiteralInteger", "name" : "'Column'" },
+        { "kind" : "IdRef", "name" : "'Parent'" },


{ "kind" : "IdRef", "name" : "'Linkage Name'" }, is missing

jaebaek · 2019-12-03T22:35:36Z

source/extinst.opencl.debuginfo.100.grammar.json

+        { "kind" : "IdRef", "name" : "'Source'" },
+        { "kind" : "LiteralInteger", "name" : "'Line'" },
+        { "kind" : "LiteralInteger", "name" : "'Column'" },
+        { "kind" : "IdRef", "name" : "'Parent'" },


{ "kind" : "DebugInfoFlags", "name" : "'Flags'" } is missing

jaebaek · 2019-12-03T22:36:58Z

source/extinst.opencl.debuginfo.100.grammar.json

+    {
+      "opname" : "DebugValue",
+      "opcode" : 29,
+      "operands" : [


{ "kind" : "IdRef", "name" : "'Local Variable'" }, is missing.

dneto0 · 2019-12-03T22:53:14Z

Hi @jaebaek I think you reviewed the old commit. I posted another commit after that. Please take another look.

jaebaek · 2019-12-03T23:05:38Z

Oh, you are right. It looks good to me now.

This CL is blocked on KhronosGroup#3080.

Update version number to 200 revision 2 TODO: Update the contents to match the OpenCL.DebugInfo.100 extension.

Add support for prefixing operand type names, to disambiguate them between different instruction sets.

Also, stop generating core instruction tables for non-unified1 versions of the grammar.

DebugCompilationUnit DebugTypeFunction DebugTypeComposite DebugLocalVariable DebugValue

dneto0 · 2019-12-19T20:15:59Z

Rebased. Keeping the approval.

Roll third_party/glslang/ ebf634b..40801e3 (8 commits) KhronosGroup/glslang@ebf634b...40801e3 $ git log ebf634b..40801e3 --date=short --no-merges --format='%ad %ae %s' 2020-01-06 cepheus Bump revision 2020-01-06 laddoc Add builtin constants 2019-12-26 cepheus HLSL: Fix KhronosGroup#2037: Integer dot used incorrect input for adds. 2019-12-25 laddoc atomic counter offset should align to 4 2019-11-26 laddoc Add support for ARB_uniform_buffer_object 2019-11-26 laddoc Add support for ARB_texture_multisample 2019-11-26 laddoc Add support for ARB_sample_shading 2019-12-20 cepheus Command-line: Give better error messages. From KhronosGroup#1829. Roll third_party/googletest/ 5b162a79d..306f3754a (17 commits) google/googletest@5b162a7...306f375 $ git log 5b162a79d..306f3754a --date=short --no-merges --format='%ad %ae %s' 2019-12-30 absl-team Googletest export 2019-12-30 absl-team Googletest export 2019-12-26 absl-team Googletest export 2019-12-19 absl-team Googletest export 2019-12-18 absl-team Googletest export 2019-12-18 absl-team Googletest export 2019-12-20 kontakt Make move operation noexcept. 2019-12-20 kontakt Define default destructor for test classes 2019-12-20 kontakt Deleted functions as part of public interface 2019-12-20 kontakt Review notes: Return T& from assignment operators 2019-12-17 kontakt Disable move constructor and assignment operator for test classes. 2019-12-16 krzysio Googletest export 2019-12-10 syoussefi Revert "Googletest export": disallow empty prefix 2019-12-10 syoussefi Revert "Googletest export": Remove test for empty prefix 2019-12-16 syoussefi Workaround VS bug w.r.t empty arguments to macros 2019-12-13 kravlala.1 Activate GNU extensions in case of MSYS generator 2019-11-22 krystian.kuzniarek remove stale comments about older GCC versions Roll third_party/re2/ 7470f4d02..00af5b44d (2 commits) google/re2@7470f4d...00af5b4 $ git log 7470f4d02..00af5b44d --date=short --no-merges --format='%ad %ae %s' 2020-01-05 junyer Fix a comment. 2019-12-29 junyer Make DFA use hints. Roll third_party/spirv-cross/ f912c3289..961b9014a (6 commits) KhronosGroup/SPIRV-Cross@f912c32...961b901 $ git log f912c3289..961b9014a --date=short --no-merges --format='%ad %ae %s' 2020-01-06 post Fix Clang warnings. 2020-01-06 post Roll custom versions of isalpha/isalnum. 2020-01-06 post Add test shader for OpCopyLogical with packing/unpacking. 2020-01-06 post Go through access chain path for OpCopyLogical. 2020-01-06 post Basic implementation of OpCopyLogical. 2019-12-21 dm86.jang Add debug prefix on Windows Roll third_party/spirv-tools/ 96354f5..c8bf143 (12 commits) KhronosGroup/SPIRV-Tools@96354f5...c8bf143 $ git log 96354f5..c8bf143 --date=short --no-merges --format='%ad %ae %s' 2020-01-06 dneto GetOperandConstants operand can be const (KhronosGroup#3126) 2019-12-27 dneto Avoid pessimizing std::move (KhronosGroup#3124) 2019-12-27 kburjack Fix typo in validation message (KhronosGroup#3122) 2019-12-27 greg Change default version for CreatInstBindlessCheckPass to 2 (KhronosGroup#3119) 2019-12-20 greg Fix convert-relax-to-half invalid code (KhronosGroup#3099) (KhronosGroup#3106) 2019-12-19 dneto Support OpenCL.DebugInfo.100 extended instruction set (KhronosGroup#3080) 2019-12-19 afdx spirv-fuzz: Always add new globals to entry point interfaces (KhronosGroup#3113) 2019-12-19 afdx spirv-fuzz: Transformation to add a new function to a module (KhronosGroup#3114) 2019-12-19 afdx spirv-fuzz: Avoid passing access chains as parameters (KhronosGroup#3112) 2019-12-18 dneto Add support for SPV_KHR_non_semantic_info (KhronosGroup#3110) 2019-12-16 afdx spirv-fuzz: Transformations to add types, constants and variables (KhronosGroup#3101) 2019-12-16 greg Make Instrumentation format version 2 the default (Step 1) (KhronosGroup#3096) Created with: roll-dep third_party/effcee third_party/glslang third_party/googletest third_party/re2 third_party/spirv-cross third_party/spirv-headers third_party/spirv-tools

dneto0 requested a review from alan-baker November 29, 2019 17:00

dneto0 requested a review from dj2 November 29, 2019 19:48

dneto0 commented Dec 3, 2019

View reviewed changes

dneto0 changed the title ~~Support OpenCL.DebugInfo.100 extended instruction set~~ WIP: Support OpenCL.DebugInfo.100 extended instruction set Dec 3, 2019

jaebaek self-requested a review December 3, 2019 19:21

dneto0 changed the title ~~WIP: Support OpenCL.DebugInfo.100 extended instruction set~~ Support OpenCL.DebugInfo.100 extended instruction set Dec 3, 2019

jaebaek reviewed Dec 3, 2019

View reviewed changes

dneto0 changed the title ~~Support OpenCL.DebugInfo.100 extended instruction set~~ WIP: Support OpenCL.DebugInfo.100 extended instruction set Dec 3, 2019

jaebaek approved these changes Dec 3, 2019

View reviewed changes

jaebaek added a commit to jaebaek/SPIRV-Tools that referenced this pull request Dec 16, 2019

WIP: fix KhronosGroup#3086

e61f2bd

This CL is blocked on KhronosGroup#3080.

jaebaek mentioned this pull request Dec 16, 2019

Handle conflict between debug info and existing validation rule #3104

Merged

dneto0 added 8 commits December 19, 2019 15:10

Clone opencl.debuginfo.100 grammar from debuginfo grammar

b06615f

Update version number to 200 revision 2 TODO: Update the contents to match the OpenCL.DebugInfo.100 extension.

Apply content from OpenCL.DebugInfo.100 extension text

16c6656

Rename grammar file

01667c8

Support OpenCL.DebugInfo.100 extended instructions

029dc7d

Add support for prefixing operand type names, to disambiguate them between different instruction sets.

Add tests for OpenCL.DebugInfo.100

b0f1350

Support lookup of OpenCL.DebugInfo.100 extinst

eadd34f

Fix quantifier

4857e67

Fix extinst lookups

0011002

dneto0 added 8 commits December 19, 2019 15:10

Add tests for enum values

6c93976

Android.mk: support OpenCL.DebugInfo.100 extended instruction set

3e565ea

Also, stop generating core instruction tables for non-unified1 versions of the grammar.

Imported entity operand type is concrete

c11d4b7

Fix include ordering

de17104

Bazel: Suppoort OpenCL.DebugInfo.100

6c9e98d

BUILD.gn: Support OpenCL.DebugInfo.100

ae9623e

Fix operands of several insrtructions

717f281

DebugCompilationUnit DebugTypeFunction DebugTypeComposite DebugLocalVariable DebugValue

dneto0 force-pushed the opencl.debuginfo.100 branch from 3fcf01f to 717f281 Compare December 19, 2019 20:15

dneto0 changed the title ~~WIP: Support OpenCL.DebugInfo.100 extended instruction set~~ Support OpenCL.DebugInfo.100 extended instruction set Dec 19, 2019

dneto0 merged commit 64f36ea into KhronosGroup:master Dec 19, 2019

null77 mentioned this pull request Dec 20, 2019

Build regression in GN from recent commit #3120

Closed

Conversation

dneto0 commented Nov 29, 2019

Uh oh!

dneto0 commented Nov 29, 2019

Uh oh!

dneto0 commented Nov 29, 2019

Uh oh!

dneto0 commented Nov 29, 2019

Uh oh!

AlexeySotkin commented Dec 2, 2019

Uh oh!

ehsannas commented Dec 3, 2019

Uh oh!

dneto0 Dec 3, 2019

Choose a reason for hiding this comment

Uh oh!

dneto0 commented Dec 3, 2019

Uh oh!

dneto0 commented Dec 3, 2019

Uh oh!

dneto0 commented Dec 3, 2019

Uh oh!

ehsannas commented Dec 3, 2019

Uh oh!

jaebaek left a comment

Choose a reason for hiding this comment

Uh oh!

jaebaek Dec 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jaebaek Dec 3, 2019

Choose a reason for hiding this comment

Uh oh!

jaebaek Dec 3, 2019

Choose a reason for hiding this comment

Uh oh!

jaebaek Dec 3, 2019

Choose a reason for hiding this comment

Uh oh!

dneto0 commented Dec 3, 2019

Uh oh!

jaebaek commented Dec 3, 2019

Uh oh!

dneto0 commented Dec 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jaebaek Dec 3, 2019 •

edited

Loading