[rebase] update SystemClock lowering to pass the integer kind for the result (new runtime argument)

Author: jeanPerier

flang/lib/Lower/Runtime.cpp

@@ -340,7 +340,15 @@ void Fortran::lower::genSystemClock(fir::FirOpBuilder &builder,
                                     mlir::Location loc, mlir::Value count,
                                     mlir::Value rate, mlir::Value max) {
   auto makeCall = [&](mlir::FuncOp func, mlir::Value arg) {
-    mlir::Value res = builder.create<fir::CallOp>(loc, func).getResult(0);
+    auto kindTy = func.getType().getInput(0);
+    int integerKind = 8;
+    if (auto intType =
+            fir::unwrapRefType(arg.getType()).dyn_cast<mlir::IntegerType>())
+      integerKind = intType.getWidth() / 8;
+    auto kind = builder.createIntegerConstant(loc, kindTy, integerKind);
+    mlir::Value res =
+        builder.create<fir::CallOp>(loc, func, mlir::ValueRange{kind})
+            .getResult(0);
     mlir::Value castRes =
         builder.createConvert(loc, fir::dyn_cast_ptrEleTy(arg.getType()), res);
     builder.create<fir::StoreOp>(loc, castRes, arg);

flang/test/Lower/intrinsic-procedures/system_clock.f90

@@ -8,18 +8,22 @@ subroutine system_clock_test()
   ! CHECK-DAG: %[[c:.*]] = fir.alloca i32 {bindc_name = "c"
   ! CHECK-DAG: %[[m:.*]] = fir.alloca i64 {bindc_name = "m"
   ! CHECK-DAG: %[[r:.*]] = fir.alloca f32 {bindc_name = "r"
-  ! CHECK: %[[Count:.*]] = fir.call @_FortranASystemClockCount() : () -> i64
+  ! CHECK: %[[c4:.*]] = arith.constant 4 : i32
+  ! CHECK: %[[Count:.*]] = fir.call @_FortranASystemClockCount(%[[c4]]) : (i32) -> i64
   ! CHECK: %[[Count1:.*]] = fir.convert %[[Count]] : (i64) -> i32
   ! CHECK: fir.store %[[Count1]] to %[[c]] : !fir.ref<i32>
-  ! CHECK: %[[Rate:.*]] = fir.call @_FortranASystemClockCountRate() : () -> i64
+  ! CHECK: %[[c8:.*]] = arith.constant 8 : i32
+  ! CHECK: %[[Rate:.*]] = fir.call @_FortranASystemClockCountRate(%[[c8]]) : (i32) -> i64
   ! CHECK: %[[Rate1:.*]] = fir.convert %[[Rate]] : (i64) -> f32
   ! CHECK: fir.store %[[Rate1]] to %[[r]] : !fir.ref<f32>
-  ! CHECK: %[[Max:.*]] = fir.call @_FortranASystemClockCountMax() : () -> i64
+  ! CHECK: %[[c8_2:.*]] = arith.constant 8 : i32
+  ! CHECK: %[[Max:.*]] = fir.call @_FortranASystemClockCountMax(%[[c8_2]]) : (i32) -> i64
   ! CHECK: fir.store %[[Max]] to %[[m]] : !fir.ref<i64>
   call system_clock(c, r, m)
 ! print*, c, r, m
   ! CHECK-NOT: fir.call
-  ! CHECK: %[[Rate:.*]] = fir.call @_FortranASystemClockCountRate() : () -> i64
+  ! CHECK: %[[c8_3:.*]] = arith.constant 8 : i32
+  ! CHECK: %[[Rate:.*]] = fir.call @_FortranASystemClockCountRate(%[[c8_3]]) : (i32) -> i64
   ! CHECK: fir.store %[[Rate]] to %[[m]] : !fir.ref<i64>
   call system_clock(count_rate=m)
   ! CHECK-NOT: fir.call