Merge from 'sycl' to 'sycl-web'

Author: iclsrc

.github/workflows/sycl-detect-changes.yml

@@ -6,6 +6,9 @@ on:
       filters:
         description: Matched filters
         value: ${{ jobs.need_check.outputs.filters }}
+      arc_tests:
+        description: Tests to run on Arc
+        value: ${{ jobs.need_check.outputs.arc_tests }}
 
 jobs:
   need_check:
@@ -16,6 +19,7 @@ jobs:
     timeout-minutes: 3
     outputs:
       filters: ${{ steps.result.outputs.result }}
+      arc_tests: ${{ steps.arc_tests.outputs.arc_tests }}
     steps:
       - name: Check file changes
         uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd
@@ -57,6 +61,19 @@ jobs:
               - devops/scripts/install_drivers.sh
             perf-tests:
               - sycl/test-e2e/PerformanceTests/**
+            esimd:
+              - 'llvm/lib/SYCLLowerIR/ESIMD/**'
+              - 'llvm/lib/SYCLLowerIR/LowerInvokeSimd.cpp'
+              - 'llvm/include/llvm/SYCLLowerIR/LowerInvokeSimd.h'
+              - 'sycl/include/std/experimental/simd.hpp'
+              - 'sycl/include/std/experimental/simd.hpp'
+              - 'sycl/include/sycl/ext/intel/esimd.hpp'
+              - 'sycl/include/sycl/ext/intel/esimd/**'
+              - 'sycl/include/sycl/ext/intel/esimd.hpp'
+              - 'sycl/include/sycl/ext/intel/experimental/esimd/**'
+              - 'sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp'
+              - 'sycl/include/sycl/ext/oneapi/experimental/detail/invoke_simd_types.hpp'
+              - 'sycl/test-e2e/(ESIMD|InvokeSimd)/**'
 
       - name: Set output
         id: result
@@ -69,6 +86,15 @@ jobs:
               return '${{ steps.changes.outputs.changes }}';
             }
             // Treat everything as changed for huge PRs.
-            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci"];
+            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci", "esimd"];
 
       - run: echo '${{ steps.result.outputs.result }}'
+
+      - name: Set Arc tests
+        id: arc_tests
+        run: |
+          if [ "${{ contains(steps.result.outputs.result, 'esimd') }}" == "true" ]; then
+            echo 'arc_tests="(ESIMD|InvokeSimd|Matrix)/"' >> "$GITHUB_OUTPUT"
+          else
+            echo 'arc_tests="Matrix/"' >> "$GITHUB_OUTPUT"
+          fi

.github/workflows/sycl-linux-precommit.yml

@@ -68,15 +68,15 @@ jobs:
             reset_gpu: true
             install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
             extra_lit_opts: --param gpu-intel-gen12=True
-          - name: Matrix E2E tests on Intel Arc A-Series Graphics
+          - name: E2E tests on Intel Arc A-Series Graphics
             runner: '["Linux", "arc"]'
             image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
             image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
             target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
             reset_gpu: true
             install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
             extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
-            env: '{"LIT_FILTER":"Matrix/"}'
+            env: '{"LIT_FILTER":${{ needs.detect_changes.outputs.arc_tests }} }'
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}

llvm-spirv/include/LLVMSPIRVOpts.h

@@ -54,6 +54,7 @@ class IntrinsicInst;
 
 namespace SPIRV {
 
+/// SPIR-V versions known to translator.
 enum class VersionNumber : uint32_t {
   // See section 2.3 of SPIR-V spec: Physical Layout of a SPIR_V Module and
   // Instruction
@@ -62,10 +63,9 @@ enum class VersionNumber : uint32_t {
   SPIRV_1_2 = 0x00010200,
   SPIRV_1_3 = 0x00010300,
   SPIRV_1_4 = 0x00010400,
-  // TODO: populate this enum with the latest versions (up to 1.5) once
-  // translator get support of corresponding features
+  SPIRV_1_5 = 0x00010500,
   MinimumVersion = SPIRV_1_0,
-  MaximumVersion = SPIRV_1_4
+  MaximumVersion = SPIRV_1_5
 };
 
 inline constexpr std::string_view formatVersionNumber(uint32_t Version) {
@@ -80,6 +80,8 @@ inline constexpr std::string_view formatVersionNumber(uint32_t Version) {
     return "1.3";
   case static_cast<uint32_t>(VersionNumber::SPIRV_1_4):
     return "1.4";
+  case static_cast<uint32_t>(VersionNumber::SPIRV_1_5):
+    return "1.5";
   }
   return "unknown";
 }

llvm-spirv/lib/SPIRV/VectorComputeUtil.cpp

@@ -20,6 +20,7 @@ _SPIRV_OP(InvalidInstruction, "Can't translate llvm instruction:\n")
 _SPIRV_OP(InvalidWordCount,
           "Can't encode instruction with word count greater than 65535:\n")
 _SPIRV_OP(Requires1_1, "Feature requires SPIR-V 1.1 or greater:")
+_SPIRV_OP(RequiresVersion, "Cannot fulfill SPIR-V version restriction:\n")
 _SPIRV_OP(RequiresExtension,
           "Feature requires the following SPIR-V extension:\n")
 _SPIRV_OP(InvalidMagicNumber,

llvm-spirv/lib/SPIRV/VectorComputeUtil.h

@@ -154,10 +154,6 @@ SPIRVInstruction::getOperandTypes(const std::vector<SPIRVValue *> &Ops) {
   return Tys;
 }
 
-std::vector<SPIRVType *> SPIRVInstruction::getOperandTypes() {
-  return getOperandTypes(getOperands());
-}
-
 void SPIRVImageInstBase::setOpWords(const std::vector<SPIRVWord> &OpsArg) {
   std::vector<SPIRVWord> Ops = OpsArg;
 

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVErrorEnum.h

@@ -128,7 +128,6 @@ class SPIRVInstruction : public SPIRVValue {
   SPIRVInstruction *getPrevious() const { return BB->getPrevious(this); }
   SPIRVInstruction *getNext() const { return BB->getNext(this); }
   virtual std::vector<SPIRVValue *> getOperands();
-  std::vector<SPIRVType *> getOperandTypes();
   static std::vector<SPIRVType *>
   getOperandTypes(const std::vector<SPIRVValue *> &Ops);
 

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVInstruction.cpp

@@ -58,6 +58,18 @@
 
 namespace SPIRV {
 
+namespace {
+std::string to_string(uint32_t Version) {
+  std::string Res(formatVersionNumber(Version));
+  Res += " (" + std::to_string(Version) + ")";
+  return Res;
+}
+
+std::string to_string(VersionNumber Version) {
+  return to_string(static_cast<uint32_t>(Version));
+}
+} // Anonymous namespace
+
 SPIRVModule::SPIRVModule()
     : AutoAddCapability(true), ValidateCapability(false), IsValid(true) {}
 
@@ -173,7 +185,16 @@ class SPIRVModuleImpl : public SPIRVModule {
   void insertEntryNoId(SPIRVEntry *Entry) override { EntryNoId.insert(Entry); }
 
   void setSPIRVVersion(SPIRVWord Ver) override {
-    assert(this->isAllowedToUseVersion(static_cast<VersionNumber>(Ver)));
+    if (!this->isAllowedToUseVersion(static_cast<VersionNumber>(Ver))) {
+      std::stringstream SS;
+      SS << "SPIR-V version was restricted to at most "
+         << to_string(getMaximumAllowedSPIRVVersion())
+         << " but a construct from the input requires SPIR-V version "
+         << to_string(Ver) << " or above\n";
+      getErrorLog().checkError(false, SPIRVEC_RequiresVersion, SS.str());
+      setInvalid();
+      return;
+    }
     SPIRVVersion = Ver;
   }
 
@@ -2098,16 +2119,6 @@ void SPIRVModuleImpl::addUnknownStructField(SPIRVTypeStruct *Struct, unsigned I,
   UnknownStructFieldMap[Struct].push_back(std::make_pair(I, ID));
 }
 
-static std::string to_string(uint32_t Version) {
-  std::string Res(formatVersionNumber(Version));
-  Res += " (" + std::to_string(Version) + ")";
-  return Res;
-}
-
-static std::string to_string(VersionNumber Version) {
-  return to_string(static_cast<uint32_t>(Version));
-}
-
 std::istream &operator>>(std::istream &I, SPIRVModule &M) {
   SPIRVDecoder Decoder(I, M);
   SPIRVModuleImpl &MI = *static_cast<SPIRVModuleImpl *>(&M);

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVInstruction.h

@@ -72,4 +72,4 @@ attributes #0 = { noinline norecurse nounwind optnone "correctly-rounded-divide-
 !12 = !DISubroutineType(types: !13)
 !13 = !{!14}
 !14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!15 = !DILocation(line: 2, column: 3, scope: !10)
+!15 = !DILocation(line: 2, column: 3, scope: !10)

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVModule.cpp

@@ -58,4 +58,4 @@ attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"
 !13 = !{!14}
 !14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
 !15 = !{}
-!16 = !DILocation(line: 1, column: 13, scope: !10)
+!16 = !DILocation(line: 1, column: 13, scope: !10)

llvm-spirv/test/DebugInfo/DebugInfoChecksum.ll

@@ -13,4 +13,4 @@ target triple = "spir64-unknown-unknown"
 define spir_func i1 @f(float %0) {
  %2 = fcmp false float %0, %0
  ret i1 %2
-}
+}

llvm-spirv/test/DebugInfo/DebugInfoTypeBasic.ll

@@ -31,4 +31,4 @@ define weak_odr dso_local spir_kernel void @foo() {
 entry:
   %0 = call spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 0) #0
  ret void
-}
+}

llvm-spirv/test/DebugInfo/NonSemantic/Shader200/InlineNamespace.ll

@@ -29,4 +29,4 @@ define weak_odr dso_local spir_kernel void @foo() {
 entry:
   %0 = load i64, ptr addrspace(1) @__spirv_BuiltInWorkgroupId, align 32
  ret void
-}
+}

llvm-spirv/test/FCmpFalse.ll

@@ -40,4 +40,4 @@ define double @f1(double %a) {
   ret double %3
 }
 
-declare double @llvm.arithmetic.fence.f64(double)
+declare double @llvm.arithmetic.fence.f64(double)

llvm-spirv/test/builtin-functions.ll

@@ -593,4 +593,4 @@ attributes #4 = { nounwind }
 ; CHECK-LLVM: ![[MD_NF]] = distinct !{![[MD_NF]], ![[MD_nofusion:[0-9]+]]}
 ; CHECK-LLVM: ![[MD_nofusion]] = !{!"llvm.loop.fusion.disable"}
 ; CHECK-LLVM: ![[MD_MRD]] = distinct !{![[MD_MRD]], ![[MD_max_reinvocation_delay:[0-9]+]]}
-; CHECK-LLVM: ![[MD_max_reinvocation_delay]] = !{!"llvm.loop.intel.max_reinvocation_delay.count", i32 2}
+; CHECK-LLVM: ![[MD_max_reinvocation_delay]] = !{!"llvm.loop.intel.max_reinvocation_delay.count", i32 2}

llvm-spirv/test/builtin-globals.ll

@@ -74,4 +74,4 @@ attributes #0 = { nounwind sspstrong "correctly-rounded-divide-sqrt-fp-math"="fa
 !opencl.compiler.options = !{!1}
 
 !0 = !{i32 1, i32 2}
-!1 = !{}
+!1 = !{}

llvm-spirv/test/extensions/INTEL/SPV_INTEL_arithmetic_fence/arithmetic_fence.ll

@@ -40,4 +40,4 @@ attributes #0 = { "foo" }
 attributes #1 = { "bar"="baz" }
 
 ; CHECK-SPIRV-EXT-DISABLED: RequiresExtension: Feature requires the following SPIR-V extension:
-; CHECK-SPIRV-EXT-DISABLED-NEXT: SPV_KHR_non_semantic_info
+; CHECK-SPIRV-EXT-DISABLED-NEXT: SPV_KHR_non_semantic_info

llvm-spirv/test/extensions/INTEL/SPV_INTEL_fpga_loop_controls/FPGALoopMergeInst.ll

@@ -44,4 +44,4 @@ ret void
 !4 = !{!5, !6}
 !5 = !{i32 0, i32 2}
 !6 = !{i32 0, i32 8}
-!7 = !{!6}
+!7 = !{!6}

llvm-spirv/test/extensions/INTEL/SPV_INTEL_function_pointers/global_ctor_dtor.ll

@@ -25,4 +25,4 @@ attributes #1 = { nounwind readnone speculatable willreturn }
 !llvm.ident = !{!1}
 
 !0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git 68e1a8d20795802077987529e1268c184d749564)"}
+!1 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git 68e1a8d20795802077987529e1268c184d749564)"}

llvm-spirv/test/extensions/KHR/SPV_KHR_non_semantic_info/preserve-all-function-attributes.ll

@@ -54,4 +54,4 @@ entry:
   store <8 x i1> %0, ptr addrspace(1) @G.2, align 1
 ; CHECK-LLVM: store <8 x i1> [[TRUNC_2]], ptr addrspace(1) @G.2, align 1
   ret void
-}
+}

llvm-spirv/test/extensions/KHR/SPV_KHR_non_semantic_info/preserve-all-function-metadata.ll

@@ -0,0 +1,44 @@
+; Check whether the translator reports an error for a module that uses a
+; construct only available in a SPIR-V version that's higher than what was
+; requested using --spirv-max-version.
+
+; RUN: llvm-as < %s -o %t.bc
+; RUN: not llvm-spirv --spirv-max-version=1.0 %t.bc 2>&1 | FileCheck %s
+; RUN: not llvm-spirv --spirv-max-version=1.1 %t.bc 2>&1 | FileCheck %s
+; RUN: not llvm-spirv --spirv-max-version=1.2 %t.bc 2>&1 | FileCheck %s
+; RUN: llvm-spirv --spirv-max-version=1.3 %t.bc -o %t.spv
+; RUN: spirv-val %t.spv
+
+; CHECK: RequiresVersion: Cannot fulfill SPIR-V version restriction:
+; CHECK-NEXT: SPIR-V version was restricted to at most 1.{{[012]}} ([[#]]) but a construct from the input requires SPIR-V version 1.3 (66304) or above
+
+; ModuleID = 'foo.bc'
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
+target triple = "spir64"
+
+; Function Attrs: convergent
+declare dso_local spir_func <4 x i32> @_Z16sub_group_balloti(i32) local_unnamed_addr #1
+
+; Function Attrs: nounwind
+define dso_local spir_kernel void @testVersionReq() local_unnamed_addr #0 !kernel_arg_addr_space !3 !kernel_arg_access_qual !3 !kernel_arg_type !3 !kernel_arg_base_type !3 !kernel_arg_type_qual !3 {
+entry:
+  %1 = tail call spir_func <4 x i32> @_Z16sub_group_balloti(i32 0) #1
+  ret void
+}
+
+attributes #0 = { nounwind }
+attributes #1 = { convergent }
+
+!spirv.MemoryModel = !{!0}
+!opencl.enable.FP_CONTRACT = !{}
+!spirv.Source = !{!1}
+!opencl.spir.version = !{!0}
+!opencl.ocl.version = !{!0}
+!opencl.used.extensions = !{!2}
+!opencl.used.optional.core.features = !{!2}
+!spirv.Generator = !{!2}
+
+!0 = !{i32 1, i32 2}
+!1 = !{i32 3, i32 102000}
+!2 = !{}
+!3 = !{}

llvm-spirv/test/llvm-intrinsics/nearbyint.ll

@@ -1,4 +1,4 @@
-119734787 66816 393230 12 0
+119734787 67072 393230 12 0
 2 Capability Addresses
 2 Capability Kernel
 5 ExtInstImport 1 "OpenCL.std"
@@ -29,5 +29,4 @@
 
 ; RUN: not llvm-spirv %s -to-binary -o - 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
 ;
-; CHECK-ERROR: Invalid SPIR-V module: unsupported SPIR-V version number 'unknown (66816)'. Range of supported/known SPIR-V versions is 1.0 (65536) - 1.4 (66560)
-
+; CHECK-ERROR: Invalid SPIR-V module: unsupported SPIR-V version number 'unknown (67072)'. Range of supported/known SPIR-V versions is 1.0 (65536) - 1.5 (66816)

llvm-spirv/test/lshr_shl_i1_regularize.ll

@@ -29,6 +29,4 @@
 
 ; RUN: not llvm-spirv %s -to-binary -o - 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
 ;
-; CHECK-ERROR: Invalid SPIR-V module: unsupported SPIR-V version number 'unknown (1024)'. Range of supported/known SPIR-V versions is 1.0 (65536) - 1.4 (66560)
-
-
+; CHECK-ERROR: Invalid SPIR-V module: unsupported SPIR-V version number 'unknown (1024)'. Range of supported/known SPIR-V versions is 1.0 (65536) - 1.5 (66816)

llvm-spirv/test/negative/feature_requires_minversion.ll

@@ -1318,4 +1318,4 @@ attributes #6 = { convergent nounwind }
 !12 = !{!"short*"}
 !13 = !{!14, !14, i64 0}
 !14 = !{!"short", !9, i64 0}
-!15 = !{!"ushort*"}
+!15 = !{!"ushort*"}

llvm-spirv/test/negative/spirv-version-controls-1.spt

@@ -111,7 +111,9 @@ static cl::opt<VersionNumber> MaxSPIRVVersion(
                clEnumValN(VersionNumber::SPIRV_1_1, "1.1", "SPIR-V 1.1"),
                clEnumValN(VersionNumber::SPIRV_1_2, "1.2", "SPIR-V 1.2"),
                clEnumValN(VersionNumber::SPIRV_1_3, "1.3", "SPIR-V 1.3"),
-               clEnumValN(VersionNumber::SPIRV_1_4, "1.4", "SPIR-V 1.4")),
+               clEnumValN(VersionNumber::SPIRV_1_4, "1.4", "SPIR-V 1.4"),
+               clEnumValN(VersionNumber::SPIRV_1_5, "1.5",
+                          "SPIR-V 1.5 (experimental)")),
     cl::init(VersionNumber::MaximumVersion));
 
 static cl::list<std::string>

llvm-spirv/test/negative/spirv-version-controls-2.spt

@@ -34,7 +34,7 @@ cl::opt<bool>
     UseNewDbgInfoFormat("experimental-debuginfo-iterators",
                         cl::desc("Enable communicating debuginfo positions "
                                  "through iterators, eliminating intrinsics"),
-                        cl::init(false)); // INTEL
+                        cl::init(true));
 
 DPMarker *BasicBlock::createMarker(Instruction *I) {
   assert(IsNewDbgInfoFormat &&