Skip to content

Commit 122ac69

Browse files
authored
[Backport to llvm_release_110] Implement SPV_INTEL_sigmoid extension (#3432)
Spec link: intel/llvm#20504
1 parent 388c6db commit 122ac69

File tree

7 files changed

+165
-0
lines changed

7 files changed

+165
-0
lines changed

include/LLVMSPIRVExtensions.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ EXT(SPV_INTEL_global_variable_decorations)
5151
EXT(SPV_INTEL_maximum_registers)
5252
EXT(SPV_KHR_bfloat16)
5353
EXT(SPV_INTEL_bfloat16_arithmetic)
54+
EXT(SPV_INTEL_sigmoid)

lib/SPIRV/libSPIRV/SPIRVInstruction.h

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3579,5 +3579,63 @@ template <Op OC> class SPIRVReadClockKHRInstBase : public SPIRVUnaryInst<OC> {
35793579
_SPIRV_OP(ReadClockKHR)
35803580
#undef _SPIRV_OP
35813581

3582+
template <Op OC> class SPIRVFSigmoidINTELInstBase : public SPIRVUnaryInst<OC> {
3583+
protected:
3584+
SPIRVCapVec getRequiredCapability() const override {
3585+
return getVec(internal::CapabilitySigmoidINTEL);
3586+
}
3587+
3588+
llvm::Optional<ExtensionID> getRequiredExtension() const override {
3589+
return ExtensionID::SPV_INTEL_sigmoid;
3590+
}
3591+
3592+
void validate() const override {
3593+
SPIRVUnaryInst<OC>::validate();
3594+
3595+
SPIRVType *ResCompTy = this->getType();
3596+
SPIRVWord ResCompCount = 1;
3597+
if (ResCompTy->isTypeVector()) {
3598+
ResCompCount = ResCompTy->getVectorComponentCount();
3599+
ResCompTy = ResCompTy->getVectorComponentType();
3600+
}
3601+
3602+
// validate is a const method, whilst getOperand is non-const method
3603+
// because it may call a method of class Module that may modify LiteralMap
3604+
// of Module field. That modification is not impacting validate method for
3605+
// these instructions, so const_cast is safe here.
3606+
using SPVFSigmoidTy = SPIRVFSigmoidINTELInstBase<OC>;
3607+
const SPIRVValue *Input = const_cast<SPVFSigmoidTy *>(this)->getOperand(0);
3608+
3609+
SPIRVType *InCompTy = Input->getType();
3610+
SPIRVWord InCompCount = 1;
3611+
if (InCompTy->isTypeVector()) {
3612+
InCompCount = InCompTy->getVectorComponentCount();
3613+
InCompTy = InCompTy->getVectorComponentType();
3614+
}
3615+
3616+
auto InstName = OpCodeNameMap::map(OC);
3617+
SPIRVErrorLog &SPVErrLog = this->getModule()->getErrorLog();
3618+
3619+
SPVErrLog.checkError(
3620+
ResCompTy->isTypeFloat(16) || ResCompTy->isTypeFloat(32) ||
3621+
ResCompTy->isTypeFloat(16, FPEncodingBFloat16KHR),
3622+
SPIRVEC_InvalidInstruction,
3623+
InstName + "\nResult value must be a scalar or vector of floating-point"
3624+
" 16-bit or 32-bit type\n");
3625+
SPVErrLog.checkError(
3626+
ResCompTy == InCompTy, SPIRVEC_InvalidInstruction,
3627+
InstName +
3628+
"\nInput type must have the same component type as result type\n");
3629+
SPVErrLog.checkError(
3630+
ResCompCount == InCompCount, SPIRVEC_InvalidInstruction,
3631+
InstName + "\nInput type must have the same number of components as "
3632+
"result type\n");
3633+
}
3634+
};
3635+
3636+
#define _SPIRV_OP(x, ...) \
3637+
typedef SPIRVFSigmoidINTELInstBase<internal::Op##x> SPIRV##x;
3638+
_SPIRV_OP(FSigmoidINTEL)
3639+
#undef _SPIRV_OP
35823640
} // namespace SPIRV
35833641
#endif // SPIRV_LIBSPIRV_SPIRVINSTRUCTION_H

lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
586586
add(internal::CapabilityGlobalVariableDecorationsINTEL,
587587
"GlobalVariableDecorationsINTEL");
588588
add(internal::CapabilityBFloat16ArithmeticINTEL, "BFloat16ArithmeticINTEL");
589+
add(internal::CapabilitySigmoidINTEL, "SigmoidINTEL");
589590
}
590591
SPIRV_DEF_NAMEMAP(Capability, SPIRVCapabilityNameMap)
591592

lib/SPIRV/libSPIRV/SPIRVOpCodeEnumInternal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ _SPIRV_OP_INTERNAL(ConvertBF16ToFINTEL, internal::OpConvertBF16ToFINTEL)
99
_SPIRV_OP_INTERNAL(MaskedGatherINTEL, internal::OpMaskedGatherINTEL)
1010
_SPIRV_OP_INTERNAL(MaskedScatterINTEL, internal::OpMaskedScatterINTEL)
1111
_SPIRV_OP_INTERNAL(RoundFToTF32INTEL, internal::RoundFToTF32INTEL)
12+
_SPIRV_OP_INTERNAL(FSigmoidINTEL, internal::FSigmoidINTEL)

lib/SPIRV/libSPIRV/spirv_internal.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ enum InternalOp {
4343
IOpRoundFToTF32INTEL = 6426,
4444
IOpMaskedGatherINTEL = 6428,
4545
IOpMaskedScatterINTEL = 6429,
46+
IOpFSigmoidINTEL = 6168,
4647
IOpPrev = OpMax - 2,
4748
IOpForward
4849
};
@@ -61,6 +62,7 @@ enum InternalCapability {
6162
ICapDebugInfoModuleINTEL = 6114,
6263
ICapBfloat16ConversionINTEL = 6115,
6364
ICapabilityBFloat16ArithmeticINTEL = 6226,
65+
ICapabilitySigmoidINTEL = 6167,
6466
ICapabilityTensorFloat32RoundingINTEL = 6425,
6567
ICapabilityMaskedGatherScatterINTEL = 6427,
6668
ICapabilityHWThreadQueryINTEL = 6134,
@@ -87,6 +89,8 @@ enum InternalBuiltIn {
8789
_SPIRV_OP(Capability, HWThreadQueryINTEL)
8890
_SPIRV_OP(BuiltIn, SubDeviceIDINTEL)
8991
_SPIRV_OP(BuiltIn, GlobalHWThreadIDINTEL)
92+
_SPIRV_OP(Capability, SigmoidINTEL)
93+
_SPIRV_OP(Op, FSigmoidINTEL)
9094
#undef _SPIRV_OP
9195

9296
constexpr Op OpForward = static_cast<Op>(IOpForward);
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
; RUN: llvm-as %s -o %t.bc
2+
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-ext=+SPV_INTEL_sigmoid
3+
; RUN: llvm-spirv %t.spv -o %t.spt --to-text
4+
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
5+
; RUN: llvm-spirv %t.spv -o %t.rev.bc -r --spirv-target-env=SPV-IR
6+
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
7+
; RUN: FileCheck < %t.rev.ll %s --check-prefix=CHECK-LLVM
8+
9+
; RUN: not llvm-spirv %t.bc 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
10+
; CHECK-ERROR: RequiresExtension: Feature requires the following SPIR-V extension:
11+
; CHECK-ERROR-NEXT: SPV_INTEL_sigmoid
12+
13+
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"
14+
target triple = "spir64-unknown-unknown"
15+
16+
; CHECK-SPIRV: Capability SigmoidINTEL
17+
; CHECK-SPIRV: Extension "SPV_INTEL_sigmoid"
18+
; CHECK-SPIRV: TypeFloat [[#FP16Ty:]] 16
19+
; CHECK-SPIRV: TypeVector [[#FP16v8Ty:]] [[#FP16Ty]] 8
20+
; CHECK-SPIRV: Constant [[#FP16Ty]] [[#CONST:]] 15360
21+
22+
; CHECK-SPIRV: FunctionParameter [[#FP16Ty]] [[FP16ValId:.*]]
23+
; CHECK-SPIRV: FunctionParameter [[#FP16v8Ty]] [[FP16v8ValId:.*]]
24+
25+
; CHECK-SPIRV: FSigmoidINTEL [[#FP16Ty]] [[#]] [[FP16ValId]]
26+
; CHECK-SPIRV: FSigmoidINTEL [[#FP16v8Ty]] [[#]] [[FP16v8ValId]]
27+
; CHECK-SPIRV: FSigmoidINTEL [[#FP16Ty]] [[#]] [[#CONST]]
28+
29+
; CHECK-LLVM: call spir_func half @_Z21__spirv_FSigmoidINTELDh(half
30+
; CHECK-LLVM: call spir_func <8 x half> @_Z21__spirv_FSigmoidINTELDv8_Dh(<8 x half>
31+
; CHECK-LLVM: call spir_func half @_Z21__spirv_FSigmoidINTELDh(half 0xH3C00)
32+
33+
define spir_func void @_Z2opffv8(half %a, <8 x half> %in) {
34+
%1 = tail call spir_func half @_Z21__spirv_FSigmoidINTELDh(half %a)
35+
%2 = tail call spir_func <8 x half> @_Z21__spirv_FSigmoidINTELDv8_Dh(<8 x half> %in)
36+
%3 = tail call spir_func half @_Z21__spirv_FSigmoidINTELDh(half 1.000000e+00)
37+
ret void
38+
}
39+
40+
declare spir_func half @_Z21__spirv_FSigmoidINTELDh(half)
41+
42+
declare spir_func <8 x half> @_Z21__spirv_FSigmoidINTELDv8_Dh(<8 x half>)
43+
44+
!opencl.spir.version = !{!0}
45+
!spirv.Source = !{!1}
46+
!llvm.ident = !{!2}
47+
48+
!0 = !{i32 1, i32 2}
49+
!1 = !{i32 4, i32 100000}
50+
!2 = !{!"clang version 16.0.0"}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
; RUN: llvm-as %s -o %t.bc
2+
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-ext=+SPV_INTEL_sigmoid
3+
; RUN: llvm-spirv %t.spv -o %t.spt --to-text
4+
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
5+
; RUN: llvm-spirv %t.spv -o %t.rev.bc -r --spirv-target-env=SPV-IR
6+
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
7+
; RUN: FileCheck < %t.rev.ll %s --check-prefix=CHECK-LLVM
8+
9+
; RUN: not llvm-spirv %t.bc 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
10+
; CHECK-ERROR: RequiresExtension: Feature requires the following SPIR-V extension:
11+
; CHECK-ERROR-NEXT: SPV_INTEL_sigmoid
12+
13+
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"
14+
target triple = "spir64-unknown-unknown"
15+
16+
; CHECK-SPIRV: Capability SigmoidINTEL
17+
; CHECK-SPIRV: Extension "SPV_INTEL_sigmoid"
18+
; CHECK-SPIRV: TypeFloat [[#FP32Ty:]] 32
19+
; CHECK-SPIRV: TypeVector [[#FP32v8Ty:]] [[#FP32Ty]] 8
20+
; CHECK-SPIRV: Constant [[#FP32Ty]] [[#CONST:]] 1065353216
21+
22+
; CHECK-SPIRV: FunctionParameter [[#FP32Ty]] [[FP32ValId:.*]]
23+
; CHECK-SPIRV: FunctionParameter [[#FP32v8Ty]] [[FP32v8ValId:.*]]
24+
25+
; CHECK-SPIRV: FSigmoidINTEL [[#FP32Ty]] [[#]] [[FP32ValId]]
26+
; CHECK-SPIRV: FSigmoidINTEL [[#FP32v8Ty]] [[#]] [[FP32v8ValId]]
27+
; CHECK-SPIRV: FSigmoidINTEL [[#FP32Ty]] [[#]] [[#CONST]]
28+
29+
; CHECK-LLVM: call spir_func float @_Z21__spirv_FSigmoidINTELf(float
30+
; CHECK-LLVM: call spir_func <8 x float> @_Z21__spirv_FSigmoidINTELDv8_f(<8 x float>
31+
; CHECK-LLVM: call spir_func float @_Z21__spirv_FSigmoidINTELf(float 1.000000e+00)
32+
33+
define spir_func void @_Z2opffv8(float %a, <8 x float> %in) {
34+
%1 = tail call spir_func float @_Z21__spirv_FSigmoidINTELf(float %a)
35+
%2 = tail call spir_func <8 x float> @_Z21__spirv_FSigmoidINTELDv8_f(<8 x float> %in)
36+
%3 = tail call spir_func float @_Z21__spirv_FSigmoidINTELf(float 1.000000e+00)
37+
ret void
38+
}
39+
40+
declare spir_func float @_Z21__spirv_FSigmoidINTELf(float)
41+
42+
declare spir_func <8 x float> @_Z21__spirv_FSigmoidINTELDv8_f(<8 x float>)
43+
44+
!opencl.spir.version = !{!0}
45+
!spirv.Source = !{!1}
46+
!llvm.ident = !{!2}
47+
48+
!0 = !{i32 1, i32 2}
49+
!1 = !{i32 4, i32 100000}
50+
!2 = !{!"clang version 16.0.0"}

0 commit comments

Comments
 (0)