- Support for extension SPV_INTEL_latency_control.

- Added a new test case for the extension SPV_INTEL_latency_control

Author: EbinJose2002

llvm/lib/Target/SPIRV/SPIRVCommandLine.cpp

@@ -97,7 +97,9 @@ static const std::map<std::string, SPIRV::Extension::Extension, std::less<>>
  SPIRV::Extension::Extension::
  SPV_INTEL_subgroup_matrix_multiply_accumulate},
  {"SPV_INTEL_ternary_bitwise_function",
- SPIRV::Extension::Extension::SPV_INTEL_ternary_bitwise_function}};
+ SPIRV::Extension::Extension::SPV_INTEL_ternary_bitwise_function},
+ {"SPV_INTEL_fpga_latency_control",
+ SPIRV::Extension::Extension::SPV_INTEL_fpga_latency_control}};
 
 bool SPIRVExtensionsParser::parse(cl::Option &O, StringRef ArgName,
  StringRef ArgValue,

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -920,6 +920,10 @@ static void addOpDecorateReqs(const MachineInstr &MI, unsigned DecIndex,
  } else if (Dec == SPIRV::Decoration::FPMaxErrorDecorationINTEL) {
  Reqs.addRequirements(SPIRV::Capability::FPMaxErrorINTEL);
  Reqs.addExtension(SPIRV::Extension::SPV_INTEL_fp_max_error);
+ } else if (Dec == SPIRV::Decoration::LatencyControlConstraintINTEL ||
+ Dec == SPIRV::Decoration::LatencyControlLabelINTEL) {
+ Reqs.addRequirements(SPIRV::Capability::FPGALatencyControlINTEL);
+ Reqs.addExtension(SPIRV::Extension::SPV_INTEL_fpga_latency_control);
  }
 }
 

llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp

@@ -212,15 +212,23 @@ static SmallVector<Metadata *> parseAnnotation(Value *I,
  if (Item.length() == 0)
  break;
  if (Item[0] == '"') {
- Item = Item.substr(1, Item.length() - 2);
- // Acceptable format of the string snippet is:
- static const std::regex RStr("^(\\d+)(?:,(\\d+))*$");
- if (std::smatch MatchStr; std::regex_match(Item, MatchStr, RStr)) {
- for (std::size_t SubIdx = 1; SubIdx < MatchStr.size(); ++SubIdx)
- if (std::string SubStr = MatchStr[SubIdx].str(); SubStr.length())
- MDsItem.push_back(ConstantAsMetadata::get(
- ConstantInt::get(Int32Ty, std::stoi(SubStr))));
- } else {
+ Item = Item.substr(1, Item.length() - 2); // Remove surrounding quotes
+
+ // Use regex iterator to capture all numbers
+ static const std::regex NumberRegex("\\d+");
+ std::sregex_token_iterator It(Item.begin(), Item.end(), NumberRegex);
+ std::sregex_token_iterator End;
+
+ bool FoundNumber = false;
+ while (It != End) {
+ MDsItem.push_back(ConstantAsMetadata::get(
+ ConstantInt::get(Int32Ty, std::stoi(*It))));
+ ++It;
+ FoundNumber = true;
+ }
+
+ // If no numbers were found, treat it as a regular string
+ if (!FoundNumber) {
  MDsItem.push_back(MDString::get(Ctx, Item));
  }
  } else if (int32_t Num; llvm::to_integer(StringRef(Item), Num, 10)) {

llvm/lib/Target/SPIRV/SPIRVSymbolicOperands.td

@@ -517,6 +517,7 @@ defm MemoryAccessAliasingINTEL : CapabilityOperand<5910, 0, 0, [SPV_INTEL_memory
 defm FPMaxErrorINTEL : CapabilityOperand<6169, 0, 0, [SPV_INTEL_fp_max_error], []>;
 defm TernaryBitwiseFunctionINTEL : CapabilityOperand<6241, 0, 0, [SPV_INTEL_ternary_bitwise_function], []>;
 defm SubgroupMatrixMultiplyAccumulateINTEL : CapabilityOperand<6236, 0, 0, [SPV_INTEL_subgroup_matrix_multiply_accumulate], []>;
+defm FPGALatencyControlINTEL : CapabilityOperand<6171, 0, 0, [SPV_INTEL_fpga_latency_control], []>;
 
 //===----------------------------------------------------------------------===//
 // Multiclass used to define SourceLanguage enum values and at the same time
@@ -1268,6 +1269,8 @@ defm FunctionFloatingPointModeINTEL : DecorationOperand<6080, 0, 0, [], [Functio
 defm AliasScopeINTEL : DecorationOperand<5914, 0, 0, [], [MemoryAccessAliasingINTEL]>;
 defm NoAliasINTEL : DecorationOperand<5915, 0, 0, [], [MemoryAccessAliasingINTEL]>;
 defm FPMaxErrorDecorationINTEL : DecorationOperand<6170, 0, 0, [], [FPMaxErrorINTEL]>;
+defm LatencyControlLabelINTEL : DecorationOperand<6172, 0, 0, [], [FPGALatencyControlINTEL]>;
+defm LatencyControlConstraintINTEL : DecorationOperand<6173, 0, 0, [], [FPGALatencyControlINTEL]>;
 
 //===----------------------------------------------------------------------===//
 // Multiclass used to define BuiltIn enum values and at the same time

llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_fpga_latency_control/IntelLatencyControl.ll

@@ -0,0 +1,58 @@
+; RUN: llc -O0 -mtriple=spirv64-unknown-unknown -verify-machineinstrs --spirv-ext=+SPV_INTEL_fpga_latency_control %s -o - | FileCheck %s
+
+; CHECK: OpCapability FPGALatencyControlINTEL
+; CHECK: OpExtension "SPV_INTEL_fpga_latency_control"
+; CHECK: OpDecorate %[[#ARGA:]] LatencyControlLabelINTEL 0
+; CHECK: OpDecorate %[[#ARGB:]] LatencyControlLabelINTEL 1
+; CHECK: OpDecorate %[[#ARGB]] LatencyControlConstraintINTEL 0 1 5
+; CHECK: %[[#OUT1:]] = OpBitcast %[[#]] %[[#]]
+; CHECK-DAG: %[[#]] = OpLoad %[[#]] %[[#OUT1]]
+; CHECK: %[[#OUT2:]] = OpBitcast %[[#]] %[[#]]
+; CHECK-DAG: %[[#]] = OpLoad %[[#]] %[[#OUT2]]
+
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
+
+%struct.__spirv_Something = type { i32, i32 }
+
+$_ZTSZ4fooEUlvE_ = comdat any
+
+@.str = private unnamed_addr addrspace(1) constant [16 x i8] c"sycl-properties\00", section "llvm.metadata"
+@.str.1 = private unnamed_addr addrspace(1) constant [19 x i8] c"inc/fpga_utils.hpp\00", section "llvm.metadata"
+@.str.9 = private unnamed_addr addrspace(1) constant [11 x i8] c"{6172:\220\22}\00", section "llvm.metadata"
+@.str.10 = private unnamed_addr addrspace(1) constant [25 x i8] c"{6172:\221\22}{6173:\220,5,1\22}\00", section "llvm.metadata"
+
+; Function Attrs: mustprogress norecurse
+define weak_odr dso_local spir_kernel void @_ZTSZ4fooEUlvE_(ptr %0) local_unnamed_addr #0 comdat !kernel_arg_buffer_location !5 !sycl_kernel_omit_args !5 {
+entry:
+ %1 = alloca ptr, align 8
+ store ptr %0, ptr %1, align 8
+ %2 = load ptr, ptr %1, align 8
+ %3 = getelementptr inbounds %struct.__spirv_Something, ptr %2, i32 0, i32 0
+ %4 = bitcast ptr %3 to ptr
+ %5 = call ptr @llvm.ptr.annotation.p0.p1(ptr %4, ptr addrspace(1) @.str.9, ptr addrspace(1) @.str.1, i32 5, ptr addrspace(1) null)
+ %6 = load i32, ptr %5, align 8
+ %7 = load ptr, ptr %1, align 8
+ %8 = getelementptr inbounds %struct.__spirv_Something, ptr %7, i32 0, i32 1
+ %9 = bitcast ptr %8 to ptr
+ %10 = call ptr @llvm.ptr.annotation.p0.p1(ptr %9, ptr addrspace(1) @.str.10, ptr addrspace(1) @.str.1, i32 5, ptr addrspace(1) null)
+ %11 = load i32, ptr %10, align 8
+ ret void
+}
+
+; Function Attrs: nocallback nofree nosync nounwind willreturn memory(inaccessiblemem: readwrite)
+declare ptr @llvm.ptr.annotation.p0.p1(ptr, ptr addrspace(1), ptr addrspace(1), i32, ptr addrspace(1)) #1
+
+attributes #0 = { mustprogress norecurse "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "sycl-module-id"="sycl-properties-ptr-annotations.cpp" "uniform-work-group-size"="true" }
+attributes #1 = { nocallback nofree nosync nounwind willreturn memory(inaccessiblemem: readwrite) }
+
+!opencl.spir.version = !{!0, !0, !0, !0, !0, !0}
+!spirv.Source = !{!1, !1, !1, !1, !1, !1}
+!llvm.ident = !{!2, !2, !2, !2, !2, !2}
+!llvm.module.flags = !{!3, !4}
+
+!0 = !{i32 1, i32 2}
+!1 = !{i32 4, i32 100000}
+!2 = !{!"clang version 15.0.0"}
+!3 = !{i32 1, !"wchar_size", i32 4}
+!4 = !{i32 7, !"frame-pointer", i32 2}
+!5 = !{}