CMSIS-DSP: Added config table to test framework.
diff --git a/CMSIS/DSP/Testing/addToRegDB.py b/CMSIS/DSP/Testing/addToRegDB.py
index acbf3fd..899faf8 100755
--- a/CMSIS/DSP/Testing/addToRegDB.py
+++ b/CMSIS/DSP/Testing/addToRegDB.py
@@ -137,9 +137,10 @@
if result != None:
return(result[0])
else:
- conn.execute("INSERT INTO COMPILER(compilerkindid,version) VALUES(?,?)" ,(kind,version))
+ fullDate = datetime.datetime.now()
+ conn.execute("INSERT INTO COMPILER(compilerkindid,version,date) VALUES(?,?,?)" ,(kind,version,fullDate))
conn.commit()
- r = conn.execute("select compilerid from COMPILER where compilerkindid=? AND version=?" , (kind,version))
+ r = conn.execute("select compilerid from COMPILER where compilerkindid=? AND version=? AND date=?" , (kind,version,fullDate))
result=r.fetchone()
if result != None:
#print(result)
@@ -151,6 +152,9 @@
def addRows(conn,elem,tableName,full):
# List of columns we have in DB which is
# different from the columns in the table
+ compilerid = 0
+ platformid = 0
+ coreid = 0
keep = getColumns(elem,full)
cols = list(full.columns)
params=diff(elem.params.full , elem.params.summary)
@@ -224,9 +228,11 @@
if field == "CORE":
val = findInTable(conn,"CORE","coredef",row[field],"coreid")
keys[field]=val
+ coreid = val
if field == "PLATFORM":
val = findInTable(conn,"PLATFORM","platform",row[field],"platformid")
keys[field]=val
+ platformid = val
if field == "TYPE":
val = findInTable(conn,"TYPE","type",keys["TYPE"],"typeid")
keys[field]=val
@@ -234,6 +240,7 @@
compilerkind = findInTable(conn,"COMPILERKIND","compiler",row[field],"compilerkindid")
compiler = findInCompilerTable(conn,compilerkind,keys["VERSION"])
keys[field]=compiler
+ compilerid = compiler
# Generate sql command
start = ""
@@ -255,18 +262,25 @@
#print(sql)
conn.execute(sql)
conn.commit()
+ return({'compilerid':compilerid,'platformid':platformid,'coreid':coreid})
+
+def addConfig(conn,config,fullDate):
+ conn.execute("INSERT INTO CONFIG(compilerid,platformid,coreid,date) VALUES(?,?,?,?)" ,(config['compilerid'],config['platformid'],config['coreid'],fullDate))
+ conn.commit()
def addOneBenchmark(elem,fullPath,db,group):
if os.path.isfile(fullPath):
full=pd.read_csv(fullPath,dtype={'OLDID': str} ,keep_default_na = False)
- full['DATE'] = datetime.datetime.now()
+ fullDate = datetime.datetime.now()
+ full['DATE'] = fullDate
if group:
tableName = group
else:
tableName = elem.data["class"]
conn = sqlite3.connect(db)
createTableIfMissing(conn,elem,tableName,full)
- addRows(conn,elem,tableName,full)
+ config = addRows(conn,elem,tableName,full)
+ addConfig(conn,config,fullDate)
conn.close()