Fill in all mp3_0 runs, move the spr to a common file

diff --git a/media/Makefile b/media/Makefile
index 29f744c51033a213e591fe061ef36daf2def10bb..4ea633ccea8ee4e99d586e6d8e474d3fd3c0fdc1 100644 (file)
--- a/media/Makefile
+++ b/media/Makefile
@@ -13,6 +13,11 @@ VER = $(shell cat data/VERSION)
 SRC = $(wildcard audio/*/*.s video/*/*.s)
 OBJ = $(SRC:.s=.bin)
 
+DUMP = /tmp/out
+
+# commented for luke's convenience
+#export SILENCELOG = 1
+
 all:
 ifneq ($(VER), $(EXPECTED_VER))
        $(error Data not found, or version mismatch. Please run "make wget")
@@ -32,10 +37,82 @@ wget:
        $(OBJCOPY) $<.elf -I elf64-little -O binary $@
 
 tests: $(OBJ)
-       echo juuh
        pypowersim -g audio/mp3/mp3_0.gpr \
-                  -s audio/mp3/mp3_0.spr \
-                  -l data/audio/mp3/mp3_0_data/buf0:0x100000 \
-                  -l data/audio/mp3/mp3_0_data/win0:0x200000 \
-                  -d data/audio/mp3/mp3_0_data/out_samples0:0x400000:256 \
-                -i audio/mp3/mp3_0_apply_window_float.bin
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf0:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples0
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf1000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples1000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf2000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples2000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf3000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples3000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf4000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples4000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf5000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples5000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf6000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples6000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf7000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples7000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf8000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples8000
+
+       pypowersim -g audio/mp3/mp3_0.gpr \
+               -s common.spr \
+               -l data/audio/mp3/mp3_0_data/buf9000:0x100000 \
+               -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+               -d $(DUMP):0x400000:128 \
+               -i audio/mp3/mp3_0_apply_window_float.bin
+       cmp $(DUMP) data/audio/mp3/mp3_0_data/samples9000

diff --git a/media/audio/mp3/mp3_0.spr b/media/audio/mp3/mp3_0.spr
deleted file mode 100644 (file)
index 0a615d7..0000000
--- a/media/audio/mp3/mp3_0.spr
+++ /dev/null
@@ -1 +0,0 @@
-LR: 0xffffffff

diff --git a/media/common.spr b/media/common.spr
new file mode 100644 (file)
index 0000000..0a615d7
--- /dev/null
+++ b/media/common.spr
@@ -0,0 +1 @@
+LR: 0xffffffff