diff --git a/examples/benchmarks.results.text b/examples/benchmarks.results.text index 01dd929..5c67cd9 100644 --- a/examples/benchmarks.results.text +++ b/examples/benchmarks.results.text @@ -24,7 +24,7 @@ Running benchmarks.prog -------------------------------------- Arty-A7-35T 83MHz, 64KB SRAM, 256MB DRAM -running in DRAM only (except corelib, stdlib, runtime) +running in DRAM (except corelib, stdlib, runtime) Running benchmarks.prog empty loop 10M 00:00:30 @@ -45,4 +45,28 @@ Running benchmarks.prog exp() 10K 00:00:29 cos() 10K 00:00:06 +Arty-A7-35T +76.92MHz, 64KB SRAM, 256MB DRAM +running in DRAM (except corelib, stdlib, runtime) + +Running benchmarks.prog + empty loop 10M 00:00:32 + write variable 10M 00:00:40 + read variable 10M 00:00:43 + integer addition 10M 00:00:52 + real addition 1M 00:00:34 + integer multiplication 1M 00:01:17 + real multiplication 1M 00:01:08 + integer division 1M 00:01:57 + real division 1M 00:01:17 + string indexing 1M 00:01:19 + string iteration 1M 00:00:51 + new/dispose 1k 1M 00:00:29 + new/dispose 128k 1M 00:00:30 + array copy 1k 10K 00:00:03 + array copy 128k 1K 00:00:48 + exp() 10K 00:00:32 + cos() 10K 00:00:06 + +Running benchmarks.prog diff --git a/examples/viewpict.pas b/examples/pictviewer.pas similarity index 88% rename from examples/viewpict.pas rename to examples/pictviewer.pas index 78e061d..6c79a5c 100644 --- a/examples/viewpict.pas +++ b/examples/pictviewer.pas @@ -1,4 +1,4 @@ -program viewpict; +program pictviewer; type PictData = record magic, mode:integer; palette: array [0..15] of integer; @@ -40,5 +40,6 @@ begin loadPalette(pic); loadPic(pic); + write('Press any key...'); read(ch); end. diff --git a/utils/tdrimg.py b/utils/tdrimg.py index ff47a3f..6b6f0a4 100644 --- a/utils/tdrimg.py +++ b/utils/tdrimg.py @@ -372,8 +372,7 @@ def writetoimg(img, pathname, infilepath): putfile(infilepath, filename, img, vol, vol.startBlock, slotno) -def create_image_with_stuff(): - imgfile = "sdcard.img" +def create_image_with_stuff(imgfile): bootimage = "../lib/coreloader.prog" dir_slots = 256 extent_size = 8192 @@ -572,7 +571,7 @@ def create_image_with_stuff(): slotnr = putfile("../examples/lines.pas", None , f, part, partstart, slotnr) - slotnr = putfile("../examples/viewpict.pas", None , f, part, partstart, slotnr) + slotnr = putfile("../examples/pictviewer.pas", None , f, part, partstart, slotnr) # slotnr = putfile("viewpict.prog", None , f, part, partstart, slotnr) slotnr = putfile("../examples/ara.pict", "ara.pict" , f, part, partstart, slotnr) slotnr = putfile("../examples/shinkansen.pict", "shinkansen.pict" , f, part, partstart, slotnr) @@ -601,5 +600,5 @@ if __name__ == "__main__": destfilename = sys.argv[4] writetoimg(imgfile, destfilename, infilepath) elif sys.argv[1] == "createimg": - create_image_with_stuff() + create_image_with_stuff(sys.argv[2]) sys.exit(0)