Changeset 859

Timestamp:

12/11/09 16:22:31 (3 years ago)

Author:

atorf

Message:

NXCProfiler: Really great version working now

Location:

branches/atorf/personal playground/NXCProfiler

Files:

• Analyzer/AnalyzeNXCProfile.py (modified) (7 diffs)
• Analyzer/HTMLSnippets.py (modified) (5 diffs)
• Analyzer/sample.prf (modified) (previous)
• Profiler01.nxc (modified) (1 diff)

branches/atorf/personal playground/NXCProfiler/Analyzer/AnalyzeNXCProfile.py

@@ -101 +101 @@
     out.ExecutionsSameMs = []
     out.ElapsedTicks     = []
+    out.AllSectionsTicks = 0
 
     verbosePrint(" - Parsing section data")
@@ -108 +109 @@
             out.ExecutionCount.append(unflatten4(f.read(4)))
             out.ExecutionsSameMs.append(unflatten4(f.read(4)))
-            out.ElapsedTicks.append(unflatten4(f.read(4)))
+            tmpTicks = unflatten4(f.read(4))
+            out.ElapsedTicks.append(tmpTicks)
+            out.AllSectionsTicks += tmpTicks
         #end for
     except:
@@ -201 +204 @@
 #end def
 
+
+def getSectionsFromProfilerCmds(proflines):
+    sections = []
+    for (i, p) in enumerate(proflines):
+        startline = -1
+        endline   = -1
+        # look for profiled sections
+        if p[1] == 'beginsection':     
+            section = p[2]        
+            startline = p[0]
+            for nextp in proflines:
+                if nextp[1] == 'endsection':
+                    if nextp[2] == section:
+                        endline = nextp[0]
+                        break
+                    #end if
+                #end if
+            #end for
+            if endline == -1:
+                print "Warning: Didn't find matching profiler command endsection for a certain startsection!"
+            #end if
+            sections.append((section, startline, endline))
+        #end if
+    #end for
+    return sections
+                    
+#end def
+
 def generateCoverageLines(sourcelines, proflines, stats):
     coverage = [Consts.CODENOTPROFILED for tmp in sourcelines];
@@ -208 +239 @@
         if p[1] == 'beginsection':
             # find out if code was executed
-            verbosePrint('   . checking section %s, ExecutionCount = %d' % (p[2], stats.ExecutionCount[p[2]]))
+            verbosePrint('   . checking section %d (ExecCnt = %d, ElapsTcks = %d, ExecsSameMs = %d)' % (p[2], stats.ExecutionCount[p[2]], stats.ElapsedTicks[p[2]], stats.ExecutionsSameMs[p[2]]))
             if stats.ExecutionCount[p[2]] > 0:
                 val = Consts.CODEPROFILED
@@ -246 +277 @@
 
 def generateHTMLRuntimeSummary(stats):
-    str = HTMLSnippets.getHTMLRuntimeStats() % (stats.TotalRunTime/1000.0, stats.ProfiledRunTime/1000.0)    
+    str = HTMLSnippets.getHTMLRuntimeStats() % (stats.TotalRunTime/1000.0, stats.ProfiledRunTime/1000.0, stats.AllSectionsTicks/1000.0)    
     return str
 
 
 
-
-
-def generateHTMLCodeTable(sourcelines, proflines, stats, coverage):
-    parts = [];
-    
-    startline = findProfilerCommandLine(proflines, "start")
-    stopline = findProfilerCommandLine(proflines, "stop")
-    
-    
-    parts.append(HTMLSnippets.getHTMLCodeStart())
-    
-    for (i, line) in enumerate(sourcelines):
-        escapedCode = line.rstrip().replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;');
-        escapedCode = escapedCode.replace('\t', '    ')
-        escapedCode = escapedCode.replace(' ', '&nbsp;')
-        if i == startline or i == stopline:
-            tmp = '<span class="profilercmd">' +  escapedCode + "</span><br>\n"
-        else:
-            if coverage[i] == Consts.CODENOTPROFILED:
-                tmp = '<span class="codenotprofiled">' +  escapedCode + "</span><br>\n"
-            elif coverage[i] == Consts.CODEDIDNTRUN:
-                tmp = '<span class="codedidntrun">' +  escapedCode + "</span><br>\n"
-            else:
-                tmp = '<span class="codeprofiled">' +  escapedCode + "</span><br>\n"
-            #end if
-        #end if
+def escapeCodeLine(line):
+    out = line.rstrip().replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;');
+    out = out.expandtabs(4)
+    out = out.replace(' ', '&nbsp;')
+    return out
+#end def
+
+
+def getUnprofiledCodeTablePart(sourcelines, start, end):
+    parts = []
+    parts.append('<tr><td class="codenotprofiledtd" colspan="2" align="center"><i>Not profiled</i></td><td class="codestandardtd">')
+    for line in sourcelines[start:end+1]:
+        escapedCode = escapeCodeLine(line)
+        tmp = '<span class="codenotprofiled">' +  escapedCode + "</span><br>\n"
         parts.append(tmp)
     #end for
-
-    parts.append("</td></tr>")
+    parts.append("</td></tr>\n")
+    return ''.join(parts)
+    
+    
+def getProfiledCodeTablePart(sourcelines, sectionNo, stats, start, end):
+    parts = []
+    if stats.ExecutionCount[sectionNo] > 0:
+        parts.append('<tr><td class="codeprofiledcallstd" align="right"><b>%d</b></td>' %  stats.ExecutionCount[sectionNo])
+        parts.append('<td class="codeprofiledtimetd">&nbsp;<br>&nbsp;<br><b>&gt; %d ms (%.1f%%)</b><br><br>+ %d calls &lt; 1ms</td>' % (stats.ElapsedTicks[sectionNo], stats.ElapsedTicks[sectionNo]/stats.ProfiledRunTime*100,  stats.ExecutionsSameMs[sectionNo]))
+    else:
+        parts.append('<tr><td class="codedidntruntd" colspan="2" align="center"><b>Never executed</b></td>')
+    #end if
+    parts.append('<td class="codestandardtd">')
+    
+    for line in sourcelines[start:end+1]:
+        escapedCode = escapeCodeLine(line)
+        tmp = '<span class="codestandard">' +  escapedCode + "</span><br>\n"
+        parts.append(tmp)
+    #end for
+    parts.append("</td></tr>\n")
+    return ''.join(parts)
+    
+
+def generateHTMLCodeTable(sourcelines, proflines, stats, sections):
+    parts = [];
+    
+    #startline = findProfilerCommandLine(proflines, "start")
+    #stopline = findProfilerCommandLine(proflines, "stop")
+    
+    
+    parts.append(HTMLSnippets.getHTMLCodeStart())  
+    
+    curLine = 0
+    for (sectionNo, start, end) in sections:
+        # if we have non-profiled code:
+        if curLine < start:
+            # "pad" with plain stuff
+            parts.append(getUnprofiledCodeTablePart(sourcelines, curLine, start-1))
+        #end if
+        parts.append(getProfiledCodeTablePart(sourcelines, sectionNo, stats, start, end))
+        curLine = end + 1
+    #end for
+    
+    # "pad" with plain stuff
+    parts.append(getUnprofiledCodeTablePart(sourcelines, curLine, len(sourcelines)-1))
+                
+    
+#    # old shit
+#    for line in sourcelines[0:sections[0][1]]:
+#        escapedCode = escapeCodeLine(line)
+#        tmp = '<span class="codenotprofiled">' +  escapedCode + "</span><br>\n"
+#        parts.append(tmp)
+#    #end for
+#    parts.append("</td></tr>\n")
+#
+#
+#            elif coverage[i] == Consts.CODEDIDNTRUN:
+#                tmp = '<span class="codedidntrun">' +  escapedCode + "</span><br>\n"
+#            else:
+#                tmp = '<span class="codeprofiled">' +  escapedCode + "</span><br>\n"
+#
+#    parts.append("</td></tr>")
     
     return ''.join(parts)
@@ -291 +370 @@
     sourcelines = readSourceFile(sourcefile)
     proflines   = findProfilerCommands(sourcelines)
-    coverage    = generateCoverageLines(sourcelines, proflines, stats)
+    sections    = getSectionsFromProfilerCmds(proflines)
+    #coverage    = generateCoverageLines(sourcelines, proflines, stats)
+    
     
     verbosePrint(" - Generating HTML output file")
@@ -298 +379 @@
     HTMLparts.append(generateHTMLFileSummary(sourcefile, statsfile, stats))
     HTMLparts.append(generateHTMLRuntimeSummary(stats))
-    HTMLparts.append(generateHTMLCodeTable(sourcelines, proflines, stats, coverage))
+    HTMLparts.append(generateHTMLCodeTable(sourcelines, proflines, stats, sections))
     HTMLparts.append(HTMLSnippets.getHTMLFooter())
     

branches/atorf/personal playground/NXCProfiler/Analyzer/HTMLSnippets.py

@@ -20 +20 @@
         <style type="text/css">
             body { font-family:'Verdana'; }
-            code { font-size:10pt; }
+            code { font-size:11pt; }
             
             span { font-size:10pt; font-family:'Courier New' }
+            .codestandard { color:#000000; }
             .codedidntrun { color:#A0A020; }
             .codenotprofiled { color:#000000; }
@@ -36 +37 @@
             .greenth { background-color:#A9D668}
             .orangeth { background-color:#FDB75D}
-            td { font-size:11pt; }
+            td { font-size:10pt; }
             .summarytd { background-color:#DEFFBD}
-            .codedidntruntd { background-color:#EFEFEF}
-            .codeprofiledtd { background-color:#EFEFEF}
+            .codestandardtd { background-color:#EFEFEF }
+            .codedidntruntd { background-color:#FFD791 }
+            .codeprofiledcallstd { background-color:#CBDDFF }
+            .codeprofiledtimetd { background-color:#CBDDFF }
             .codenotprofiledtd { background-color:#EFEFEF}
             
@@ -62 +65 @@
 
 def getHTMLFileInfo():
-    return '''<table border="0" cellpadding="20" cellspacing="8" width="750">
+    return '''<table border="0" cellpadding="20" cellspacing="8" align="center">
         <tr>
-            <th class="summaryth">File summary</th>
+            <th class="summaryth" align="center">File summary</th>
         </tr>
         <tr>
@@ -82 +85 @@
     return '''
         <tr>
-            <th class="summaryth">Runtime summary</th>
+            <th class="summaryth" align="center">Runtime summary</th>
         </tr>
         <tr>
             <td class="summarytd">
-                <ul>                
-                  <li><code>Total program runtime: %###0.2f seconds</code>
-                  <li><code>Profiled part runtime: %###0.2f seconds</code>
-                </ul>
+                <pre>                
+  - Total program runtime (until STOP):           %7.2f seconds
+  - Profiler runtime (between START and STOP):    %7.2f seconds
+  - Sections runtime (sum of all sections > 1ms): %7.2f seconds</pre>
             </td>
         </tr>
@@ -98 +101 @@
 
 def getHTMLCodeStart():
-    return '''<table border="0" cellpadding="20" cellspacing="8" width="750">
+    return '''<table border="0" cellpadding="12" cellspacing="8" align="center">
         <tr>
-            <th class="codeth">Profiled source code</th>
+            <th class="codeth" colspan="3" align="center">Profiled source code</th>
         </tr>
-       <tr>
-            <td class="codenotprofiledtd">
+        <tr>
+            <td class="standardtd" align="center"><b>Calls</b></th>
+            <td class="standardtd" align="center"><b>Time</b></th>
+            <td class="standardtd" align="center"><b>Code</b></th>
+        </tr>
             
         '''

branches/atorf/personal playground/NXCProfiler/Profiler01.nxc

@@ -111 +111 @@
         
         // record elapsed time (if possible)
-        if (CurrentTick() != __PROFILER_LastTick[no]) {
+        if (CurrentTick() == __PROFILER_LastTick[no]) {
             // count the number of times where no tick has happened
             __PROFILER_ExecutionsSameMs[no] = __PROFILER_ExecutionsSameMs[no] + 1;