Possible fix for vunit simulations in newer GHDL?

talonmyburgh · May 26, 2023 · 5d5aa2d · 5d5aa2d
1 parent e868cac
commit 5d5aa2d
Show file tree

Hide file tree

Showing 15 changed files with 14,635 additions and 52 deletions.
diff --git a/casper_wb_fft/run.py b/casper_wb_fft/run.py
@@ -1,4 +1,5 @@
 from vunit import VUnit, VUnitCLI
+from vunit.sim_if.factory import SIMULATOR_FACTORY
 from os.path import join, abspath, split,realpath,dirname
 from importlib.machinery import SourceFileLoader
 # load the r2sdf fix point accurate model from r2sdf module.
@@ -157,9 +158,19 @@ def manglePkg(file_name, line_number, new_line):
 
 # COMMON PACKAGE Library
 common_pkg_lib = vu.add_library("common_pkg_lib")
-common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_float_types_c.vhd"))
-common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_pkg_c.vhd"))
-common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_pkg_c.vhd"))
+if SIMULATOR_FACTORY.select_simulator().name == "ghdl":
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_float_types_c_2008redirect.vhdl"))
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_generic_pkg-body_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_generic_pkg_2008redirect.vhdl"))
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_generic_pkg-body_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_generic_pkg_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_pkg_c_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_pkg_c_2008redirect.vhdl"))
+else:
+    # use the "hacked" up VHDL93 version in other simulators 
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_float_types_c.vhd"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_pkg_c.vhd"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_pkg_c.vhd")) 
 common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/common_pkg.vhd"))
 common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/common_str_pkg.vhd"))
 common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/tb_common_pkg.vhd"))

diff --git a/casper_wb_fft/tb_vu_wb_fft_vfmodel.vhd b/casper_wb_fft/tb_vu_wb_fft_vfmodel.vhd
@@ -3,7 +3,7 @@ use ieee.std_logic_1164.all;
 use ieee.numeric_std.all; 
 use ieee.math_real.all;
 library common_pkg_lib;
-use common_pkg_lib.fixed_float_types.all;
+use ieee.fixed_float_types.all;
 --use ieee.fixed_pkg.all;
 use common_pkg_lib.fixed_pkg.all;
 context vunit_lib.vunit_context;

diff --git a/casper_wbpfb/run.py b/casper_wbpfb/run.py
@@ -1,4 +1,5 @@
 from vunit import VUnit
+from vunit.sim_if.factory import SIMULATOR_FACTORY
 from os.path import join, dirname, abspath
 script_dir = dirname(__file__)
 import generic_dicts
@@ -77,9 +78,19 @@ def manglePkg(file_name, line_number, new_line):
 
 # COMMON PACKAGE Library
 common_pkg_lib = vu.add_library("common_pkg_lib")
-common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_float_types_c.vhd"))
-common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_pkg_c.vhd"))
-common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_pkg_c.vhd"))
+if SIMULATOR_FACTORY.select_simulator().name == "ghdl":
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_float_types_c_2008redirect.vhdl"))
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_generic_pkg-body_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_generic_pkg_2008redirect.vhdl"))
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_generic_pkg-body_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_generic_pkg_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_pkg_c_2008redirect.vhdl"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_pkg_c_2008redirect.vhdl"))
+else:
+    # use the "hacked" up VHDL93 version in other simulators 
+    #common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_float_types_c.vhd"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/fixed_pkg_c.vhd"))
+    common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/float_pkg_c.vhd"))
 common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/common_pkg.vhd"))
 common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/common_str_pkg.vhd"))
 common_pkg_lib.add_source_files(join(script_dir, "../common_pkg/tb_common_pkg.vhd"))

diff --git a/common_pkg/common_pkg.vhd b/common_pkg/common_pkg.vhd
@@ -32,7 +32,7 @@ LIBRARY IEEE;
 USE IEEE.STD_LOGIC_1164.ALL;
 USE IEEE.NUMERIC_STD.ALL;
 USE IEEE.MATH_REAL.ALL;
-use work.fixed_float_types.all;
+use IEEE.fixed_float_types.all;
 use work.fixed_pkg.all;
 
 PACKAGE common_pkg IS

diff --git a/common_pkg/fixed_float_types_c.vhd b/common_pkg/fixed_float_types_c.vhd