From ae56547276e2c72c704ce184913c0c920977c40e Mon Sep 17 00:00:00 2001 From: Lauri Kasanen Date: Wed, 26 May 2021 11:31:41 +0300 Subject: [PATCH] Fill in all mp3_0 runs, move the spr to a common file --- media/Makefile | 89 +++++++++++++++++++++-- media/{audio/mp3/mp3_0.spr => common.spr} | 0 2 files changed, 83 insertions(+), 6 deletions(-) rename media/{audio/mp3/mp3_0.spr => common.spr} (100%) diff --git a/media/Makefile b/media/Makefile index 29f744c5..4ea633cc 100644 --- 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/common.spr similarity index 100% rename from media/audio/mp3/mp3_0.spr rename to media/common.spr -- 2.30.2