diff --git a/test/DebugInfo/DebugMacroDef.ll b/test/DebugInfo/DebugMacroDef.ll
index 7b247cab14..3e5ed53713 100644
--- a/test/DebugInfo/DebugMacroDef.ll
+++ b/test/DebugInfo/DebugMacroDef.ll
@@ -44,7 +44,7 @@
 
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[type:.*]] = OpTypeInt 32 0
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[uint_1_reg:.*]] = OpConstant %[[type]] 1
-; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] 32 %[[#]] %[[uint_1_reg]] %[[#]] %[[#]]
+; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] {{(32|DebugMacroDef)}} %[[#]] %[[uint_1_reg]] %[[#]] %[[#]]
 
 target triple = "spir64-unknown-unknown"
 
diff --git a/test/DebugInfo/DebugMacroDefNoValue.ll b/test/DebugInfo/DebugMacroDefNoValue.ll
index 66b6302b9d..d487176e0a 100644
--- a/test/DebugInfo/DebugMacroDefNoValue.ll
+++ b/test/DebugInfo/DebugMacroDefNoValue.ll
@@ -64,9 +64,9 @@
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[baz_name:.*]] = OpString "BAZ"
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[foo_name:.*]] = OpString "FOO"
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[foo_value:.*]] = OpString "1"
-; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] 32 %[[#]] %[[uint_1_reg]] %[[bar_name]]
-; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] 32 %[[#]] %[[uint_2_reg]] %[[baz_name]]
-; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] 32 %[[#]] %[[uint_3_reg]] %[[foo_name]] %[[foo_value]]
+; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] {{(32|DebugMacroDef)}} %[[#]] %[[uint_1_reg]] %[[bar_name]]
+; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] {{(32|DebugMacroDef)}} %[[#]] %[[uint_2_reg]] %[[baz_name]]
+; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] {{(32|DebugMacroDef)}} %[[#]] %[[uint_3_reg]] %[[foo_name]] %[[foo_value]]
 
 target triple = "spir64-unknown-unknown"
 
diff --git a/test/DebugInfo/DebugMacroDefRoot.ll b/test/DebugInfo/DebugMacroDefRoot.ll
index 48b7c5eee4..0c419c74a8 100644
--- a/test/DebugInfo/DebugMacroDefRoot.ll
+++ b/test/DebugInfo/DebugMacroDefRoot.ll
@@ -47,7 +47,7 @@
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[uint_1_reg:.*]] = OpConstant %[[type]] 1
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[size_name:.*]] = OpString "SIZE"
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[size_value:.*]] = OpString "5"
-; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] 32 %[[#]] %[[uint_1_reg]] %[[size_name]] %[[size_value]]
+; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] {{(32|DebugMacroDef)}} %[[#]] %[[uint_1_reg]] %[[size_name]] %[[size_value]]
 
 target triple = "spir64-unknown-unknown"
 
diff --git a/test/DebugInfo/DebugMacroUndefinedUndef.ll b/test/DebugInfo/DebugMacroUndefinedUndef.ll
index e4cbb28872..9e866d1da4 100644
--- a/test/DebugInfo/DebugMacroUndefinedUndef.ll
+++ b/test/DebugInfo/DebugMacroUndefinedUndef.ll
@@ -48,8 +48,8 @@
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[type:.*]] = OpTypeInt 32 0
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[uint_1_reg:.*]] = OpConstant %[[type]] 1
 ; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[source_file:.*]] = OpString "./def.c"
-; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[debug_none:.*]] = OpExtInst %void %[[#]] 0
-; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] 33 %[[source_file]] %[[uint_1_reg]] %[[debug_none]]
+; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[debug_none:.*]] = OpExtInst %void %[[#]] {{(0|DebugInfoNone)}}
+; CHECK-SPIRV-NON-SEMANTIC-200-DAG: %[[#]] = OpExtInst %void %[[#]] {{(33|DebugMacroUndef)}} %[[source_file]] %[[uint_1_reg]] %[[debug_none]]
 
 target triple = "spir64-unknown-unknown"