Fix parallel to gpu tests

Author: ivanradanov

test/polygeist-opt/paralleltogpu.mlir

@@ -40,9 +40,8 @@ module {
 // CHECK-DAG:           %[[VAL_3:.*]] = arith.constant 10000000 : index
 // CHECK:           gpu.launch blocks(%[[VAL_4:.*]], %[[VAL_5:.*]], %[[VAL_6:.*]]) in (%[[VAL_7:.*]] = %[[VAL_2]], %[[VAL_8:.*]] = %[[VAL_0]], %[[VAL_9:.*]] = %[[VAL_0]]) threads(%[[VAL_10:.*]], %[[VAL_11:.*]], %[[VAL_12:.*]]) in (%[[VAL_13:.*]] = %[[VAL_1]], %[[VAL_14:.*]] = %[[VAL_0]], %[[VAL_15:.*]] = %[[VAL_0]]) {
 // CHECK:             %[[VAL_16:.*]] = gpu.block_id  x
-// CHECK:             %[[VAL_17:.*]] = gpu.block_dim  x
 // CHECK:             %[[VAL_18:.*]] = gpu.thread_id  x
-// CHECK:             %[[VAL_19:.*]] = arith.muli %[[VAL_16]], %[[VAL_17]] : index
+// CHECK:             %[[VAL_19:.*]] = arith.muli %[[VAL_16]], %[[VAL_1]] : index
 // CHECK:             %[[VAL_20:.*]] = arith.addi %[[VAL_19]], %[[VAL_18]] : index
 // CHECK:             %[[VAL_21:.*]] = arith.cmpi ult, %[[VAL_20]], %[[VAL_3]] : index
 // CHECK:             scf.if %[[VAL_21]] {
@@ -150,11 +149,10 @@ module {
 // CHECK:               gpu.launch blocks(%[[VAL_165:.*]], %[[VAL_166:.*]], %[[VAL_167:.*]]) in (%[[VAL_168:.*]] = %[[VAL_0]], %[[VAL_169:.*]] = %[[VAL_163]], %[[VAL_170:.*]] = %[[VAL_10]]) threads(%[[VAL_171:.*]], %[[VAL_172:.*]], %[[VAL_173:.*]]) in (%[[VAL_174:.*]] = %[[VAL_7]], %[[VAL_175:.*]] = %[[VAL_9]], %[[VAL_176:.*]] = %[[VAL_8]]) {
 // CHECK:                 %[[VAL_177:.*]] = gpu.block_id  x
 // CHECK:                 %[[VAL_178:.*]] = gpu.block_id  y
-// CHECK:                 %[[VAL_179:.*]] = gpu.block_dim  x
 // CHECK:                 %[[VAL_180:.*]] = gpu.thread_id  x
 // CHECK:                 %[[VAL_181:.*]] = gpu.thread_id  y
 // CHECK:                 %[[VAL_182:.*]] = gpu.thread_id  z
-// CHECK:                 %[[VAL_183:.*]] = arith.muli %[[VAL_178]], %[[VAL_179]] : index
+// CHECK:                 %[[VAL_183:.*]] = arith.muli %[[VAL_178]], %[[VAL_7]] : index
 // CHECK:                 %[[VAL_184:.*]] = arith.addi %[[VAL_183]], %[[VAL_180]] : index
 // CHECK:                 %[[VAL_185:.*]] = arith.cmpi ult, %[[VAL_184]], %[[VAL_1]] : index
 // CHECK:                 scf.if %[[VAL_185]] {

test/polygeist-opt/paralleltogpu2.mlir

@@ -33,9 +33,8 @@ module {
 // CHECK:           %[[VAL_10:.*]] = arith.addi %[[VAL_9]], %[[VAL_3]] : index
 // CHECK:           gpu.launch blocks(%[[VAL_11:.*]], %[[VAL_12:.*]], %[[VAL_13:.*]]) in (%[[VAL_14:.*]] = %[[VAL_10]], %[[VAL_15:.*]] = %[[VAL_3]], %[[VAL_16:.*]] = %[[VAL_3]]) threads(%[[VAL_17:.*]], %[[VAL_18:.*]], %[[VAL_19:.*]]) in (%[[VAL_20:.*]] = %[[VAL_5]], %[[VAL_21:.*]] = %[[VAL_3]], %[[VAL_22:.*]] = %[[VAL_3]]) {
 // CHECK:             %[[VAL_23:.*]] = gpu.block_id  x
-// CHECK:             %[[VAL_24:.*]] = gpu.block_dim  x
 // CHECK:             %[[VAL_25:.*]] = gpu.thread_id  x
-// CHECK:             %[[VAL_26:.*]] = arith.muli %[[VAL_23]], %[[VAL_24]] : index
+// CHECK:             %[[VAL_26:.*]] = arith.muli %[[VAL_23]], %[[VAL_5]] : index
 // CHECK:             %[[VAL_27:.*]] = arith.addi %[[VAL_26]], %[[VAL_25]] : index
 // CHECK:             %[[VAL_28:.*]] = arith.cmpi ult, %[[VAL_27]], %[[VAL_2]] : index
 // CHECK:             scf.if %[[VAL_28]] {

test/polygeist-opt/wrapperifparallel.mlir

@@ -36,9 +36,8 @@ module {
 // CHECK:               %[[VAL_144:.*]] = "polygeist.gpu_error"() ({
 // CHECK:                 gpu.launch blocks(%[[VAL_145:.*]], %[[VAL_146:.*]], %[[VAL_147:.*]]) in (%[[VAL_148:.*]] = %[[VAL_143]], %[[VAL_149:.*]] = %[[VAL_7]], %[[VAL_150:.*]] = %[[VAL_7]]) threads(%[[VAL_151:.*]], %[[VAL_152:.*]], %[[VAL_153:.*]]) in (%[[VAL_154:.*]] = %[[VAL_6]], %[[VAL_155:.*]] = %[[VAL_7]], %[[VAL_156:.*]] = %[[VAL_7]]) {
 // CHECK:                   %[[VAL_157:.*]] = gpu.block_id  x
-// CHECK:                   %[[VAL_158:.*]] = gpu.block_dim  x
 // CHECK:                   %[[VAL_159:.*]] = gpu.thread_id  x
-// CHECK:                   %[[VAL_160:.*]] = arith.muli %[[VAL_157]], %[[VAL_158]] : index
+// CHECK:                   %[[VAL_160:.*]] = arith.muli %[[VAL_157]], %[[VAL_6]] : index
 // CHECK:                   %[[VAL_161:.*]] = arith.addi %[[VAL_160]], %[[VAL_159]] : index
 // CHECK:                   %[[VAL_162:.*]] = arith.cmpi ult, %[[VAL_161]], %[[VAL_1]] : index
 // CHECK:                   scf.if %[[VAL_162]] {