When run simulate from console - run it as a build and generate reports linked to the index

Author: JimLewis

OsvvmScriptsCore.tcl

@@ -634,8 +634,8 @@ variable HaveNotCreatedBuildOutputDirectory
 variable OsvvmBuildOutputDirectory
 variable BuildName
 
-#  if {$::osvvm::BuildStarted} {}
-  if {$::osvvm::BuildName ne ""} {
+#  if {$::osvvm::BuildName ne ""} {}
+  if {$::osvvm::BuildStarted} {
     if {$HaveNotCreatedBuildOutputDirectory} {
       # When run as part of a build, use the BuildName
       set OsvvmBuildOutputDirectory [file join $::osvvm::CurrentSimulationDirectory $::osvvm::OutputBaseDirectory $::osvvm::BuildName]
@@ -1195,52 +1195,61 @@ proc NoNullRangeWarning  {} {
 proc simulate {LibraryUnit args} {
   variable vendor_simulate_started
 
-  set SavedInteractive [GetInteractiveMode] 
-  if {!($::osvvm::BuildStarted)} {
+  if {$::osvvm::LastAnalyzeHasError} {
+    SkipTest $LibraryUnit "Previous analyze failed.  Skipping simulate."
+
+  } elseif {!($::osvvm::BuildStarted)} {
+    # called simulate from console - run as a build with just simulate in it.
+    set SavedInteractive [GetInteractiveMode] 
+    CheckWorkingDir
     SetInteractiveMode "true"
-    BuildName $LibraryUnit
-  }
+    set  SimProFileName [file join $::osvvm::CurrentSimulationDirectory $::osvvm::OsvvmTempOutputDirectory OsvvmSimulateBuild.pro]
+    set  SimProFile     [open ${SimProFileName} w]
+    puts $SimProFile "simulate $LibraryUnit $args"
+    close $SimProFile
 
-  set SimulateErrorCode [catch {LocalSimulate $LibraryUnit {*}$args} SimErrMsg]
-  set LocalSimulateErrorInfo $::errorInfo
-  
-  if {($SimulateErrorCode != 0) && (!$::osvvm::SimulateInteractive)} {
-    # if simulate ended in error, EndSimulation to close open files.
-    # $osvvm_testbench/AlertLogPkg tests require extra run after simulate 
-    # so checking only SimulateInteractive not sufficient  
-    EndSimulation
-    unset vendor_simulate_started
-  }
-  
-  if {$::osvvm::GenerateOsvvmReports} {
-    set ReportErrorCode [catch {AfterSimulateReports} ReportErrMsg]
-    set LocalReportErrorInfo $::errorInfo
-  } else {
-    set ReportErrorCode 0 
-  }
+    catch [build $SimProFileName [BuildName $LibraryUnit]]  ;# Errors to std_output, but interactive and stopping anyway
+
+    SetInteractiveMode $SavedInteractive  ; # Restore original value
+    catch [file delete -force $SimProFile]  
 
-  # Reset Temporary Settings
-  if {[info exists ::osvvm::TestCaseName]} {
-    unset ::osvvm::TestCaseName
-  }
-  set ::osvvm::GenericDict           ""
-  set ::osvvm::GenericNames          ""
-  set ::osvvm::GenericOptions        ""
-  set ::osvvm::RunningCoSim          "false"
-  
-  if {$SimulateErrorCode != 0} {
-    CallbackOnError_Simulate $SimErrMsg $LocalSimulateErrorInfo [concat $LibraryUnit $args]
   } else {
-    set ::osvvm::ConsecutiveSimulateErrors 0 
-  }
+    set SimulateErrorCode [catch {LocalSimulate $LibraryUnit {*}$args} SimErrMsg]
+    set LocalSimulateErrorInfo $::errorInfo
+    
+    if {($SimulateErrorCode != 0) && (!$::osvvm::SimulateInteractive)} {
+      # if simulate ended in error, EndSimulation to close open files.
+      # $osvvm_testbench/AlertLogPkg tests require extra run after simulate 
+      # so checking only SimulateInteractive not sufficient  
+      EndSimulation
+      unset vendor_simulate_started
+    }
+    
+    if {$::osvvm::GenerateOsvvmReports} {
+      set ReportErrorCode [catch {AfterSimulateReports} ReportErrMsg]
+      set LocalReportErrorInfo $::errorInfo
+    } else {
+      set ReportErrorCode 0 
+    }
 
-  if {$ReportErrorCode != 0} {  
-    CallbackOnError_AfterSimulateReports $ReportErrMsg $LocalReportErrorInfo
-  } 
-  if {!($::osvvm::BuildStarted)} {
-    SetInteractiveMode $SavedInteractive  ; # Restore original value
-    set BuildName ""
-    set ::osvvm::HaveNotCreatedBuildOutputDirectory "true"
+    # Reset Temporary Settings
+    if {[info exists ::osvvm::TestCaseName]} {
+      unset ::osvvm::TestCaseName
+    }
+    set ::osvvm::GenericDict           ""
+    set ::osvvm::GenericNames          ""
+    set ::osvvm::GenericOptions        ""
+    set ::osvvm::RunningCoSim          "false"
+    
+    if {$SimulateErrorCode != 0} {
+      CallbackOnError_Simulate $SimErrMsg $LocalSimulateErrorInfo [concat $LibraryUnit $args]
+    } else {
+      set ::osvvm::ConsecutiveSimulateErrors 0 
+    }
+
+    if {$ReportErrorCode != 0} {  
+      CallbackOnError_AfterSimulateReports $ReportErrMsg $LocalReportErrorInfo
+    } 
   }
 }
 

OsvvmScriptsCreateYamlReports.tcl

@@ -124,7 +124,7 @@ proc WriteBuildInfoYaml {RunFile BuildName {NamePrefix ""} {InfoPrefix ""} } {
 # -------------------------------------------------
 proc FinishBuildYaml {BuildName} {
   variable BuildStartTimeMs
-#  variable BuildStartTime
+  variable BuildStartTime
   variable BuildFinishTime
   variable BuildElapsedTime
 
@@ -133,7 +133,7 @@ proc FinishBuildYaml {BuildName} {
 
   set   BuildFinishTime     [clock seconds]
   set   BuildElapsedTime    [ElapsedTimeMs $BuildStartTimeMs]
-#  set   BuildElapsedTime    [expr ($BuildFinishTime - $BuildStartTime)]
+  set   BuildElapsedTimeSec    [expr ($BuildFinishTime - $BuildStartTime)]
 
   WriteBuildInfoYaml $RunFile $BuildName 
 
@@ -142,7 +142,7 @@ proc FinishBuildYaml {BuildName} {
   close $RunFile
 
   puts "Build Start time  [clock format $BuildStartTime -format {%T %Z %a %b %d %Y }]"
-  puts "Build Finish time [clock format $BuildFinishTime -format %T], Elapsed time: [format %d:%02d:%02d [expr ($BuildElapsedTime/(60*60))] [expr (($BuildElapsedTime/60)%60)] [expr (${BuildElapsedTime}%60)]] "
+  puts "Build Finish time [clock format $BuildFinishTime -format %T], Elapsed time: [format %d:%02d:%02d [expr ($BuildElapsedTimeSec/(60*60))] [expr (($BuildElapsedTimeSec/60)%60)] [expr (${BuildElapsedTimeSec}%60)]] "
 }