commit 0dcf9a11e06b7a32951941adf810f5c7dde82b5d
author Christophe Favergeon <Christophe.Favergeon@arm.com> Wed May 27 15:55:27 2020 +0200
committer Christophe Favergeon <Christophe.Favergeon@arm.com> Wed May 27 15:55:27 2020 +0200
tree f1748fcf95307e1d4927c8792e8894351fdfb6dd
parent feb73933114c34d5f611152ab11f0a7fa8971b60

CMSIS-DSP: Improvement to reporting script for tests

CMSIS/DSP/Testing/TestScripts/Regression/Commands.py

diff --git a/CMSIS/DSP/Testing/TestScripts/Regression/Commands.py b/CMSIS/DSP/Testing/TestScripts/Regression/Commands.py
index ad62daf..0dcc457 100755
--- a/CMSIS/DSP/Testing/TestScripts/Regression/Commands.py
+++ b/CMSIS/DSP/Testing/TestScripts/Regression/Commands.py
@@ -213,10 +213,9 @@
               cmd += ["-DBENCHMARK=OFF"]
               cmd += ["-DWRAPPER=OFF"]
 
-            cmd += ["-DCONFIGTABLE=OFF",
-                             "-DROOT=%s" % self._rootFolder,
-                             "-DCMAKE_BUILD_TYPE=Release",
-                             "-G", "Unix Makefiles" ,"%s" % self.cmakeFilePath()]
+            cmd += ["-DROOT=%s" % self._rootFolder,
+                    "-DCMAKE_BUILD_TYPE=Release",
+                    "-G", "Unix Makefiles" ,"%s" % self.cmakeFilePath()]
 
             if DEBUGMODE:
                print(cmd)

CMSIS/DSP/Testing/extractDb.py

diff --git a/CMSIS/DSP/Testing/extractDb.py b/CMSIS/DSP/Testing/extractDb.py
index 3b25756..af5e671 100755
--- a/CMSIS/DSP/Testing/extractDb.py
+++ b/CMSIS/DSP/Testing/extractDb.py
@@ -340,6 +340,7 @@
 
     dataForFunc=data.loc[name]
     if type(dataForFunc) is pd.DataFrame:
+       bars={'cols':columns,'cores':cores,'data':[]}
        for row in dataForFunc.itertuples():
            row=list(row)
            if type(row[0]) is int:
@@ -349,7 +350,8 @@
            if field=="MAXREGCOEF":
               row=[("%.3f" % x) for x in row]
            dataTable.addRow(row)
-       return(None)
+           bars['data'].append(row)
+       return(bars)
     else:
        if field=="MAXREGCOEF":
               dataForFunc=[("%.3f" % x) for x in dataForFunc]
@@ -440,10 +442,24 @@
               maxCyclesSection = Section("Max cycles")
               testSection.addSection(maxCyclesSection)
               theCycles=regressionTableFor(byname,name,maxCyclesSection,ref,toSort,indexCols,'MAX')
-              if theCycles is not None:
+              if type(theCycles) is dict:
+                nbParams=len(theCycles['cols'])
+                for bar in theCycles['data']:
+                    params=bar[0:nbParams]
+                    values=bar[nbParams:]
+                    title=[("%s=%s" % x) for x in list(zip(theCycles['cols'],params))]
+                    title="".join(joinit(title," "))
+                    sec=Section(title)
+                    maxCyclesSection.addSection(sec)
+                    values=list(zip(theCycles['cores'],values))
+                    barChart=BarChart(values)
+                    sec.addContent(barChart)
+              else:
                  #print(theCycles)
+                 sec=Section("Graph")
+                 maxCyclesSection.addSection(sec)
                  barChart=BarChart(theCycles)
-                 maxCyclesSection.addContent(barChart)
+                 sec.addContent(barChart)
 
               #history=getHistory(desc,testid,indexCols)
               #testSection.addContent(history)