<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Jan 25, 2017 at 4:45 AM, Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl" target="_blank">bas@basnieuwenhuizen.nl</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Can you split the switch changes to a different commit? With that, </blockquote><div> </div><div>Agreed, </div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Reviewed-by: Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl">bas@basnieuwenhuizen.nl</a>> for the series. <div class="HOEnZb"><div class="h5"> On Wed, Jan 25, 2017, at 04:39, Lionel Landwerlin wrote: > Signed-off-by: Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com">lionel.g.landwerlin@intel.com</a>> > --- >Â src/compiler/spirv/GLSL.std.450.hÂ | 12 ++++-- >Â src/compiler/spirv/spirv.hÂ Â Â Â Â | 77 >Â +++++++++++++++++++++++++++++++++++--- >Â src/compiler/spirv/spirv_info.cÂ Â |Â 6 +++ >Â src/compiler/spirv/spirv_to_nir.cÂ | 12 ++++++ >Â src/compiler/spirv/vtn_variables.c |Â 3 ++ >Â 5 files changed, 101 insertions(+), 9 deletions(-) > > diff --git a/src/compiler/spirv/GLSL.std.450.h > b/src/compiler/spirv/GLSL.std.450.h > index d1c9b5c1d4..54cc00e9a8 100644 > --- a/src/compiler/spirv/GLSL.std.450.h > +++ b/src/compiler/spirv/GLSL.std.450.h > @@ -1,5 +1,5 @@ >Â /* > -** Copyright (c) 2014-2015 The Khronos Group Inc. > +** Copyright (c) 2014-2016 The Khronos Group Inc. >Â ** >Â ** Permission is hereby granted, free of charge, to any person obtaining >Â a copy >Â ** of this software and/or associated documentation files (the >Â "Materials"), > @@ -27,8 +27,8 @@ >Â #ifndef GLSLstd450_H >Â #define GLSLstd450_H > > -const int GLSLstd450Version = 99; > -const int GLSLstd450Revision = 3; > +static const int GLSLstd450Version = 100; > +static const int GLSLstd450Revision = 3; > >Â enum GLSLstd450 { >Â Â Â GLSLstd450Bad = 0,Â Â Â Â Â Â Â // Don't use > @@ -83,7 +83,7 @@ enum GLSLstd450 { >Â Â Â GLSLstd450UClamp = 44, >Â Â Â GLSLstd450SClamp = 45, >Â Â Â GLSLstd450FMix = 46, > -Â Â GLSLstd450IMix = 47, > +Â Â GLSLstd450IMix = 47,Â Â Â Â Â Â // Reserved >Â Â Â GLSLstd450Step = 48, >Â Â Â GLSLstd450SmoothStep = 49, > > @@ -121,6 +121,10 @@ enum GLSLstd450 { >Â Â Â GLSLstd450InterpolateAtSample = 77, >Â Â Â GLSLstd450InterpolateAtOffset = 78, > > +Â Â GLSLstd450NMin = 79, > +Â Â GLSLstd450NMax = 80, > +Â Â GLSLstd450NClamp = 81, > + >Â Â Â GLSLstd450Count >Â }; > > diff --git a/src/compiler/spirv/spirv.h b/src/compiler/spirv/spirv.h > index 63bcb2f88d..769c10225d 100644 > --- a/src/compiler/spirv/spirv.h > +++ b/src/compiler/spirv/spirv.h > @@ -1,5 +1,5 @@ >Â /* > -** Copyright (c) 2014-2015 The Khronos Group Inc. > +** Copyright (c) 2014-2016 The Khronos Group Inc. >Â ** >Â ** Permission is hereby granted, free of charge, to any person obtaining >Â a copy >Â ** of this software and/or associated documentation files (the >Â "Materials"), > @@ -50,12 +50,12 @@ > >Â typedef unsigned int SpvId; > > -#define SPV_VERSION 0x10000 > -#define SPV_REVISION 2 > +#define SPV_VERSION 0x10100 > +#define SPV_REVISION 4 > >Â static const unsigned int SpvMagicNumber = 0x07230203; > -static const unsigned int SpvVersion = 0x00010000; > -static const unsigned int SpvRevision = 2; > +static const unsigned int SpvVersion = 0x00010100; > +static const unsigned int SpvRevision = 4; >Â static const unsigned int SpvOpCodeMask = 0xffff; >Â static const unsigned int SpvWordCountShift = 16; > > @@ -65,6 +65,7 @@ typedef enum SpvSourceLanguage_ { >Â Â Â SpvSourceLanguageGLSL = 2, >Â Â Â SpvSourceLanguageOpenCL_C = 3, >Â Â Â SpvSourceLanguageOpenCL_CPP = 4, > +Â Â SpvSourceLanguageMax = 0x7fffffff, >Â } SpvSourceLanguage; > >Â typedef enum SpvExecutionModel_ { > @@ -75,18 +76,21 @@ typedef enum SpvExecutionModel_ { >Â Â Â SpvExecutionModelFragment = 4, >Â Â Â SpvExecutionModelGLCompute = 5, >Â Â Â SpvExecutionModelKernel = 6, > +Â Â SpvExecutionModelMax = 0x7fffffff, >Â } SpvExecutionModel; > >Â typedef enum SpvAddressingModel_ { >Â Â Â SpvAddressingModelLogical = 0, >Â Â Â SpvAddressingModelPhysical32 = 1, >Â Â Â SpvAddressingModelPhysical64 = 2, > +Â Â SpvAddressingModelMax = 0x7fffffff, >Â } SpvAddressingModel; > >Â typedef enum SpvMemoryModel_ { >Â Â Â SpvMemoryModelSimple = 0, >Â Â Â SpvMemoryModelGLSL450 = 1, >Â Â Â SpvMemoryModelOpenCL = 2, > +Â Â SpvMemoryModelMax = 0x7fffffff, >Â } SpvMemoryModel; > >Â typedef enum SpvExecutionMode_ { > @@ -121,6 +125,11 @@ typedef enum SpvExecutionMode_ { >Â Â Â SpvExecutionModeOutputTriangleStrip = 29, >Â Â Â SpvExecutionModeVecTypeHint = 30, >Â Â Â SpvExecutionModeContractionOff = 31, > +Â Â SpvExecutionModeInitializer = 33, > +Â Â SpvExecutionModeFinalizer = 34, > +Â Â SpvExecutionModeSubgroupSize = 35, > +Â Â SpvExecutionModeSubgroupsPerWorkgroup = 36, > +Â Â SpvExecutionModeMax = 0x7fffffff, >Â } SpvExecutionMode; > >Â typedef enum SpvStorageClass_ { > @@ -136,6 +145,7 @@ typedef enum SpvStorageClass_ { >Â Â Â SpvStorageClassPushConstant = 9, >Â Â Â SpvStorageClassAtomicCounter = 10, >Â Â Â SpvStorageClassImage = 11, > +Â Â SpvStorageClassMax = 0x7fffffff, >Â } SpvStorageClass; > >Â typedef enum SpvDim_ { > @@ -146,6 +156,7 @@ typedef enum SpvDim_ { >Â Â Â SpvDimRect = 4, >Â Â Â SpvDimBuffer = 5, >Â Â Â SpvDimSubpassData = 6, > +Â Â SpvDimMax = 0x7fffffff, >Â } SpvDim; > >Â typedef enum SpvSamplerAddressingMode_ { > @@ -154,11 +165,13 @@ typedef enum SpvSamplerAddressingMode_ { >Â Â Â SpvSamplerAddressingModeClamp = 2, >Â Â Â SpvSamplerAddressingModeRepeat = 3, >Â Â Â SpvSamplerAddressingModeRepeatMirrored = 4, > +Â Â SpvSamplerAddressingModeMax = 0x7fffffff, >Â } SpvSamplerAddressingMode; > >Â typedef enum SpvSamplerFilterMode_ { >Â Â Â SpvSamplerFilterModeNearest = 0, >Â Â Â SpvSamplerFilterModeLinear = 1, > +Â Â SpvSamplerFilterModeMax = 0x7fffffff, >Â } SpvSamplerFilterMode; > >Â typedef enum SpvImageFormat_ { > @@ -202,6 +215,7 @@ typedef enum SpvImageFormat_ { >Â Â Â SpvImageFormatRg8ui = 37, >Â Â Â SpvImageFormatR16ui = 38, >Â Â Â SpvImageFormatR8ui = 39, > +Â Â SpvImageFormatMax = 0x7fffffff, >Â } SpvImageFormat; > >Â typedef enum SpvImageChannelOrder_ { > @@ -224,6 +238,8 @@ typedef enum SpvImageChannelOrder_ { >Â Â Â SpvImageChannelOrdersRGBx = 16, >Â Â Â SpvImageChannelOrdersRGBA = 17, >Â Â Â SpvImageChannelOrdersBGRA = 18, > +Â Â SpvImageChannelOrderABGR = 19, > +Â Â SpvImageChannelOrderMax = 0x7fffffff, >Â } SpvImageChannelOrder; > >Â typedef enum SpvImageChannelDataType_ { > @@ -244,6 +260,7 @@ typedef enum SpvImageChannelDataType_ { >Â Â Â SpvImageChannelDataTypeFloat = 14, >Â Â Â SpvImageChannelDataTypeUnormInt24 = 15, >Â Â Â SpvImageChannelDataTypeUnormInt101010_2 = 16, > +Â Â SpvImageChannelDataTypeMax = 0x7fffffff, >Â } SpvImageChannelDataType; > >Â typedef enum SpvImageOperandsShift_ { > @@ -255,6 +272,7 @@ typedef enum SpvImageOperandsShift_ { >Â Â Â SpvImageOperandsConstOffsetsShift = 5, >Â Â Â SpvImageOperandsSampleShift = 6, >Â Â Â SpvImageOperandsMinLodShift = 7, > +Â Â SpvImageOperandsMax = 0x7fffffff, >Â } SpvImageOperandsShift; > >Â typedef enum SpvImageOperandsMask_ { > @@ -275,6 +293,7 @@ typedef enum SpvFPFastMathModeShift_ { >Â Â Â SpvFPFastMathModeNSZShift = 2, >Â Â Â SpvFPFastMathModeAllowRecipShift = 3, >Â Â Â SpvFPFastMathModeFastShift = 4, > +Â Â SpvFPFastMathModeMax = 0x7fffffff, >Â } SpvFPFastMathModeShift; > >Â typedef enum SpvFPFastMathModeMask_ { > @@ -291,17 +310,20 @@ typedef enum SpvFPRoundingMode_ { >Â Â Â SpvFPRoundingModeRTZ = 1, >Â Â Â SpvFPRoundingModeRTP = 2, >Â Â Â SpvFPRoundingModeRTN = 3, > +Â Â SpvFPRoundingModeMax = 0x7fffffff, >Â } SpvFPRoundingMode; > >Â typedef enum SpvLinkageType_ { >Â Â Â SpvLinkageTypeExport = 0, >Â Â Â SpvLinkageTypeImport = 1, > +Â Â SpvLinkageTypeMax = 0x7fffffff, >Â } SpvLinkageType; > >Â typedef enum SpvAccessQualifier_ { >Â Â Â SpvAccessQualifierReadOnly = 0, >Â Â Â SpvAccessQualifierWriteOnly = 1, >Â Â Â SpvAccessQualifierReadWrite = 2, > +Â Â SpvAccessQualifierMax = 0x7fffffff, >Â } SpvAccessQualifier; > >Â typedef enum SpvFunctionParameterAttribute_ { > @@ -313,6 +335,7 @@ typedef enum SpvFunctionParameterAttribute_ { >Â Â Â SpvFunctionParameterAttributeNoCapture = 5, >Â Â Â SpvFunctionParameterAttributeNoWrite = 6, >Â Â Â SpvFunctionParameterAttributeNoReadWrite = 7, > +Â Â SpvFunctionParameterAttributeMax = 0x7fffffff, >Â } SpvFunctionParameterAttribute; > >Â typedef enum SpvDecoration_ { > @@ -359,6 +382,8 @@ typedef enum SpvDecoration_ { >Â Â Â SpvDecorationNoContraction = 42, >Â Â Â SpvDecorationInputAttachmentIndex = 43, >Â Â Â SpvDecorationAlignment = 44, > +Â Â SpvDecorationMaxByteOffset = 45, > +Â Â SpvDecorationMax = 0x7fffffff, >Â } SpvDecoration; > >Â typedef enum SpvBuiltIn_ { > @@ -403,11 +428,21 @@ typedef enum SpvBuiltIn_ { >Â Â Â SpvBuiltInSubgroupLocalInvocationId = 41, >Â Â Â SpvBuiltInVertexIndex = 42, >Â Â Â SpvBuiltInInstanceIndex = 43, > +Â Â SpvBuiltInSubgroupEqMaskKHR = 4416, > +Â Â SpvBuiltInSubgroupGeMaskKHR = 4417, > +Â Â SpvBuiltInSubgroupGtMaskKHR = 4418, > +Â Â SpvBuiltInSubgroupLeMaskKHR = 4419, > +Â Â SpvBuiltInSubgroupLtMaskKHR = 4420, > +Â Â SpvBuiltInBaseVertex = 4424, > +Â Â SpvBuiltInBaseInstance = 4425, > +Â Â SpvBuiltInDrawIndex = 4426, > +Â Â SpvBuiltInMax = 0x7fffffff, >Â } SpvBuiltIn; > >Â typedef enum SpvSelectionControlShift_ { >Â Â Â SpvSelectionControlFlattenShift = 0, >Â Â Â SpvSelectionControlDontFlattenShift = 1, > +Â Â SpvSelectionControlMax = 0x7fffffff, >Â } SpvSelectionControlShift; > >Â typedef enum SpvSelectionControlMask_ { > @@ -419,12 +454,17 @@ typedef enum SpvSelectionControlMask_ { >Â typedef enum SpvLoopControlShift_ { >Â Â Â SpvLoopControlUnrollShift = 0, >Â Â Â SpvLoopControlDontUnrollShift = 1, > +Â Â SpvLoopControlDependencyInfiniteShift = 2, > +Â Â SpvLoopControlDependencyLengthShift = 3, > +Â Â SpvLoopControlMax = 0x7fffffff, >Â } SpvLoopControlShift; > >Â typedef enum SpvLoopControlMask_ { >Â Â Â SpvLoopControlMaskNone = 0, >Â Â Â SpvLoopControlUnrollMask = 0x00000001, >Â Â Â SpvLoopControlDontUnrollMask = 0x00000002, > +Â Â SpvLoopControlDependencyInfiniteMask = 0x00000004, > +Â Â SpvLoopControlDependencyLengthMask = 0x00000008, >Â } SpvLoopControlMask; > >Â typedef enum SpvFunctionControlShift_ { > @@ -432,6 +472,7 @@ typedef enum SpvFunctionControlShift_ { >Â Â Â SpvFunctionControlDontInlineShift = 1, >Â Â Â SpvFunctionControlPureShift = 2, >Â Â Â SpvFunctionControlConstShift = 3, > +Â Â SpvFunctionControlMax = 0x7fffffff, >Â } SpvFunctionControlShift; > >Â typedef enum SpvFunctionControlMask_ { > @@ -453,6 +494,7 @@ typedef enum SpvMemorySemanticsShift_ { >Â Â Â SpvMemorySemanticsCrossWorkgroupMemoryShift = 9, >Â Â Â SpvMemorySemanticsAtomicCounterMemoryShift = 10, >Â Â Â SpvMemorySemanticsImageMemoryShift = 11, > +Â Â SpvMemorySemanticsMax = 0x7fffffff, >Â } SpvMemorySemanticsShift; > >Â typedef enum SpvMemorySemanticsMask_ { > @@ -473,6 +515,7 @@ typedef enum SpvMemoryAccessShift_ { >Â Â Â SpvMemoryAccessVolatileShift = 0, >Â Â Â SpvMemoryAccessAlignedShift = 1, >Â Â Â SpvMemoryAccessNontemporalShift = 2, > +Â Â SpvMemoryAccessMax = 0x7fffffff, >Â } SpvMemoryAccessShift; > >Â typedef enum SpvMemoryAccessMask_ { > @@ -488,22 +531,26 @@ typedef enum SpvScope_ { >Â Â Â SpvScopeWorkgroup = 2, >Â Â Â SpvScopeSubgroup = 3, >Â Â Â SpvScopeInvocation = 4, > +Â Â SpvScopeMax = 0x7fffffff, >Â } SpvScope; > >Â typedef enum SpvGroupOperation_ { >Â Â Â SpvGroupOperationReduce = 0, >Â Â Â SpvGroupOperationInclusiveScan = 1, >Â Â Â SpvGroupOperationExclusiveScan = 2, > +Â Â SpvGroupOperationMax = 0x7fffffff, >Â } SpvGroupOperation; > >Â typedef enum SpvKernelEnqueueFlags_ { >Â Â Â SpvKernelEnqueueFlagsNoWait = 0, >Â Â Â SpvKernelEnqueueFlagsWaitKernel = 1, >Â Â Â SpvKernelEnqueueFlagsWaitWorkGroup = 2, > +Â Â SpvKernelEnqueueFlagsMax = 0x7fffffff, >Â } SpvKernelEnqueueFlags; > >Â typedef enum SpvKernelProfilingInfoShift_ { >Â Â Â SpvKernelProfilingInfoCmdExecTimeShift = 0, > +Â Â SpvKernelProfilingInfoMax = 0x7fffffff, >Â } SpvKernelProfilingInfoShift; > >Â typedef enum SpvKernelProfilingInfoMask_ { > @@ -568,6 +615,12 @@ typedef enum SpvCapability_ { >Â Â Â SpvCapabilityStorageImageReadWithoutFormat = 55, >Â Â Â SpvCapabilityStorageImageWriteWithoutFormat = 56, >Â Â Â SpvCapabilityMultiViewport = 57, > +Â Â SpvCapabilitySubgroupDispatch = 58, > +Â Â SpvCapabilityNamedBarrier = 59, > +Â Â SpvCapabilityPipeStorage = 60, > +Â Â SpvCapabilitySubgroupBallotKHR = 4423, > +Â Â SpvCapabilityDrawParameters = 4427, > +Â Â SpvCapabilityMax = 0x7fffffff, >Â } SpvCapability; > >Â typedef enum SpvOp_ { > @@ -864,6 +917,20 @@ typedef enum SpvOp_ { >Â Â Â SpvOpNoLine = 317, >Â Â Â SpvOpAtomicFlagTestAndSet = 318, >Â Â Â SpvOpAtomicFlagClear = 319, > +Â Â SpvOpImageSparseRead = 320, > +Â Â SpvOpSizeOf = 321, > +Â Â SpvOpTypePipeStorage = 322, > +Â Â SpvOpConstantPipeStorage = 323, > +Â Â SpvOpCreatePipeFromPipeStorage = 324, > +Â Â SpvOpGetKernelLocalSizeForSubgroupCount = 325, > +Â Â SpvOpGetKernelMaxNumSubgroups = 326, > +Â Â SpvOpTypeNamedBarrier = 327, > +Â Â SpvOpNamedBarrierInitialize = 328, > +Â Â SpvOpMemoryNamedBarrier = 329, > +Â Â SpvOpModuleProcessed = 330, > +Â Â SpvOpSubgroupBallotKHR = 4421, > +Â Â SpvOpSubgroupFirstInvocationKHR = 4422, > +Â Â SpvOpMax = 0x7fffffff, >Â } SpvOp; > >Â #endifÂ // #ifndef spirv_H > diff --git a/src/compiler/spirv/spirv_info.c > b/src/compiler/spirv/spirv_info.c > index 7a5774c443..1036b41c31 100644 > --- a/src/compiler/spirv/spirv_info.c > +++ b/src/compiler/spirv/spirv_info.c > @@ -82,6 +82,11 @@ static const char * const capability_to_string[] = { >Â Â Â CAPABILITY(StorageImageReadWithoutFormat), >Â Â Â CAPABILITY(StorageImageWriteWithoutFormat), >Â Â Â CAPABILITY(MultiViewport), > +Â Â CAPABILITY(SubgroupDispatch), > +Â Â CAPABILITY(NamedBarrier), > +Â Â CAPABILITY(PipeStorage), > +Â Â CAPABILITY(SubgroupBallotKHR), > +Â Â CAPABILITY(DrawParameters), >Â }; > >Â const char * > @@ -138,6 +143,7 @@ static const char * const decoration_to_string[] = { >Â Â Â DECORATION(NoContraction), >Â Â Â DECORATION(InputAttachmentIndex), >Â Â Â DECORATION(Alignment), > +Â Â DECORATION(MaxByteOffset), >Â }; > >Â const char * > diff --git a/src/compiler/spirv/spirv_to_nir.c > b/src/compiler/spirv/spirv_to_nir.c > index 968502c5fd..6f18af2018 100644 > --- a/src/compiler/spirv/spirv_to_nir.c > +++ b/src/compiler/spirv/spirv_to_nir.c > @@ -561,6 +561,9 @@ struct_member_decoration_cb(struct vtn_builder *b, >Â Â Â Â vtn_warn("Decoration only allowed for CL-style kernels: %s", >Â Â Â Â Â Â Â Â Â spirv_decoration_to_string(dec->decoration)); >Â Â Â Â break; > + > +Â Â default: > +Â Â Â unreachable("Unhandled decoration"); >Â Â Â } >Â } > > @@ -638,6 +641,9 @@ type_decoration_cb(struct vtn_builder *b, >Â Â Â Â vtn_warn("Decoration only allowed for CL-style kernels: %s", >Â Â Â Â Â Â Â Â Â spirv_decoration_to_string(dec->decoration)); >Â Â Â Â break; > + > +Â Â default: > +Â Â Â unreachable("Unhandled decoration"); >Â Â Â } >Â } > > @@ -2653,6 +2659,9 @@ vtn_handle_preamble_instruction(struct vtn_builder > *b, SpvOp opcode, >Â Â Â Â case SpvCapabilityTessellationPointSize: >Â Â Â Â Â Â spv_check_supported(tessellation, cap); >Â Â Â Â Â Â break; > + > +Â Â Â default: > +Â Â Â Â Â unreachable("Unhandled capability"); >Â Â Â Â } >Â Â Â Â break; >Â Â Â } > @@ -2842,6 +2851,9 @@ vtn_handle_execution_mode(struct vtn_builder *b, > struct vtn_value *entry_point, >Â Â Â case SpvExecutionModeVecTypeHint: >Â Â Â case SpvExecutionModeContractionOff: >Â Â Â Â break; /* OpenCL */ > + > +Â Â default: > +Â Â Â unreachable("Unhandled execution mode"); >Â Â Â } >Â } > > diff --git a/src/compiler/spirv/vtn_variables.c > b/src/compiler/spirv/vtn_variables.c > index 4d1ec789cc..05ac91eedd 100644 > --- a/src/compiler/spirv/vtn_variables.c > +++ b/src/compiler/spirv/vtn_variables.c > @@ -1139,6 +1139,9 @@ apply_var_decoration(struct vtn_builder *b, > nir_variable *nir_var, >Â Â Â Â vtn_warn("Decoration only allowed for CL-style kernels: %s", >Â Â Â Â Â Â Â Â Â spirv_decoration_to_string(dec->decoration)); >Â Â Â Â break; > + > +Â Â default: > +Â Â Â unreachable("Unhandled decoration"); >Â Â Â } >Â } > > -- > 2.11.0 > > _______________________________________________ > mesa-dev mailing list > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </div></div></blockquote></div> </div></div>