Add SPV_ALTERA_arbitrary_precision_integers (#3606)

When both SPV_ALTERA_arbitrary_precision_integers and
SPV_INTEL_arbitrary_precision_integers extensions are enabled - INTEL's
version takes priority.

Addresses
#3566

Author: MrSidims

include/LLVMSPIRVExtensions.inc

@@ -32,6 +32,7 @@ EXT(SPV_INTEL_function_pointers)
 EXT(SPV_INTEL_kernel_attributes)
 EXT(SPV_INTEL_io_pipes)
 EXT(SPV_INTEL_inline_assembly)
+EXT(SPV_ALTERA_arbitrary_precision_integers)
 EXT(SPV_INTEL_arbitrary_precision_integers)
 EXT(SPV_INTEL_optimization_hints)
 EXT(SPV_INTEL_float_controls2)

lib/SPIRV/SPIRVLowerLLVMIntrinsic.cpp

@@ -139,9 +139,19 @@ void SPIRVLowerLLVMIntrinsicBase::visitIntrinsicInst(CallInst &I) {
   auto It = LLVMIntrinsicMapEntries.find(IntrinsicName);
   if (It != LLVMIntrinsicMapEntries.end())
     MapEntry = &It->second;
+  auto IsRequiredExtAllowed = [&](ExtensionID Ext) {
+    if (Opts.isAllowedToUseExtension(Ext))
+      return true;
+    // SPV_ALTERA_arbitrary_precision_integers is equivalent to
+    // SPV_INTEL_arbitrary_precision_integers.
+    if (Ext == ExtensionID::SPV_INTEL_arbitrary_precision_integers)
+      return Opts.isAllowedToUseExtension(
+          ExtensionID::SPV_ALTERA_arbitrary_precision_integers);
+    return false;
+  };
   if (!MapEntry ||
       !(MapEntry->RequiredExtension == NO_REQUIRED_EXTENSION ||
-        Opts.isAllowedToUseExtension(MapEntry->RequiredExtension)) ||
+        IsRequiredExtAllowed(MapEntry->RequiredExtension)) ||
       Opts.isAllowedToUseExtension(MapEntry->ForbiddenExtension))
     return;
 

lib/SPIRV/SPIRVWriter.cpp

@@ -390,6 +390,8 @@ SPIRVType *LLVMToSPIRVBase::transType(Type *T) {
     // capabilities.
     if (BM->isAllowedToUseExtension(
             ExtensionID::SPV_INTEL_arbitrary_precision_integers) ||
+        BM->isAllowedToUseExtension(
+            ExtensionID::SPV_ALTERA_arbitrary_precision_integers) ||
         BM->getErrorLog().checkError(
             (BitWidth == 4 &&
              BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_int4)) ||
@@ -1400,7 +1402,9 @@ SPIRVValue *LLVMToSPIRVBase::transConstant(Value *V) {
     if (BitWidth > 64) {
       BM->getErrorLog().checkError(
           BM->isAllowedToUseExtension(
-              ExtensionID::SPV_INTEL_arbitrary_precision_integers),
+              ExtensionID::SPV_INTEL_arbitrary_precision_integers) ||
+              BM->isAllowedToUseExtension(
+                  ExtensionID::SPV_ALTERA_arbitrary_precision_integers),
           SPIRVEC_InvalidBitWidth, std::to_string(BitWidth));
       return BM->addConstant(ExpectedType, ConstI->getValue());
     }

lib/SPIRV/libSPIRV/SPIRVType.h

@@ -175,7 +175,9 @@ class SPIRVTypeInt : public SPIRVType {
       break;
     default:
       if (Module->isAllowedToUseExtension(
-              ExtensionID::SPV_INTEL_arbitrary_precision_integers))
+              ExtensionID::SPV_INTEL_arbitrary_precision_integers) ||
+          Module->isAllowedToUseExtension(
+              ExtensionID::SPV_ALTERA_arbitrary_precision_integers))
         CV.push_back(CapabilityArbitraryPrecisionIntegersINTEL);
     }
     return CV;
@@ -185,15 +187,21 @@ class SPIRVTypeInt : public SPIRVType {
     case 4: {
       if (Module->isAllowedToUseExtension(ExtensionID::SPV_INTEL_int4))
         return ExtensionID::SPV_INTEL_int4;
-      return ExtensionID::SPV_INTEL_arbitrary_precision_integers;
+      if (Module->isAllowedToUseExtension(
+              ExtensionID::SPV_INTEL_arbitrary_precision_integers))
+        return ExtensionID::SPV_INTEL_arbitrary_precision_integers;
+      return ExtensionID::SPV_ALTERA_arbitrary_precision_integers;
     }
     case 8:
     case 16:
     case 32:
     case 64:
       return {};
     default:
-      return ExtensionID::SPV_INTEL_arbitrary_precision_integers;
+      if (Module->isAllowedToUseExtension(
+              ExtensionID::SPV_INTEL_arbitrary_precision_integers))
+        return ExtensionID::SPV_INTEL_arbitrary_precision_integers;
+      return ExtensionID::SPV_ALTERA_arbitrary_precision_integers;
     }
   }
 
@@ -206,7 +214,9 @@ class SPIRVTypeInt : public SPIRVType {
             BitWidth == 8 || BitWidth == 16 || BitWidth == 32 ||
             BitWidth == 64 ||
             Module->isAllowedToUseExtension(
-                ExtensionID::SPV_INTEL_arbitrary_precision_integers)) &&
+                ExtensionID::SPV_INTEL_arbitrary_precision_integers) ||
+            Module->isAllowedToUseExtension(
+                ExtensionID::SPV_ALTERA_arbitrary_precision_integers)) &&
            "Invalid bit width");
   }
 

test/extensions/ALTERA/SPV_ALTERA_arbitrary_precision_integers/arbitrary-precision-integers.ll

@@ -0,0 +1,46 @@
+; RUN: llvm-spirv %s --spirv-ext=+SPV_ALTERA_arbitrary_precision_integers -o %t.spv
+; RUN: llvm-spirv %t.spv -to-text -o %t.spt
+; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
+
+; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
+; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
+
+; RUN: llvm-spirv -spirv-text -r %t.spt -o %t.rev.bc
+; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
+
+; CHECK-SPIRV: Capability ArbitraryPrecisionIntegersINTEL
+; CHECK-SPIRV: Extension "SPV_ALTERA_arbitrary_precision_integers"
+
+; CHECK-SPIRV-DAG: TypeInt {{[0-9]+}} 13 0
+; CHECK-SPIRV-DAG: TypeInt {{[0-9]+}} 58 0
+; CHECK-SPIRV-DAG: TypeInt {{[0-9]+}} 30 0
+
+; Test that when both extensions are enabled, INTEL takes priority.
+; RUN: llvm-spirv %s --spirv-ext=+SPV_ALTERA_arbitrary_precision_integers,+SPV_INTEL_arbitrary_precision_integers -o %t.both.spv
+; RUN: llvm-spirv %t.both.spv -to-text -o %t.both.spt
+; RUN: FileCheck < %t.both.spt %s --check-prefix=CHECK-BOTH
+
+; CHECK-BOTH: Capability ArbitraryPrecisionIntegersINTEL
+; CHECK-BOTH: Extension "SPV_INTEL_arbitrary_precision_integers"
+; CHECK-BOTH-NOT: Extension "SPV_ALTERA_arbitrary_precision_integers"
+
+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"
+
+; CHECK-LLVM: @a = addrspace(1) global i13 0, align 2
+@a = addrspace(1) global i13 0, align 2
+; CHECK-LLVM: @b = addrspace(1) global i58 0, align 8
+@b = addrspace(1) global i58 0, align 8
+
+; Function Attrs: noinline nounwind optnone
+; CHECK-LLVM: void @_Z4funci(i30 %a)
+define spir_func void @_Z4funci(i30 %a) {
+entry:
+; CHECK-LLVM: %a.addr = alloca i30
+  %a.addr = alloca i30, align 4
+; CHECK-LLVM: store i30 %a, ptr %a.addr
+  store i30 %a, ptr %a.addr, align 4
+; CHECK-LLVM: store i30 1, ptr %a.addr
+  store i30 1, ptr %a.addr, align 4
+  ret void
+}