Fix up tests based on code review.

Author: s-perron

llvm/test/CodeGen/SPIRV/ShaderBufferImage.ll

@@ -7,12 +7,12 @@
 ; CHECK-NOT: OpCapability ImageBasic
 ; CHECK-NOT: OpCapability ImageReadWrite
 
-; CHECK: [[Float:%[0-9]+]] = OpTypeFloat 32
-; CHECK: [[Void:%[0-9]+]] = OpTypeVoid
-; CHECK: [[ImageType:%[0-9]+]] = OpTypeImage [[Float]] Buffer 2 0 0 2 R32i {{$}}
-; CHECK: [[ImageFuncType:%[0-9]+]] = OpTypeFunction [[Void]] [[ImageType]]
+; CHECK-DAG: [[Float:%[0-9]+]] = OpTypeFloat 32
+; CHECK-DAG: [[Void:%[0-9]+]] = OpTypeVoid
+; CHECK-DAG: [[ImageType:%[0-9]+]] = OpTypeImage [[Float]] Buffer 2 0 0 2 R32i {{$}}
+; CHECK-DAG: [[ImageFuncType:%[0-9]+]] = OpTypeFunction [[Void]] [[ImageType]]
 
-; CHECK: {{%[0-9]+}} = OpFunction [[Void]] DontInline [[ImageFuncType]]    ; -- Begin function ImageWithNoAccessQualifier
+; CHECK: {{%[0-9]+}} = OpFunction [[Void]] DontInline [[ImageFuncType]]
 define void @ImageWithNoAccessQualifier(target("spirv.Image", float, 5, 2, 0, 0, 2, 24) %img) #0 {
   ret void
 }

llvm/test/CodeGen/SPIRV/ShaderImage.ll

@@ -1,19 +1,19 @@
 ; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv-vulkan-library %s -o - | FileCheck %s
 ; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-vulkan-library %s -o - -filetype=obj | spirv-val %}
 
-; CHECK: [[Float:%[0-9]+]] = OpTypeFloat 32
-; CHECK: [[Void:%[0-9]+]] = OpTypeVoid
-; CHECK: [[ImageType:%[0-9]+]] = OpTypeImage [[Float]] Buffer 2 0 0 1 R32i {{$}}
-; CHECK: [[ImageFuncType:%[0-9]+]] = OpTypeFunction [[Void]] [[ImageType]]
-; CHECK: [[SampledImageType:%[0-9]+]] = OpTypeSampledImage [[ImageType]]
-; CHECK: [[SampledImageFuncType:%[0-9]+]] = OpTypeFunction [[Void]] [[SampledImageType]]
+; CHECK-DAG: [[Float:%[0-9]+]] = OpTypeFloat 32
+; CHECK-DAG: [[Void:%[0-9]+]] = OpTypeVoid
+; CHECK-DAG: [[ImageType:%[0-9]+]] = OpTypeImage [[Float]] Buffer 2 0 0 1 R32i {{$}}
+; CHECK-DAG: [[ImageFuncType:%[0-9]+]] = OpTypeFunction [[Void]] [[ImageType]]
+; CHECK-DAG: [[SampledImageType:%[0-9]+]] = OpTypeSampledImage [[ImageType]]
+; CHECK-DAG: [[SampledImageFuncType:%[0-9]+]] = OpTypeFunction [[Void]] [[SampledImageType]]
 
-; CHECK: {{%[0-9]+}} = OpFunction [[Void]] DontInline [[ImageFuncType]]    ; -- Begin function ImageWithNoAccessQualifier
+; CHECK: {{%[0-9]+}} = OpFunction [[Void]] DontInline [[ImageFuncType]]
 define void @ImageWithNoAccessQualifier(target("spirv.Image", float, 5, 2, 0, 0, 1, 24) %img) #0 {
   ret void
 }
 
-; CHECK: {{%[0-9]+}} = OpFunction [[Void]] DontInline [[SampledImageFuncType]]    ; -- Begin function SampledImageWithNoAccessQualifier
+; CHECK: {{%[0-9]+}} = OpFunction [[Void]] DontInline [[SampledImageFuncType]]
 define void @SampledImageWithNoAccessQualifier(target("spirv.SampledImage", float, 5, 2, 0, 0, 1, 24) %img) #0 {
   ret void
 }