Merge branch 'printing-classes'

diff --cc include/spirv/unified1/spirv.core.grammar.json
index 20eafde,5365c77..14bf5d3
--- 1/include/spirv/unified1/spirv.core.grammar.json
--- 2/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@@ -750,6 -934,8 +934,7 @@@
      },
      {
        "opname" : "OpImageSampleExplicitLod",
 -      "class"  : "Image",
+       "class"  : "Image",
        "opcode" : 88,
        "operands" : [
          { "kind" : "IdResultType" },
@@@ -3871,19 -4337,8 +4336,21 @@@
        "version" : "None"
      },
      {
 +      "opname" : "OpReadClockKHR",
++      "class"  : "Reserved",
 +      "opcode" : 5056,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope", "name" : "'Execution'" }
 +      ],
 +      "capabilities" : [ "ShaderClockKHR" ],
 +      "extensions" : [ "SPV_KHR_shader_clock" ],
 +      "version" : "None"
 +    },
 +    {
        "opname" : "OpImageSampleFootprintNV",
+       "class"  : "Image",
        "opcode" : 5283,
        "operands" : [
          { "kind" : "IdResultType" },
@@@ -4057,39 -4531,8 +4543,44 @@@
        "version" : "None"
      },
      {
 +      "opname" : "OpBeginInvocationInterlockEXT",
++      "class"  : "Reserved",
 +      "opcode" : 5364,
 +      "capabilities" : [ "FragmentShaderSampleInterlockEXT", "FragmentShaderPixelInterlockEXT", "FragmentShaderShadingRateInterlockEXT" ],
 +      "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpEndInvocationInterlockEXT",
++      "class"  : "Reserved",
 +      "opcode" : 5365,
 +      "capabilities" : [ "FragmentShaderSampleInterlockEXT", "FragmentShaderPixelInterlockEXT", "FragmentShaderShadingRateInterlockEXT" ],
 +      "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpDemoteToHelperInvocationEXT",
++      "class"  : "Reserved",
 +      "opcode" : 5380,
 +      "capabilities" : [ "DemoteToHelperInvocationEXT" ],
 +      "extensions" : [ "SPV_EXT_demote_to_helper_invocation" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpIsHelperInvocationEXT",
++      "class"  : "Reserved",
 +      "opcode" : 5381,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" }
 +      ],
 +      "capabilities" : [ "DemoteToHelperInvocationEXT" ],
 +      "extensions" : [ "SPV_EXT_demote_to_helper_invocation" ],
 +      "version" : "None"
 +    },
 +    {
        "opname" : "OpSubgroupShuffleINTEL",
+       "class"  : "Group",
        "opcode" : 5571,
        "operands" : [
          { "kind" : "IdResultType" },