[CoopVec] Add Linear Algebra common header with tests #7350

bob80905 · 2025-04-15T17:26:54Z

This PR introduces the linear algebra header file, and places it in a location that is by default included in all HLSL compilation.
The builtins in the API aren't yet defined, and depend on the #7290 PR merging first.
The tests that have been added have temporary diagnostic messages while 7290 is in progress. They will need to be updated.
Open to feedback on better / suggested error messages, or whether there shouldn't be any sema-level validation for these errors.

Fixes #7304

tools/clang/lib/Headers/hlsl/linalg.h

tools/clang/test/CodeGenDXIL/hlsl/linalg/make-interp-vec-errors.hlsl

damyanp

I expect we'll need to mark most of these checks as expected to fail.

tools/clang/lib/Headers/hlsl/dx/linalg.h

tools/clang/test/CodeGenDXIL/hlsl/linalg/mat-vec-mul-transpose-errors.hlsl

github-actions · 2025-04-17T21:09:10Z

✅ With the latest revision this PR passed the C/C++ code formatter.

damyanp

A few comments / questions I'd like to get cleared up before approving.

tools/clang/lib/Headers/hlsl/dx/linalg.h

tools/clang/test/CodeGenDXIL/hlsl/linalg/.clang-format

tools/clang/test/CodeGenDXIL/hlsl/linalg/mat-vec-muladd.hlsl

tools/clang/test/CodeGenDXIL/hlsl/linalg/outerproductaccumulate.hlsl

tools/clang/test/CodeGenDXIL/hlsl/linalg/vector-matrix-proposal.hlsl

tools/clang/test/SemaHLSL/hlsl/linalg/outerproductaccumulate-errors.hlsl

damyanp

LGTM, assuming the test runs succeed.

If the proposal example doesn't get executed often then it'll rot. Is there anything we can do to move it somewhere where it runs? If not, then we've got the example in the proposal itself so I don't know if there's much value keeping another copy around in the DXC repo.

damyanp · 2025-04-21T23:41:08Z

examples/LinAlg/vector-matrix-proposal.hlsl

@@ -0,0 +1,143 @@
+// RUN: %dxc -I %hlsl_headers -T lib_6_9 -enable-16bit-types %s


Does this actually get executed during the build?

This location won't run it as a test. I do think it's kind of awkward to keep it given there's a copy in the proposal itself, so I'll just delete it.

…erifier tests, and mark preview todos

llvm-beanz · 2025-04-22T17:14:41Z

tools/clang/test/CodeGenDXIL/hlsl/linalg/vectoraccumulate-errors.hlsl

This is a sema test right?

llvm-beanz · 2025-04-22T17:16:47Z

tools/clang/lib/Headers/hlsl/dx/linalg.h

@@ -0,0 +1,178 @@
+// Header for linear algebra APIs.
+
+#if ((__SHADER_TARGET_MAJOR > 6) ||                                            \


Should we make this header error if it is included when targeting older shader models?
What about targeting SPIRV?

I think it's fine to include the header when the shader is targeting older shader models. The user might have some preprocessor code to use these APIs if 6.9 is available, and to default to a fallback if not.
It is my understanding that whether we're targeting SPIRV or not doesn't matter, the builtins will be lowered to the correct IR regardless.

This is only supported for d3d / dxil (which is why everything is / will be in the dx namespace)

The SPIRV path doesn't generate IR in DXC, it goes straight from the AST to SPIRV, which would likely cause the compiler either to crash or to emit a less-than helpful diagnostic.

Maybe we could add something like this to the top of the file?

#if __spirv__ #error "Cooperative matrix not (yet) supported for SPIRV" #endif

s/matrix/vector

tools/clang/test/SemaHLSL/hlsl/linalg/make-interp-vec-errors.hlsl

llvm-beanz · 2025-04-22T23:06:09Z

tools/clang/lib/Headers/hlsl/dx/linalg.h

+// Header for linear algebra APIs.
+
+#if __spirv__
+#error "Cooperative matrix/vectors not (yet) supported for SPIRV"


Suggested change

#error "Cooperative matrix/vectors not (yet) supported for SPIRV"

#error "Cooperative vectors not (yet) supported for SPIRV"

Sorry for my bad suggestion. Cooperative matrix actually is supported in SPIRV, they have a separate header for it.

llvm-beanz · 2025-04-22T23:06:53Z

tools/clang/test/SemaHLSL/hlsl/linalg/outerproductaccumulate-spirv-errors.hlsl

+// This is a copy of \tools\clang\test\CodeGenDXIL\hlsl\linalg\outerproductaccumulate.hlsl
+// except that spirv is targeted
+
+// expected-error@dx/linalg.h:4{{Cooperative matrix/vectors not (yet) supported for SPIRV}}


Suggested change

// expected-error@dx/linalg.h:4{{Cooperative matrix/vectors not (yet) supported for SPIRV}}

// expected-error@dx/linalg.h:4{{Cooperative vectors not (yet) supported for SPIRV}}

llvm-beanz · 2025-04-22T23:07:26Z

tools/clang/test/SemaHLSL/hlsl/linalg/outerproductaccumulate-spirv-errors.i

This file doesn't seem to belong here.

github-project-automation bot added this to HLSL Roadmap Apr 15, 2025

github-project-automation bot moved this to New in HLSL Roadmap Apr 15, 2025

bob80905 changed the base branch from main to staging-sm6.9 April 15, 2025 17:28

damyanp reviewed Apr 15, 2025

View reviewed changes

tools/clang/lib/Headers/hlsl/linalg.h Outdated Show resolved Hide resolved

damyanp reviewed Apr 15, 2025

View reviewed changes

tools/clang/test/CodeGenDXIL/hlsl/linalg/make-interp-vec-errors.hlsl Outdated Show resolved Hide resolved

damyanp requested changes Apr 15, 2025

View reviewed changes

tools/clang/lib/Headers/hlsl/dx/linalg.h Show resolved Hide resolved

tools/clang/test/CodeGenDXIL/hlsl/linalg/mat-vec-mul-transpose-errors.hlsl Outdated Show resolved Hide resolved

github-project-automation bot moved this from New to In progress in HLSL Roadmap Apr 15, 2025

bob80905 marked this pull request as ready for review April 16, 2025 20:45

bob80905 force-pushed the add_linalg_h branch from decd3e3 to 163dd44 Compare April 17, 2025 21:08

bob80905 force-pushed the add_linalg_h branch 2 times, most recently from aed847d to 0b32642 Compare April 18, 2025 22:28

damyanp reviewed Apr 19, 2025

View reviewed changes

damyanp approved these changes Apr 21, 2025

View reviewed changes

bob80905 and others added 15 commits April 21, 2025 17:15

a start

d3c4249

add missing tests

de0f2ce

update comment

4858fc2

clarify comment

4422d80

fix up this test

34302d6

move header to dx dir, remove all unneeded include directives

6747741

ifdef header, add back includes in test files, with -i option, make v…

ab78c62

…erifier tests, and mark preview todos

add back xfails

9e79c49

use angle brackets

a2b371d

move sema diag verifier tests over to semahlsl dir

a791ede

chore: autopublish 2025-04-17T21:25:10Z

8f950ce

update check line

d987a59

address Damyan

0cf3943

move proposal file

acec5c8

remove proposal file

31629b1

bob80905 force-pushed the add_linalg_h branch from 8ddf514 to 31629b1 Compare April 22, 2025 00:16

llvm-beanz reviewed Apr 22, 2025

View reviewed changes

bob80905 added 2 commits April 22, 2025 11:00

move sema test

6dd0248

add spirv check

7fcd4ff

llvm-beanz reviewed Apr 22, 2025

View reviewed changes

adjust error msg

d81fd22

llvm-beanz approved these changes Apr 27, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CoopVec] Add Linear Algebra common header with tests #7350

[CoopVec] Add Linear Algebra common header with tests #7350

bob80905 commented Apr 15, 2025 •

edited

Loading

damyanp left a comment

github-actions bot commented Apr 17, 2025 •

edited

Loading

damyanp left a comment

damyanp left a comment

damyanp Apr 21, 2025

bob80905 Apr 21, 2025

llvm-beanz Apr 22, 2025

bob80905 Apr 22, 2025

llvm-beanz Apr 22, 2025

bob80905 Apr 22, 2025

damyanp Apr 22, 2025

llvm-beanz Apr 22, 2025

llvm-beanz Apr 22, 2025

damyanp Apr 22, 2025

llvm-beanz Apr 22, 2025

llvm-beanz Apr 22, 2025

llvm-beanz Apr 22, 2025

		@@ -0,0 +1,143 @@
		// RUN: %dxc -I %hlsl_headers -T lib_6_9 -enable-16bit-types %s

		@@ -0,0 +1,178 @@
		// Header for linear algebra APIs.

		#if ((__SHADER_TARGET_MAJOR > 6) \|\| \

	#error "Cooperative matrix/vectors not (yet) supported for SPIRV"
	#error "Cooperative vectors not (yet) supported for SPIRV"

	// expected-error@dx/linalg.h:4{{Cooperative matrix/vectors not (yet) supported for SPIRV}}
	// expected-error@dx/linalg.h:4{{Cooperative vectors not (yet) supported for SPIRV}}

[CoopVec] Add Linear Algebra common header with tests #7350

Are you sure you want to change the base?

[CoopVec] Add Linear Algebra common header with tests #7350

Conversation

bob80905 commented Apr 15, 2025 • edited Loading

damyanp left a comment

Choose a reason for hiding this comment

github-actions bot commented Apr 17, 2025 • edited Loading

damyanp left a comment

Choose a reason for hiding this comment

damyanp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bob80905 commented Apr 15, 2025 •

edited

Loading

github-actions bot commented Apr 17, 2025 •

edited

Loading