update --times logic

FSharpBuild.Directory.Build.props

@@ -25,6 +25,7 @@
     <ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
     <WarningsAsErrors>1182;0025;$(WarningsAsErrors)</WarningsAsErrors>
     <OtherFlags>$(OtherFlags) --nowarn:3384</OtherFlags>
+    <OtherFlags>$(OtherFlags) --times --nowarn:75</OtherFlags>
   </PropertyGroup>
 
   <!-- nuget -->

src/Compiler/Driver/CompilerOptions.fs

@@ -5,6 +5,7 @@
 module internal FSharp.Compiler.CompilerOptions
 
 open System
+open System.Diagnostics
 open System.IO
 open Internal.Utilities.Library
 open Internal.Utilities.Library.Extras
@@ -2241,8 +2242,8 @@ let PrintWholeAssemblyImplementation (tcConfig: TcConfig) outfile header expr =
 // ReportTime
 //----------------------------------------------------------------------------
 
-let mutable tPrev = None
-let mutable nPrev = None
+let mutable tPrev: (DateTime * DateTime * float * int[]) option = None
+let mutable nPrev: string option = None
 
 let ReportTime (tcConfig: TcConfig) descr =
 
@@ -2278,29 +2279,41 @@ let ReportTime (tcConfig: TcConfig) descr =
     if (tcConfig.showTimes || verbose) then
         // Note that timing calls are relatively expensive on the startup path so we don't
         // make this call unless showTimes has been turned on.
-        let timeNow =
-            System.Diagnostics.Process.GetCurrentProcess().UserProcessorTime.TotalSeconds
-
+        let p = Process.GetCurrentProcess()
+        let utNow = p.UserProcessorTime.TotalSeconds
+        let tNow = DateTime.Now
         let maxGen = GC.MaxGeneration
         let gcNow = [| for i in 0..maxGen -> GC.CollectionCount i |]
-        let ptime = System.Diagnostics.Process.GetCurrentProcess()
-        let wsNow = ptime.WorkingSet64 / 1000000L
-
-        match tPrev, nPrev with
-        | Some (timePrev, gcPrev: int[]), Some prevDescr ->
-            let spanGC = [| for i in 0..maxGen -> GC.CollectionCount i - gcPrev[i] |]
-            dprintf "TIME: %4.1f Delta: %4.1f Mem: %3d" timeNow (timeNow - timePrev) wsNow
-
-            dprintf
-                " G0: %3d G1: %2d G2: %2d [%s]\n"
-                spanGC[Operators.min 0 maxGen]
-                spanGC[Operators.min 1 maxGen]
-                spanGC[Operators.min 2 maxGen]
-                prevDescr
-
-        | _ -> ()
-
-        tPrev <- Some(timeNow, gcNow)
+        let wsNow = p.WorkingSet64 / 1000000L
+
+        let tStart =
+            match tPrev, nPrev with
+            | Some (tStart, tPrev, utPrev, gcPrev), Some prevDescr ->
+                let spanGC = [| for i in 0..maxGen -> GC.CollectionCount i - gcPrev[i] |]
+                let t = tNow - tStart
+                let tDelta = tNow - tPrev
+                let utDelta = utNow - utPrev
+
+                printf
+                    "Real: %4.1f Realdelta: %4.1f Cpu: %4.1f Cpudelta: %4.1f Mem: %3d"
+                    t.TotalSeconds
+                    tDelta.TotalSeconds
+                    utNow
+                    utDelta
+                    wsNow
+
+                printfn
+                    " G0: %3d G1: %2d G2: %2d [%s]"
+                    spanGC[Operators.min 0 maxGen]
+                    spanGC[Operators.min 1 maxGen]
+                    spanGC[Operators.min 2 maxGen]
+                    prevDescr
+
+                tStart
+
+            | _ -> DateTime.Now
+
+        tPrev <- Some(tStart, tNow, utNow, gcNow)
 
     nPrev <- Some descr
 

src/Compiler/FSharp.Compiler.Service.fsproj

@@ -14,7 +14,7 @@
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
     <DefineConstants Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">$(DefineConstants);USE_SHIPPED_FSCORE</DefineConstants>
-    <OtherFlags>$(OtherFlags) --extraoptimizationloops:1 --times</OtherFlags>
+    <OtherFlags>$(OtherFlags) --extraoptimizationloops:1</OtherFlags>
     <!-- 1182: Unused variables -->
     <OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
     <!-- 3218: ArgumentsInSigAndImplMismatch -->

src/Compiler/Utilities/illib.fs

@@ -104,7 +104,7 @@ module internal PervasiveAutoOpens =
                          t)
                     | Some t -> t
 
-                printf "ilwrite: TIME %10.3f (total)   %10.3f (delta) - %s\n" (t - first) (t - prev) descr
+                printf "  ilwrite: Cpu %4.1f (total)   %4.1f (delta) - %s\n" (t - first) (t - prev) descr
                 tPrev <- Some t
 
     let foldOn p f z x = f z (p x)

src/fsc/App.config

@@ -11,4 +11,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

tests/fsharpqa/Source/test.lst

@@ -29,15 +29,13 @@ CompilerOptions01,NoMT,NoHostedCompiler		CompilerOptions\fsc\staticlink
 CompilerOptions01,NoMT				CompilerOptions\fsc\subsystemversion
 CompilerOptions01,NoMT				CompilerOptions\fsc\tailcalls
 CompilerOptions01,NoMT				CompilerOptions\fsc\target
-CompilerOptions01,NoMT,NoHostedCompiler				CompilerOptions\fsc\times
 CompilerOptions01,NoMT,NoHostedCompiler				CompilerOptions\fsc\tokenize
 CompilerOptions01,NoMT				CompilerOptions\fsc\responsefile
 CompilerOptions01,NoMT,help				CompilerOptions\fsi\help
 CompilerOptions01,NoMT				CompilerOptions\fsi\highentropyva
 CompilerOptions01,NoMT				CompilerOptions\fsi\langversion
 CompilerOptions01,NoMT				CompilerOptions\fsi\nologo
 CompilerOptions01,NoMT				CompilerOptions\fsi\subsystemversion
-CompilerOptions01,NoMT				CompilerOptions\fsi\times
 CompilerOptions02,NoMT				CompilerOptions\fsi\exename
 CompilerOptions01,NoMT,Determinism				CompilerOptions\fsc\determinism