LOG TIME improvements

esa · Dec 27, 2024 · 4ea6962 · 4ea6962
1 parent 70e8238
commit 4ea6962
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 12 deletions.
diff --git a/BackendAst/DAstTypeDefinition.fs b/BackendAst/DAstTypeDefinition.fs
@@ -240,15 +240,16 @@ let createEnumerated (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros)  (t:Asn1AcnAst.A
     let define_subType_enumerated    = lm.typeDef.Define_subType_enumerated
     let define_new_enumerated_private = lm.typeDef.Define_new_enumerated_private
     let define_subType_enumerated_private = lm.typeDef.Define_subType_enumerated_private
-    let orderedItems = o.items |> List.sortBy(fun i -> i.definitionValue)
-    let arrsEnumNames = orderedItems |> List.map( fun i -> lm.lg.getNamedItemBackendName None i)
-    let arrsEnumNamesAndValues = orderedItems |> List.map(fun i -> define_new_enumerated_item td (lm.lg.getNamedItemBackendName None i) i.definitionValue)
-    let macros = orderedItems |> List.map( fun i -> define_new_enumerated_item_macro td (ToC i.Name.Value) (lm.lg.getNamedItemBackendName None i) )
-    let nIndexMax = BigInteger ((Seq.length o.items)-1)
-    let arrsValidEnumNames = o.validItems |> List.sortBy(fun i -> i.definitionValue) |> List.map( fun i -> lm.lg.getNamedItemBackendName None i)
+    let orderedItems            = TL "CR_EN_01" (fun () -> o.items |> List.sortBy(fun i -> i.definitionValue))
+    let arrsEnumNames           = TL "CR_EN_02" (fun () -> orderedItems |> List.map( fun i -> lm.lg.getNamedItemBackendName None i))
+    let arrsEnumNamesAndValues  = TL "CR_EN_03" (fun () -> orderedItems |> List.map(fun i -> define_new_enumerated_item td (lm.lg.getNamedItemBackendName None i) i.definitionValue))
+    let macros                  = TL "CR_EN_04" (fun () -> orderedItems |> List.map( fun i -> define_new_enumerated_item_macro td (ToC i.Name.Value) (lm.lg.getNamedItemBackendName None i) ))
+    let nIndexMax               = TL "CR_EN_05" (fun () -> BigInteger ((Seq.length o.items)-1))
+    let arrsValidEnumNames      = TL "CR_EN_06" (fun () -> o.validItems |> List.sortBy(fun i -> i.definitionValue) |> List.map( fun i -> lm.lg.getNamedItemBackendName None i))
 
     match td.kind with
     | NonPrimitiveNewTypeDefinition              ->
+        TL "CR_EN_07" (fun () -> 
         let completeDefinition = define_new_enumerated td arrsEnumNames arrsEnumNamesAndValues nIndexMax macros
         let privateDefinition =
             match r.args.isEnumEfficientEnabled o.items.Length with
@@ -258,9 +259,9 @@ let createEnumerated (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros)  (t:Asn1AcnAst.A
                 match System.String.IsNullOrWhiteSpace ret with
                 | true  -> None
                 | false -> Some ret
-
-        Some (completeDefinition, privateDefinition)
+        Some (completeDefinition, privateDefinition))
     | NonPrimitiveNewSubTypeDefinition subDef     ->
+        TL "CR_EN_08" (fun () -> 
         let otherProgramUnit = if td.programUnit = subDef.programUnit then None else (Some subDef.programUnit)
         let completeDefinition = define_subType_enumerated td subDef otherProgramUnit
         let privateDefinition =
@@ -271,7 +272,7 @@ let createEnumerated (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros)  (t:Asn1AcnAst.A
                 match System.String.IsNullOrWhiteSpace ret with
                 | true  -> None
                 | false -> Some ret
-        Some (completeDefinition, privateDefinition)
+        Some (completeDefinition, privateDefinition))
     | NonPrimitiveReference2OtherType            -> None
 
 let internal getChildDefinition (childDefinition:TypeDefinitionOrReference) =
@@ -546,20 +547,23 @@ let createEnumerated_u (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros)  (t:Asn1AcnAst
     let td = lm.lg.getEnumTypeDefinition   o.typeDef
     match td.kind with
     | NonPrimitiveNewTypeDefinition              ->
+        TL "CR_EN_U_01" (fun () ->
         let (aaa, priv) =
             match createEnumerated r lm t o us with
             | Some (a, b) -> Some a, b
             | None -> None, None
-        TypeDefinition {TypeDefinition.typedefName = td.typeName; typedefBody = (fun () -> aaa.Value); privateTypeDefinition=priv; baseType=None}
+        TypeDefinition {TypeDefinition.typedefName = td.typeName; typedefBody = (fun () -> aaa.Value); privateTypeDefinition=priv; baseType=None})
     | NonPrimitiveNewSubTypeDefinition subDef     ->
+        TL "CR_EN_U_02" (fun () ->
         let (aaa, priv) =
             match createEnumerated r lm t o us with
             | Some (a, b) -> Some a, b
             | None -> None, None
         let baseType = {ReferenceToExistingDefinition.programUnit = (if subDef.programUnit = programUnit then None else Some subDef.programUnit); typedefName=subDef.typeName ; definedInRtl = false}
-        TypeDefinition {TypeDefinition.typedefName = td.typeName; typedefBody = (fun () -> aaa.Value); privateTypeDefinition=priv; baseType=Some baseType}
+        TypeDefinition {TypeDefinition.typedefName = td.typeName; typedefBody = (fun () -> aaa.Value); privateTypeDefinition=priv; baseType=Some baseType})
     | NonPrimitiveReference2OtherType            ->
-        ReferenceToExistingDefinition {ReferenceToExistingDefinition.programUnit =  (if td.programUnit = programUnit then None else Some td.programUnit); typedefName= td.typeName; definedInRtl = false}
+        TL "CR_EN_U_03" (fun () ->
+        ReferenceToExistingDefinition {ReferenceToExistingDefinition.programUnit =  (if td.programUnit = programUnit then None else Some td.programUnit); typedefName= td.typeName; definedInRtl = false})
 
 
 let createSequenceOf_u (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros)  (t:Asn1AcnAst.Asn1Type) (o:Asn1AcnAst.SequenceOf) (childType: DAst.Asn1Type) (us:State) =

diff --git a/CommonTypes/CommonTypes.fsproj b/CommonTypes/CommonTypes.fsproj
@@ -6,6 +6,12 @@
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+      <!--
+    <DefineConstants>$(DefineConstants);LOG_TIMING</DefineConstants>
+    -->
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="FsUtils.fs" />
     <Compile Include="RemoveUnusedRtlFunction.fs" />

diff --git a/CommonTypes/FsUtils.fs b/CommonTypes/FsUtils.fs
@@ -24,8 +24,12 @@ open System.IO
 open System.Diagnostics
 open System.Collections.Generic
 
+//to enabe log timing, go to project properties, build, and add LOG_TIMING to conditional compilation symbols
 
+#if LOG_TIMING
+#warning "Timing is enabled"
 let subsystems: Dictionary<String, int*TimeSpan> = new Dictionary<String, int*TimeSpan>()
+
 let TL  subSystem func =
     let stopwatch = Stopwatch.StartNew()
     let ret = func ()
@@ -58,6 +62,13 @@ let TL_report () =
     printfn "%s" bbb
 
 
+#else
+let TL  subSystem func = func ()
+let TL_report () = ()
+#endif
+
+
+
 type OptionBuilder() =
     member x.Bind(opt, f) =
         match opt with

diff --git a/asn1scc/asn1scc.fsproj b/asn1scc/asn1scc.fsproj
@@ -6,6 +6,8 @@
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
+
 
   <ItemGroup>
       <EmbeddedResource Include="..\asn1scala\src\main\scala\asn1scala\asn1jvm.scala">