[SPIR-V 1.4] Deprecate OpDecorationGroup, OpGroupDecorate, and OpGroupMemberDecorate

Author: vmaksimo

lib/SPIRV/libSPIRV/SPIRVDecorate.h

@@ -411,6 +411,10 @@ class SPIRVDecorationGroup : public SPIRVEntry {
   void validate() const override {
     assert(OpCode == OC);
     assert(WordCount == WC);
+    getModule()->getErrorLog().checkError(
+        getModule()->getSPIRVVersion() < VersionNumber::SPIRV_1_4,
+        SPIRVEC_InvalidModule,
+        "OpDecorationGroup is deprecated starting from SPIR-V 1.4");
   }
 };
 
@@ -433,6 +437,13 @@ class SPIRVGroupDecorateGeneric : public SPIRVEntryNoIdGeneric {
   }
   virtual void decorateTargets() = 0;
   _SPIRV_DCL_ENCDEC
+  void validate() const override {
+    getModule()->getErrorLog().checkError(
+        this->getModule()->getSPIRVVersion() < VersionNumber::SPIRV_1_4,
+        SPIRVEC_InvalidModule,
+        "OpGroup(Member)Decorate is deprecated starting from SPIR-V 1.4");
+  }
+
 protected:
   SPIRVDecorationGroup *DecorationGroup;
   std::vector<SPIRVId> Targets;

test/negative/group-decorate.spt

@@ -0,0 +1,38 @@
+; This is a copy of test/group-decorate.spt with the changed SPIR-V version.
+; Verify that we don't accept OpDecorationGroup and OpGroupDecorate in SPIR-V 1.4 or higher
+119734787 66560 393230 15 0 
+2 Capability Addresses 
+2 Capability Kernel 
+2 Capability Int8 
+5 ExtInstImport 1 "OpenCL.std"
+3 MemoryModel 1 2 
+5 EntryPoint 6 7 "test"
+13 String 12 "kernel_arg_type.test.char4*,char4*,char4*,"
+3 Source 3 102000 
+4 Name 8 "src1"
+4 Name 9 "src2"
+3 Name 10 "dst"
+4 Name 11 "entry"
+4 Decorate 13 FuncParamAttr 5 
+2 DecorationGroup 13 
+5 GroupDecorate 13 8 9 10 
+4 TypeInt 3 8 0 
+2 TypeVoid 2 
+4 TypeVector 4 3 4 
+4 TypePointer 5 5 4 
+6 TypeFunction 6 2 5 5 5 
+
+
+5 Function 2 7 4 6 
+3 FunctionParameter 5 8 
+3 FunctionParameter 5 9 
+3 FunctionParameter 5 10 
+
+2 Label 11 
+1 Return 
+
+1 FunctionEnd 
+
+; RUN: not llvm-spirv %s -to-binary -o %t.spv 
+; 2>&1 | FileCheck %s
+; CHECK: InvalidModule: Invalid SPIR-V module: OpDecorationGroup is deprecated starting from SPIR-V 1.4