diff --git a/lib/filter/ghdl/fir_iterative.make.inc b/lib/filter/ghdl/fir_iterative.make.inc index 2651c55..51db48a 100644 --- a/lib/filter/ghdl/fir_iterative.make.inc +++ b/lib/filter/ghdl/fir_iterative.make.inc @@ -13,7 +13,7 @@ _SRC += $(FIR_ITERATIVE_LIB)/filter/src/fir_stage.vhd _SRC += $(FIR_ITERATIVE_LIB)/filter/src/fir_iterative.vhd -FIR_ITERATIVE_ROOT_SRCS := $(addprefix $(_CURDIR)/,$(_SRC)) +FIR_ITERATIVE_SRCS := $(addprefix $(_CURDIR)/,$(_SRC)) undefine $(_SRC) diff --git a/lib/filter/ghdl/fir_parallel.make.inc b/lib/filter/ghdl/fir_parallel.make.inc new file mode 100644 index 0000000..f561f29 --- /dev/null +++ b/lib/filter/ghdl/fir_parallel.make.inc @@ -0,0 +1,17 @@ +_PKG_NAME := FIR_PARALLEL +FIR_PARALLEL_ROOT := ../../.. +FIR_PARALLEL_LIB := $(FIR_PARALLEL_ROOT)/lib + +_CURDIR = $(shell dirname $(lastword $(MAKEFILE_LIST))) + +_SRC := $(FIR_PARALLEL_LIB)/misc/utils_pkg.vhd +_SRC += $(FIR_PARALLEL_LIB)/fixed/ieee_proposed/fixed_util_pkg.vhd +_SRC += $(FIR_PARALLEL_LIB)/filter/src/filter_pkg.vhd +_SRC += $(FIR_PARALLEL_LIB)/filter/src/fir_pkg.vhd +_SRC += $(FIR_PARALLEL_LIB)/filter/src/fir_stage.vhd +_SRC += $(FIR_PARALLEL_LIB)/filter/src/fir_parallel.vhd + +FIR_PARALLEL_SRCS := $(addprefix $(_CURDIR)/,$(_SRC)) + +undefine $(_SRC) + diff --git a/lib/filter/ghdl/tb_fir_iterative.make b/lib/filter/ghdl/tb_fir_iterative.make index d37663e..8c815a9 100644 --- a/lib/filter/ghdl/tb_fir_iterative.make +++ b/lib/filter/ghdl/tb_fir_iterative.make @@ -5,7 +5,7 @@ LIB_PATH := $(ROOT_PATH)/lib SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd -SRCS += $(FIR_ITERATIVE_ROOT_SRCS) +SRCS += $(FIR_ITERATIVE_SRCS) SRCS += $(LIB_PATH)/filter/src/tb_fir_iterative.vhd # Compile diff --git a/lib/filter/ghdl/tb_fir_parallel.gtkw b/lib/filter/ghdl/tb_fir_parallel.gtkw new file mode 100644 index 0000000..bf55ef6 --- /dev/null +++ b/lib/filter/ghdl/tb_fir_parallel.gtkw @@ -0,0 +1,24 @@ +[*] +[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI +[*] Tue Mar 23 06:55:49 2021 +[*] +[dumpfile] "/home/jens/work/vhdl/trunk/lib/filter/ghdl/build/tb_fir_parallel/tb_fir_parallel.vcd" +[dumpfile_mtime] "Tue Mar 23 06:54:46 2021" +[dumpfile_size] 18152658 +[savefile] "/home/jens/work/vhdl/trunk/lib/filter/ghdl/build/tb_fir_parallel/tb_fir_parallel.gtkw" +[timestart] 0 +[size] 1856 1136 +[pos] -39 -39 +*-34.678261 46700000000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 +[sst_width] 233 +[signals_width] 118 +[sst_expanded] 1 +[sst_vpaned_height] 331 +@28 +tb_fir_parallel.clk +tb_fir_parallel.srst +@8421 +tb_fir_parallel.x_in[15:0] +tb_fir_parallel.y_out[15:0] +[pattern_trace] 1 +[pattern_trace] 0 diff --git a/lib/filter/ghdl/tb_fir_parallel.make b/lib/filter/ghdl/tb_fir_parallel.make new file mode 100644 index 0000000..0b5ea1b --- /dev/null +++ b/lib/filter/ghdl/tb_fir_parallel.make @@ -0,0 +1,19 @@ +include fir_parallel.make.inc + +ROOT_PATH := ../../.. +LIB_PATH := $(ROOT_PATH)/lib + +SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd +SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd +SRCS += $(FIR_PARALLEL_SRCS) +SRCS += $(LIB_PATH)/filter/src/tb_fir_parallel.vhd + +# Compile +TARGET := tb_fir_parallel +ENTITY := tb_fir_parallel +WITH_VCD := y +GHDL_OPTS := -P$(LIB_PATH)/fixed/ieee_proposed/build/fixed_pkg/ieee_proposed +RUN_TIME := 200us + +include $(ROOT_PATH)/Common/make/ghdl.mk + diff --git a/lib/filter/ghdl/wav_in.dat b/lib/filter/ghdl/wav_in.dat new file mode 100644 index 0000000..b4fc7bd Binary files /dev/null and b/lib/filter/ghdl/wav_in.dat differ