Revert "Deprecate SPV_INTEL_hw_thread_queries extension from forward llvm-spirv (#3130)"

This reverts commit 6495e45.

Author: jsji

llvm-spirv/README.md

@@ -273,8 +273,7 @@ should disable support for forward translation of the extension in the main bran
 (this will prevent new SPIR-V modules from being generated using the extension).
 Meanwhile support reverse translation for the extension should be continued
 (this retains compatibility with existing SPIR-V modules).
-  * Addition of deprecation warning for the extension is not required, yet recommended for extensions adding
-    instructions representable in LLVM IR only via SPIR-V friendly LLVM IR.
+  * Addition of deprecation warning for the extension is not required.
   * We encourage backporting the changes to other branches to speed up removal, but this is not required.
 
 After at least one release cycle one may remove support for reverse translation in the main branch as well,

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

@@ -2155,11 +2155,14 @@ LLVMToSPIRVBase::transValueWithoutDecoration(Value *V, SPIRVBasicBlock *BB,
     if (static_cast<uint32_t>(Builtin) >= internal::BuiltInSubDeviceIDINTEL &&
         static_cast<uint32_t>(Builtin) <=
             internal::BuiltInGlobalHWThreadIDINTEL) {
-      std::string ErrorStr = "SPV_INTEL_hw_thread_queries\n"
-                             "Please report to "
-                             "https://github.com/intel/llvm in case if you see "
-                             "this error.\nRef LLVM Value:";
-      getErrorLog().checkError(false, SPIRVEC_DeprecatedExtension, V, ErrorStr);
+      if (!BM->isAllowedToUseExtension(
+              ExtensionID::SPV_INTEL_hw_thread_queries)) {
+        std::string ErrorStr = "Intel HW thread queries must be enabled by "
+                               "SPV_INTEL_hw_thread_queries extension.\n"
+                               "LLVM value that is being translated:\n";
+        getErrorLog().checkError(false, SPIRVEC_InvalidModule, V, ErrorStr);
+      }
+      BM->addExtension(ExtensionID::SPV_INTEL_hw_thread_queries);
     }
 
     BVar->setBuiltin(Builtin);

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

@@ -28,8 +28,6 @@ _SPIRV_OP(UnspecifiedMemoryModel, "Unspecified Memory Model.")
 _SPIRV_OP(RepeatedMemoryModel, "Expects a single OpMemoryModel instruction.")
 _SPIRV_OP(UnsupportedVarArgFunction,
           "Variadic functions other than 'printf' are not supported in SPIR-V.")
-_SPIRV_OP(DeprecatedExtension,
-          "Feature requires the following deprecated SPIR-V extension:\n")
 
 /* This is the last error code to have a maximum valid value to compare to */
 _SPIRV_OP(InternalMaxErrorCode, "Unknown error code")

llvm-spirv/test/extensions/INTEL/SPV_INTEL_hw_thread_queries/intel_hw_thread_queries_function_call.ll

@@ -0,0 +1,35 @@
+; Test for SPV_INTEL_hw_thread_queries feature
+; SPIR-V friendly LLVM IR to SPIR-V translation and vice versa
+; RUN: llvm-as %s -o %t.bc
+; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_hw_thread_queries -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 -r --spirv-target-env=SPV-IR %t.spv -o %t.rev.bc
+; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
+
+; CHECK-SPIRV: Capability HWThreadQueryINTEL
+; CHECK-SPIRV: Extension "SPV_INTEL_hw_thread_queries"
+; CHECK-SPIRV: Decorate [[#Id1:]] BuiltIn 6135
+; CHECK-SPIRV: Decorate [[#Id2:]] BuiltIn 6136
+; CHECK-SPIRV: Variable [[#]] [[#Id1]]
+; CHECK-SPIRV: Variable [[#]] [[#Id2]]
+
+target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
+target triple = "spir-unknown-unknown"
+
+; Function Attrs: nounwind readnone
+define spir_kernel void @foo() {
+entry:
+  %0 = call spir_func i32 @_Z31__spirv_BuiltInSubDeviceIDINTELv() #1
+  %1 = call spir_func i32 @_Z36__spirv_BuiltInGlobalHWThreadIDINTELv() #1
+  ; CHECK-LLVM: call spir_func i32 @_Z31__spirv_BuiltInSubDeviceIDINTELv() #1
+  ; CHECK-LLVM: call spir_func i32 @_Z36__spirv_BuiltInGlobalHWThreadIDINTELv() #1
+  ret void
+}
+
+declare dso_local spir_func i32 @_Z31__spirv_BuiltInSubDeviceIDINTELv()
+
+declare dso_local spir_func i32 @_Z36__spirv_BuiltInGlobalHWThreadIDINTELv()

llvm-spirv/test/extensions/INTEL/SPV_INTEL_hw_thread_queries/intel_hw_thread_queries_load_from_global.ll

@@ -0,0 +1,34 @@
+; Test for SPV_INTEL_hw_thread_queries feature
+; SPIR-V friendly LLVM IR to SPIR-V translation and vice versa
+; RUN: llvm-as %s -o %t.bc
+; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_hw_thread_queries -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 -r --spirv-target-env=SPV-IR %t.spv -o %t.rev.bc
+; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
+
+; CHECK-SPIRV: Capability HWThreadQueryINTEL
+; CHECK-SPIRV: Extension "SPV_INTEL_hw_thread_queries"
+; CHECK-SPIRV: Decorate [[#Id1:]] BuiltIn 6135
+; CHECK-SPIRV: Decorate [[#Id2:]] BuiltIn 6136
+; CHECK-SPIRV: Variable [[#]] [[#Id1]]
+; CHECK-SPIRV: Variable [[#]] [[#Id2]]
+
+target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
+target triple = "spir-unknown-unknown"
+
+@__spirv_BuiltInSubDeviceIDINTEL = external addrspace(1) global i32
+@__spirv_BuiltInGlobalHWThreadIDINTEL = external addrspace(1) global i32
+
+; Function Attrs: nounwind readnone
+define spir_kernel void @foo() {
+entry:
+  %0 = load i32, ptr addrspace(4) addrspacecast (ptr addrspace(1) @__spirv_BuiltInSubDeviceIDINTEL to ptr addrspace(4)), align 4
+  %1 = load i32, ptr addrspace(4) addrspacecast (ptr addrspace(1) @__spirv_BuiltInGlobalHWThreadIDINTEL to ptr addrspace(4)), align 4
+  ; CHECK-LLVM: call spir_func i32 @_Z31__spirv_BuiltInSubDeviceIDINTELv() #1
+  ; CHECK-LLVM: call spir_func i32 @_Z36__spirv_BuiltInGlobalHWThreadIDINTELv() #1
+  ret void
+}

llvm-spirv/test/extensions/INTEL/SPV_INTEL_hw_thread_queries/negative_intel_hw_thread_queries.ll

@@ -1,13 +1,11 @@
-; Deprecation test for SPV_INTEL_hw_thread_queries extension.
-; Check for errors in case if LLVM IR module contains HW thread queries as a for of
-; SPIR-V friendly LLVM IR.
+; Negative test for SPV_INTEL_hw_thread_queries feature
+; Check for errors in case if the extension is not enabled, but the appropriate
+; SPV-IR patter is found
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s
 
-; CHECK: DeprecatedExtension: Feature requires the following deprecated SPIR-V extension:
-; CHECK: SPV_INTEL_hw_thread_queries
-; CHECK: Please report to https://github.com/intel/llvm in case if you see this error.
-; CHECK: Ref LLVM Value:
+; CHECK: InvalidModule: Invalid SPIR-V module: Intel HW thread queries must be enabled by SPV_INTEL_hw_thread_queries extension.
+; CHECK: LLVM value that is being translated:
 ; CHECK: @__spirv_BuiltInSubDeviceIDINTEL = external addrspace(1) global i32
 
 target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"