Index: llvm/lib/Target/AMDGPU/AMDGPULowerIntrinsics.cpp
===================================================================
--- llvm/lib/Target/AMDGPU/AMDGPULowerIntrinsics.cpp
+++ llvm/lib/Target/AMDGPU/AMDGPULowerIntrinsics.cpp
@@ -154,16 +154,6 @@
       if (expandMemIntrinsicUses(F))
         Changed = true;
       break;
-
-    case Intrinsic::r600_read_tidig_x:
-    case Intrinsic::r600_read_tidig_y:
-    case Intrinsic::r600_read_tidig_z:
-    case Intrinsic::r600_read_local_size_x:
-    case Intrinsic::r600_read_local_size_y:
-    case Intrinsic::r600_read_local_size_z:
-      Changed |= makeLIDRangeMetadata(F);
-      break;
-
     default:
       break;
     }