update toolchain versions

diff --git a/DBO/config_compile_frankfurt.pl b/DBO/config_compile_frankfurt.pl
index 7767051476c5faa6f92a1204d8e61ee62685e915..a1a625a96bd2c119f1ce7b9f40f83210c6fc6d09 100644 (file)
--- a/DBO/config_compile_frankfurt.pl
+++ b/DBO/config_compile_frankfurt.pl
@@ -7,7 +7,7 @@ Speedgrade  => '8',
 TOPNAME                      => "mdctdc",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1710\@jspc29",
 TOPNAME                      => "mdctdc",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1710\@jspc29",

-lattice_path                 => '/d/jspc29/lattice/diamond/3.12',
+lattice_path                 => '/d/jspc29/lattice/diamond/3.14',

 #synplify_path                => '/d/jspc29/lattice/synplify/V-2023.09-SP1/',#T-2022.09-SP2/',
 synplify_path                => '/d/jspc29/lattice/synplify/W-2024.09/',
 
 #synplify_path                => '/d/jspc29/lattice/synplify/V-2023.09-SP1/',#T-2022.09-SP2/',
 synplify_path                => '/d/jspc29/lattice/synplify/W-2024.09/',
 

diff --git a/DBO/mdctdc.lpf b/DBO/mdctdc.lpf
index d3499acc1a4e514afcf5186ef554879caaedaa48..1d4f2d36f6da218afbe4fd1e1fc5baefe9693d20 100644 (file)
--- a/DBO/mdctdc.lpf
+++ b/DBO/mdctdc.lpf
@@ -19,7 +19,7 @@ MULTICYCLE FROM ASIC THE_MEDIA_INTERFACE/gen_pcs0.THE_SERDES/serdes_sync_0_inst/
 
 MULTICYCLE FROM CELL "THE_TDC/gen_CHANNELS.*.THE_HITBUF/STATUS_OU*" 10 ns;
 MULTICYCLE FROM CELL "reset_i_fas*" 10 ns;
 
 MULTICYCLE FROM CELL "THE_TDC/gen_CHANNELS.*.THE_HITBUF/STATUS_OU*" 10 ns;
 MULTICYCLE FROM CELL "reset_i_fas*" 10 ns;

-
+MULTICYCLE FROM CELL "THE_ENDPOINT/THE_ENDPOINT/reset_no_link" 10 ns;

 REGION               "MEDIA" "R57C34D" 13 30;
 #LOCATE UGROUP        "THE_MEDIA_INTERFACE/media_interface_group" REGION "MEDIA" ;
 
 REGION               "MEDIA" "R57C34D" 13 30;
 #LOCATE UGROUP        "THE_MEDIA_INTERFACE/media_interface_group" REGION "MEDIA" ;
 

diff --git a/DBO/nodelist_frankfurt.txt b/DBO/nodelist_frankfurt.txt
new file mode 100644 (file)
index 0000000..b6a268b
--- /dev/null
+++ b/DBO/nodelist_frankfurt.txt
@@ -0,0 +1,7 @@
+// nodes file for parallel place&route
+
+[jspc85]
+SYSTEM = linux
+CORENUM = 7
+ENV = /d/jspc29/lattice/312_settings.sh
+WORKDIR = /d/jspc22/trb/git/mdcupgrade/DBO/workdir

diff --git a/DBO/par.p2t b/DBO/par.p2t
index f559d83f92ab171f91777937012ed517cfa66196..e72f005e72038ebb84a6651a9b9f26947bba9cbf 100644 (file)
--- a/DBO/par.p2t
+++ b/DBO/par.p2t
@@ -4,7 +4,7 @@
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 10
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 10

--t 18
+-t 41

 -c 2
 -e 2
 -i 10
 -c 2
 -e 2
 -i 10

diff --git a/OEP/config_compile_frankfurt.pl b/OEP/config_compile_frankfurt.pl
index 196cb21b971fc3bcfafd6d0d79e092617bf89bb9..b8166ee22c93f245f522da3636b6d910db4500d7 100644 (file)
--- a/OEP/config_compile_frankfurt.pl
+++ b/OEP/config_compile_frankfurt.pl
@@ -6,9 +6,13 @@ Speedgrade  => '8',
 
 TOPNAME                      => "mdcoep",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 
 TOPNAME                      => "mdcoep",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";

+#lm_license_file_for_synplify => "1702\@hadeb05.gsi.de",
+
+

 lm_license_file_for_par      => "1710\@jspc29", #1702
 lattice_path                 => '/d/jspc29/lattice/diamond/3.12',
 lm_license_file_for_par      => "1710\@jspc29", #1702
 lattice_path                 => '/d/jspc29/lattice/diamond/3.12',

-synplify_path                => '/d/jspc29/lattice/synplify/V-2023.09-SP1/',#T-2022.09-SP2/',
+synplify_path                => '/d/jspc29/lattice/synplify/W-2024.09/',#T-2022.09-SP2/',
+#synplify_command             => '/d/jspc29/lattice/diamond/3.12/bin/lin64/synpwrap -options ',

 
 nodelist_file                => 'nodelist_frankfurt.txt',
 pinout_file                  => 'oep',
 
 nodelist_file                => 'nodelist_frankfurt.txt',
 pinout_file                  => 'oep',

diff --git a/OEP/mdcoep.vhd b/OEP/mdcoep.vhd
index d56cd15fc9bb13170d6c5cfa40685ec2d5498712..10bddc8e8aa95c1b08ab2d6e8e84d2d349270254 100644 (file)
--- a/OEP/mdcoep.vhd
+++ b/OEP/mdcoep.vhd
@@ -298,8 +298,8 @@ begin
   THE_BUS_HANDLER : entity work.trb_net16_regio_bus_handler_record
     generic map(
       PORT_NUMBER      => 4,
   THE_BUS_HANDLER : entity work.trb_net16_regio_bus_handler_record
     generic map(
       PORT_NUMBER      => 4,

-      PORT_ADDRESSES   => (0 => x"d000", 1 => x"b000", 2 => x"c000", 3 => x"b200", others => x"0000"),
-      PORT_ADDR_MASK   => (0 => 12, 1 => 9,  2 => 12, 3 => 9, others => 0),
+      PORT_ADDRESSES   => (0 => x"d000", 1 => x"b000", 2 => x"b200", others => x"0000"),
+      PORT_ADDR_MASK   => (0 => 12, 1 => 9,  2 => 9, others => 0),

       PORT_MASK_ENABLE => 1
       )
     port map(
       PORT_MASK_ENABLE => 1
       )
     port map(


@@ -311,12 +311,12 @@ begin
 
       BUS_RX(0) => bustools_rx,         --Flash, SPI, UART, ADC, SED
       BUS_RX(1) => bussci_rx,           --SCI Serdes
 
       BUS_RX(0) => bustools_rx,         --Flash, SPI, UART, ADC, SED
       BUS_RX(1) => bussci_rx,           --SCI Serdes

-      BUS_RX(2) => bustdc_rx,            --Clock switch
-      BUS_RX(3) => bussci2_rx,
+      --BUS_RX(2) => bustdc_rx,            --Clock switch
+      BUS_RX(2) => bussci2_rx,

       BUS_TX(0) => bustools_tx,
       BUS_TX(1) => bussci_tx,
       BUS_TX(0) => bustools_tx,
       BUS_TX(1) => bussci_tx,

-      BUS_TX(2) => bustdc_tx,
-      BUS_TX(3) => bussci2_tx,
+      --BUS_TX(2) => bustdc_tx,
+      BUS_TX(2) => bussci2_tx,

 
       STAT_DEBUG => open
       );
 
       STAT_DEBUG => open
       );

diff --git a/OEP/nodelist_frankfurt.txt b/OEP/nodelist_frankfurt.txt
index 8b55fffe0b000bfbab42390132dae9b1d599e0cb..a89293a613b888ec82f2ad303729603416918e2a 100644 (file)
--- a/OEP/nodelist_frankfurt.txt
+++ b/OEP/nodelist_frankfurt.txt
@@ -2,6 +2,6 @@
 
 [jspc85]
 SYSTEM = linux
 
 [jspc85]
 SYSTEM = linux

-CORENUM = 7
+CORENUM = 9

 ENV = /d/jspc29/lattice/312_settings.sh
 WORKDIR = /d/jspc22/trb/git/mdcupgrade/OEP/workdir
 ENV = /d/jspc29/lattice/312_settings.sh
 WORKDIR = /d/jspc22/trb/git/mdcupgrade/OEP/workdir

diff --git a/OEP/par.p2t b/OEP/par.p2t
index a3b9c1d0a79dcdd51c28690e42c6e003ce45bc51..90aad2c3c560a292afaec2a7ef007517dad4b1eb 100644 (file)
--- a/OEP/par.p2t
+++ b/OEP/par.p2t
@@ -4,7 +4,7 @@
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 10
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 10

--t 30
+-t 12

 -c 2
 -e 2
 -i 10
 -c 2
 -e 2
 -i 10