[llvm] [SPIR-V] Add OpUntypedVariableLengthArrayINTEL support for SPV_INTEL_variable_length_array (PR #224756)

[Qi Ye via llvm-commits]

================
@@ -1,27 +1,37 @@
 ; Modified from: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/test/extensions/INTEL/SPV_INTEL_variable_length_array/basic.ll
 
 ; RUN: not llc -O0 -mtriple=spirv32-unknown-unknown %s -o %t.spvt 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
-; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv32-unknown-unknown --spirv-ext=+SPV_INTEL_variable_length_array %s -o - | FileCheck %s --check-prefix=CHECK-SPIRV
+; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv32-unknown-unknown --spirv-ext=+SPV_INTEL_variable_length_array %s -o - | FileCheck %s --check-prefixes=CHECK-COMMON,CHECK-SPIRV
 ; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown --spirv-ext=+SPV_INTEL_variable_length_array %s -o - -filetype=obj | spirv-val %}
 
+; TODO: currently spirv-val mistakenly rejects Element Type as operand of OpUntypedVariableLengthArrayINTEL. Re-enable spirv-val once it's fixed.
+; RUNx: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown --spirv-ext=+SPV_INTEL_variable_length_array,+SPV_KHR_untyped_pointers %s -o - -filetype=obj | spirv-val %}
+; RUN: not llc -O0 -mtriple=spirv32-unknown-unknown --spirv-ext=+SPV_KHR_untyped_pointers %s -o %t.spvt 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
+; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv32-unknown-unknown --spirv-ext=+SPV_INTEL_variable_length_array,+SPV_KHR_untyped_pointers %s -o - | FileCheck %s --check-prefixes=CHECK-COMMON,CHECK-SPIRV-UNTYPED
+
 ; CHECK-ERROR: LLVM ERROR: array allocation: this instruction requires the following SPIR-V extension: SPV_INTEL_variable_length_array
 
-; CHECK-SPIRV: Capability VariableLengthArrayINTEL
-; CHECK-SPIRV: Extension "SPV_INTEL_variable_length_array"
+; CHECK-COMMON: Capability VariableLengthArrayINTEL
+; CHECK-SPIRV-UNTYPED: Capability UntypedVariableLengthArrayINTEL
+; CHECK-COMMON-DAG: Extension "SPV_INTEL_variable_length_array"
+; CHECK-SPIRV-UNTYPED-DAG: Extension "SPV_KHR_untyped_pointers"
 
-; CHECK-SPIRV-DAG: OpName %[[Len:.*]] "a"
-; CHECK-SPIRV-DAG: %[[Long:.*]] = OpTypeInt 64 0
-; CHECK-SPIRV-DAG: %[[Int:.*]] = OpTypeInt 32 0
+; CHECK-COMMON-DAG: OpName %[[Len:.*]] "a"
+; CHECK-COMMON-DAG: %[[Long:.*]] = OpTypeInt 64 0
+; CHECK-COMMON-DAG: %[[Int:.*]] = OpTypeInt 32 0
 ; CHECK-SPIRV-DAG: %[[Char:.*]] = OpTypeInt 8 0
 ; CHECK-SPIRV-DAG: %[[CharPtr:.*]] = OpTypePointer {{[a-zA-Z]+}} %[[Char]]
 ; CHECK-SPIRV-DAG: %[[IntPtr:.*]] = OpTypePointer {{[a-zA-Z]+}} %[[Int]]
-; CHECK-SPIRV: %[[Len]] = OpFunctionParameter %[[Long:.*]]
-; CHECK-SPIRV: %[[SavedMem1:.*]] = OpSaveMemoryINTEL %[[CharPtr]]
+; CHECK-SPIRV-UNTYPED-DAG: %[[CharPtr:.*]] = OpTypeUntypedPointerKHR Function
+; CHECK-COMMON: %[[Len]] = OpFunctionParameter %[[Long]]
+; CHECK-COMMON: %[[SavedMem1:.*]] = OpSaveMemoryINTEL %[[CharPtr]]
 ; CHECK-SPIRV: OpVariableLengthArrayINTEL %[[IntPtr]] %[[Len]]
-; CHECK-SPIRV: OpRestoreMemoryINTEL %[[SavedMem1]]
-; CHECK-SPIRV: %[[SavedMem2:.*]] = OpSaveMemoryINTEL %[[CharPtr]]
+; CHECK-SPIRV-UNTYPED: OpUntypedVariableLengthArrayINTEL %[[CharPtr]] %[[Int]] %[[Len]]
----------------
Qi-Ye-079 wrote:

Good idea. Added a testcase for struct here in vararr.ll, should be enough for coverage.

https://github.com/llvm/llvm-project/pull/224756