Use SPV_EXT_long_vector extension for vector size=1

Keep using SPV_INTEL_vector_compute for other non-standard vector size.

Author: Qi-Ye-079

include/LLVMSPIRVExtensions.inc

@@ -97,3 +97,4 @@ EXT(SPV_INTEL_fp_conversions)
 EXT(SPV_KHR_float_controls2)
 EXT(SPV_AMD_weak_linkage)
 EXT(SPV_NV_shader_atomic_fp16_vector)
+EXT(SPV_EXT_long_vector)

lib/SPIRV/SPIRVWriter.cpp

@@ -428,6 +428,15 @@ SPIRVType *LLVMToSPIRVBase::transType(Type *T) {
   }
 
   if (auto *VecTy = dyn_cast<FixedVectorType>(T)) {
+    if (VecTy->getNumElements() == 1 &&
+        !BM->isAllowedToUseExtension(ExtensionID::SPV_EXT_long_vector)) {
+      BM->getErrorLog().checkError(false, SPIRVEC_RequiresExtension,
+                                   "SPV_EXT_long_vector\n"
+                                   "NOTE: LLVM module contains a 1-element "
+                                   "vector, translation of which requires "
+                                   "this extension");
+      return nullptr;
+    }
     if (VecTy->getElementType()->isPointerTy() ||
         isa<TypedPointerType>(VecTy->getElementType())) {
       // SPV_INTEL_masked_gather_scatter extension changes 2.16.1. Universal

lib/SPIRV/libSPIRV/SPIRVEntry.h

@@ -953,6 +953,8 @@ class SPIRVCapability : public SPIRVEntryNoId<OpCapability> {
       return ExtensionID::SPV_INTEL_device_barrier;
     case CapabilityFloatControls2:
       return ExtensionID::SPV_KHR_float_controls2;
+    case CapabilityLongVectorEXT:
+      return ExtensionID::SPV_EXT_long_vector;
     default:
       return {};
     }

lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h

@@ -631,6 +631,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
   add(CapabilityOptNoneEXT, "OptNoneEXT");
   add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
   add(CapabilityAtomicFloat16VectorNV, "AtomicFloat16VectorNV");
+  add(CapabilityLongVectorEXT, "LongVectorEXT");
   add(internal::CapabilityAtomicBFloat16AddINTEL, "AtomicBFloat16AddINTEL");
   add(internal::CapabilityAtomicBFloat16MinMaxINTEL,
       "AtomicBFloat16MinMaxINTEL");

lib/SPIRV/libSPIRV/SPIRVType.h

@@ -438,8 +438,12 @@ class SPIRVTypeVector : public SPIRVType {
     if (CompCount == 8 || CompCount == 16)
       V.push_back(CapabilityVector16);
 
+    if (CompCount == 1 &&
+        Module->isAllowedToUseExtension(ExtensionID::SPV_EXT_long_vector))
+      V.push_back(CapabilityLongVectorEXT);
+
     if (Module->isAllowedToUseExtension(ExtensionID::SPV_INTEL_vector_compute))
-      if (CompCount == 1 || (CompCount > 4 && CompCount < 8) ||
+      if ((CompCount > 4 && CompCount < 8) ||
           (CompCount > 8 && CompCount < 16) || CompCount > 16)
         V.push_back(CapabilityVectorAnyINTEL);
     return V;
@@ -455,10 +459,17 @@ class SPIRVTypeVector : public SPIRVType {
     SPIRVEntry::validate();
     CompType->validate();
 #ifndef NDEBUG
-    if (!(Module->isAllowedToUseExtension(
-            ExtensionID::SPV_INTEL_vector_compute))) {
-      assert(CompCount == 2 || CompCount == 3 || CompCount == 4 ||
-             CompCount == 8 || CompCount == 16);
+    bool IsNonStandardCount =
+        !(CompCount == 2 || CompCount == 3 || CompCount == 4 ||
+          CompCount == 8 || CompCount == 16);
+    if (IsNonStandardCount) {
+      bool AllowedByVC = Module->isAllowedToUseExtension(
+                             ExtensionID::SPV_INTEL_vector_compute) &&
+                         CompCount != 1;
+      bool AllowedByLongVector =
+          Module->isAllowedToUseExtension(ExtensionID::SPV_EXT_long_vector) &&
+          CompCount == 1;
+      assert(AllowedByVC || AllowedByLongVector);
     }
 #endif // !NDEBUG
   }

test/extensions/EXT/SPV_EXT_long_vector/negative.ll

@@ -0,0 +1,15 @@
+; RUN: llvm-as %s -o %t.bc
+; RUN: not llvm-spirv %t.bc 2>&1 | FileCheck %s
+
+; Without SPV_EXT_long_vector, a vector of size 1 cannot be translated.
+
+; CHECK: RequiresExtension: Feature requires the following SPIR-V extension:
+; CHECK-NEXT: SPV_EXT_long_vector
+
+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-unknown-unknown"
+
+define spir_func void @test_no_ext(<1 x float> %v1) {
+entry:
+  ret void
+}

test/extensions/EXT/SPV_EXT_long_vector/vector_size_1.ll

@@ -0,0 +1,16 @@
+; RUN: llvm-spirv %s --spirv-ext=+SPV_EXT_long_vector -o %t.spv
+; RUN: spirv-val %t.spv
+; RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s
+
+; CHECK-DAG: Capability LongVectorEXT
+; CHECK-DAG: Extension "SPV_EXT_long_vector"
+; CHECK-DAG: TypeFloat [[#F32:]] 32
+; CHECK-DAG: TypeVector [[#]] [[#F32]] 1
+
+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-unknown-unknown"
+
+define spir_func void @test_vec1(<1 x float> %v1) {
+entry:
+  ret void
+}