Revert "Re-apply i64 support for get_global_id calculations"

This change reverts the following commit: 5ca86ba

Author: aratajew

IGC/BiFModule/Implementation/workitem.cl

@@ -40,9 +40,9 @@ uint __intel_WorkgroupSize()
 size_t __intel_EnqueuedWorkgroupSize()
 {
     size_t totalWorkGroupSize =
-        (size_t) __builtin_IB_get_enqueued_local_size(0) *
-        (size_t) __builtin_IB_get_enqueued_local_size(1) *
-        (size_t) __builtin_IB_get_enqueued_local_size(2);
+        __builtin_IB_get_enqueued_local_size(0) *
+        __builtin_IB_get_enqueued_local_size(1) *
+        __builtin_IB_get_enqueued_local_size(2);
 
     BuiltinAssumeGE0(totalWorkGroupSize);
     return totalWorkGroupSize;
@@ -105,8 +105,8 @@ size_t OVERLOADABLE __intel_GlobalInvocationId(uint dim)
         return 0;
 
     size_t v =
-        (size_t) __builtin_IB_get_group_id(dim) * (size_t) __builtin_IB_get_enqueued_local_size(dim) +
-        (size_t) __intel_LocalInvocationId(dim) + (size_t) __builtin_IB_get_global_offset(dim);
+        __builtin_IB_get_group_id(dim) * __builtin_IB_get_enqueued_local_size(dim) +
+        __intel_LocalInvocationId(dim) + __builtin_IB_get_global_offset(dim);
 
 #ifndef NO_ASSUME_SUPPORT
      BuiltinAssumeGE0(v);
@@ -259,38 +259,18 @@ size_t SPIRV_OVERLOADABLE SPIRV_BUILTIN_NO_OP(BuiltInGlobalLinearId, , )()
   switch (dim) {
     default:
     case 1:
-    {
-      size_t gid0 = __intel_GlobalInvocationId(0);
-      size_t globalOffset0 = __builtin_IB_get_global_offset(0);
-      result = gid0 - globalOffset0;
+      result = __intel_GlobalInvocationId(0) - __builtin_IB_get_global_offset(0);
       break;
-    }
     case 2:
-    {
-      size_t gid0 = __intel_GlobalInvocationId(0);
-      size_t gid1 = __intel_GlobalInvocationId(1);
-      size_t globalOffset0 = __builtin_IB_get_global_offset(0);
-      size_t globalOffset1 = __builtin_IB_get_global_offset(1);
-      size_t globalSize0 = __builtin_IB_get_global_size(0);
-      result = (gid1 - globalOffset1) * globalSize0 +
-               (gid0 - globalOffset0);
+      result = (__intel_GlobalInvocationId(1) - __builtin_IB_get_global_offset(1))*
+                __builtin_IB_get_global_size(0) + (__intel_GlobalInvocationId(0) - __builtin_IB_get_global_offset(0));
       break;
-    }
     case 3:
-    {
-      size_t gid0 = __intel_GlobalInvocationId(0);
-      size_t gid1 = __intel_GlobalInvocationId(1);
-      size_t gid2 = __intel_GlobalInvocationId(2);
-      size_t globalOffset0 = __builtin_IB_get_global_offset(0);
-      size_t globalOffset1 = __builtin_IB_get_global_offset(1);
-      size_t globalOffset2 = __builtin_IB_get_global_offset(2);
-      size_t globalSize0 = __builtin_IB_get_global_size(0);
-      size_t globalSize1 = __builtin_IB_get_global_size(1);
-      result = ((gid2 - globalOffset2) * globalSize1 * globalSize0) +
-               ((gid1 - globalOffset1) * globalSize0) +
-               (gid0 - globalOffset0);
+      result = ((__intel_GlobalInvocationId(2) - __builtin_IB_get_global_offset(2)) *
+                __builtin_IB_get_global_size(1) * __builtin_IB_get_global_size(0)) +
+               ((__intel_GlobalInvocationId(1) - __builtin_IB_get_global_offset(1)) * __builtin_IB_get_global_size(0)) +
+               (__intel_GlobalInvocationId(0) - __builtin_IB_get_global_offset(0));
       break;
-    }
   }
 
   BuiltinAssumeGE0(result);

IGC/ocloc_tests/DebugInfo/simd32-sliced-stack-value.cl

@@ -7,7 +7,7 @@
 //=========================== end_copyright_notice =============================
 
 // UNSUPPORTED: sys32
-// REQUIRES: temporarily-disabled, oneapi-readelf, dg2-supported
+// REQUIRES: oneapi-readelf, dg2-supported
 
 // RUN: ocloc compile -file %s -options "-g -igc_opts 'PrintToConsole=1 PrintAfter=EmitPass'" -device dg2 2>&1 | FileCheck %s --check-prefix=CHECK-LLVM
 // RUN: ocloc compile -file %s -options "-g -igc_opts 'ElfDumpEnable=1 DumpUseShorterName=0 DebugDumpNamePrefix=%t_dg2_'" -device dg2