[CIR] Use `-verify` on clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl by Men-cotton · Pull Request #182817 · llvm/llvm-project

Men-cotton · 2026-02-23T08:36:00Z

Update clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl to use -verify with expected CIR NYI diagnostics.

llvmbot · 2026-02-23T08:36:32Z

@llvm/pr-subscribers-clangir

@llvm/pr-subscribers-clang

Author: Akimasa Watanuki (Men-cotton)

Changes

In ScalarExprEmitter::VisitCastExpr, guard CK_VectorSplat so cir::VecSplatOp is only created for a valid scalar value.

Update clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl to use -verify with expected CIR NYI diagnostics.

Full diff: https://github.com/llvm/llvm-project/pull/182817.diff

2 Files Affected:

(modified) clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp (+4-1)
(modified) clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl (+6-6)

diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
index d523aa2fdb737..e5f17d720ee86 100644
--- a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
@@ -2371,9 +2371,12 @@ mlir::Value ScalarExprEmitter::VisitCastExpr(CastExpr *ce) {
   case CK_VectorSplat: {
     // Create a vector object and fill all elements with the same scalar value.
     assert(destTy->isVectorType() && "CK_VectorSplat to non-vector type");
+    mlir::Value scalar = Visit(subExpr);
+    if (!scalar)
+      return {};
     return cir::VecSplatOp::create(builder,
                                    cgf.getLoc(subExpr->getSourceRange()),
-                                   cgf.convertType(destTy), Visit(subExpr));
+                                   cgf.convertType(destTy), scalar);
   }
   case CK_FunctionToPointerDecay:
     return cgf.emitLValue(subExpr).getPointer();
diff --git a/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl b/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl
index 279075a6dab60..f3c6d1fefd1f0 100644
--- a/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl
+++ b/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl
@@ -1,8 +1,8 @@
-// RUN: not %clang_cc1 -x hlsl -finclude-default-header -triple spirv-unknown-vulkan-compute %s \
-// RUN:   -fclangir -emit-cir -disable-llvm-passes 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -x hlsl -finclude-default-header -triple spirv-unknown-vulkan-compute %s \
+// RUN:   -fclangir -emit-cir -disable-llvm-passes -verify
 
-// CHECK: ClangIR code gen Not Yet Implemented: processing of type: ConstantMatrix
-float1 test_zero_indexed(float2x2 M) { 
-  // CHECK: ClangIR code gen Not Yet Implemented: ScalarExprEmitter: matrix element
-  return M._m00; 
+// expected-error@*:* {{ClangIR code gen Not Yet Implemented: processing of type: ConstantMatrix}}
+float1 test_zero_indexed(float2x2 M) {
+  // expected-error@+1 {{ClangIR code gen Not Yet Implemented: ScalarExprEmitter: matrix element}}
+  return M._m00;
 }

Men-cotton · 2026-02-23T09:05:39Z

The motivation behind this PR is to resolve the following error seen in recent CI checks:

Exit Code: 1

Command Output (stdout):
--
# RUN: at line 1
not /home/gha/actions-runner/_work/llvm-project/llvm-project/build/bin/clang -cc1 -internal-isystem /home/gha/actions-runner/_work/llvm-project/llvm-project/build/lib/clang/23/include -nostdsysteminc -x hlsl -finclude-default-header -triple spirv-unknown-vulkan-compute /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl    -fclangir -emit-cir -disable-llvm-passes 2>&1 | /home/gha/actions-runner/_work/llvm-project/llvm-project/build/bin/FileCheck /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl
# executed command: not /home/gha/actions-runner/_work/llvm-project/llvm-project/build/bin/clang -cc1 -internal-isystem /home/gha/actions-runner/_work/llvm-project/llvm-project/build/lib/clang/23/include -nostdsysteminc -x hlsl -finclude-default-header -triple spirv-unknown-vulkan-compute /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl -fclangir -emit-cir -disable-llvm-passes
# note: command had no output on stdout or stderr
# error: command failed with exit status: 1
# executed command: /home/gha/actions-runner/_work/llvm-project/llvm-project/build/bin/FileCheck /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl
# note: command had no output on stdout or stderr

--

erichkeane

Note I merged a fix for this test yesterday as well that was to just update the test to use float instead of float1, so it doesn't fail.

However, the 'crash' we're hitting is because of an NYI. And this fix just 'passes' the failure onto the caller of this, and will cause the same problems elsewhere.

IMO, we don't want to be doing this.

erichkeane · 2026-02-24T15:40:56Z

    // Create a vector object and fill all elements with the same scalar value.
    assert(destTy->isVectorType() && "CK_VectorSplat to non-vector type");
+    mlir::Value scalar = Visit(subExpr);
+    if (!scalar)


THIS is something that should never happen, right? It only does because we're not yet implemented. IMO, we shouldn't introduce a branch that should go away later.

erichkeane · 2026-02-24T15:41:09Z

-float test_zero_indexed(float2x2 M) { 
-  // CHECK: ClangIR code gen Not Yet Implemented: ScalarExprEmitter: matrix element
-  return M._m00; 
+// expected-error@*:* {{ClangIR code gen Not Yet Implemented: processing of type: ConstantMatrix}}


This is probably not a bad change either.

farzonl · 2026-02-24T15:46:05Z

Approved for the test change. The rest should be reviewed by a CIR developer

github-actions · 2026-02-24T15:55:16Z

🐧 Linux x64 Test Results

115352 tests passed
4049 tests skipped

✅ The build succeeded and all tests passed.

Men-cotton · 2026-02-25T12:09:29Z

I've reverted the CK_VectorSplat patch. The PR is now scoped solely to cleaning up the test by using -verify.

I noticed there are other tests in clang/test/CIR still relying on the 2>&1 redirection pattern: https://github.com/search?q=repo%3Allvm%2Fllvm-project+%222%3E%261%22+path%3A%2F%5Eclang%5C%2Ftest%5C%2FCIR%5C%2F%2F&type=code

I'm happy to clean those up as well if you'd like. Or, if this cleanup isn't necessary right now, I just close this PR.

erichkeane · 2026-02-25T14:05:53Z

I've reverted the CK_VectorSplat patch. The PR is now scoped solely to cleaning up the test by using -verify.

I noticed there are other tests in clang/test/CIR still relying on the 2>&1 redirection pattern: https://github.com/search?q=repo%3Allvm%2Fllvm-project+%222%3E%261%22+path%3A%2F%5Eclang%5C%2Ftest%5C%2FCIR%5C%2F%2F&type=code

I'm happy to clean those up as well if you'd like. Or, if this cleanup isn't necessary right now, I just close this PR.

There is likely value in cleaning those up as well.

…-load.hlsl (llvm#182817) Update clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl to use `-verify` with expected CIR NYI diagnostics.

[CIR] Guard CK_VectorSplat on failed scalar emission

11e6a21

Men-cotton requested review from andykaylor, bcardosolopes, lanza and xlauko as code owners February 23, 2026 08:36

llvmbot added clang Clang issues not falling into any other category ClangIR Anything related to the ClangIR project labels Feb 23, 2026

Merge branch 'main' into Men-cotton/matrix-element-expr-load

1ef03dd

Men-cotton requested review from AmrDeveloper, erichkeane and farzonl February 24, 2026 15:34

farzonl approved these changes Feb 24, 2026

View reviewed changes

erichkeane reviewed Feb 24, 2026

View reviewed changes

Men-cotton added 2 commits February 25, 2026 20:43

revert the change on CIRGenExprScalar.cpp

a19edee

add an error match

3272bd4

Men-cotton changed the title ~~[CIR] Guard CK_VectorSplat on failed scalar emission~~ [CIR] Use -verify on clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl Feb 25, 2026

erichkeane approved these changes Feb 25, 2026

View reviewed changes

andykaylor approved these changes Feb 25, 2026

View reviewed changes

Men-cotton merged commit d72e95b into llvm:main Feb 28, 2026
10 checks passed

Men-cotton deleted the Men-cotton/matrix-element-expr-load branch February 28, 2026 04:12

Men-cotton mentioned this pull request Feb 28, 2026

[CIR] Use -verify on clang/test/CIR/CodeGen/nonzeroinit-struct.cpp #183910

Merged

ampandey-1995 mentioned this pull request Apr 15, 2026

[X86] regenerate fcopysign test checks (#183710) ampandey-1995/llvm-project#4

Closed

ampandey-1995 mentioned this pull request Apr 15, 2026

[X86] regenerate fcopysign test checks (#183710) ampandey-1995/llvm-project#5

Closed

Navigation Menu

[CIR] Use `-verify` on clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl - #182817

[CIR] Use `-verify` on clang/test/CIR/CodeGenHLSL/matrix-element-expr-load.hlsl#182817
Men-cotton merged 4 commits into
llvm:mainfrom
Men-cotton:Men-cotton/matrix-element-expr-load

Men-cotton commented Feb 23, 2026 •

edited

Loading

Uh oh!

llvmbot commented Feb 23, 2026 •

edited

Loading

Uh oh!

Men-cotton commented Feb 23, 2026

Uh oh!

erichkeane left a comment

Uh oh!

erichkeane Feb 24, 2026

Uh oh!

AmrDeveloper Feb 24, 2026

Uh oh!

erichkeane Feb 24, 2026

Uh oh!

farzonl commented Feb 24, 2026

Uh oh!

github-actions Bot commented Feb 24, 2026 •

edited

Loading

Uh oh!

Men-cotton commented Feb 25, 2026 •

edited

Loading

Uh oh!

erichkeane commented Feb 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

Men-cotton commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Men-cotton commented Feb 23, 2026

Uh oh!

erichkeane left a comment

Choose a reason for hiding this comment

Uh oh!

erichkeane Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

AmrDeveloper Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

erichkeane Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

farzonl commented Feb 24, 2026

Uh oh!

github-actions Bot commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🐧 Linux x64 Test Results

Uh oh!

Men-cotton commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

erichkeane commented Feb 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Men-cotton commented Feb 23, 2026 •

edited

Loading

llvmbot commented Feb 23, 2026 •

edited

Loading

github-actions Bot commented Feb 24, 2026 •

edited

Loading

Men-cotton commented Feb 25, 2026 •

edited

Loading