Correct taking in accounts of the parameters settings.

diff --git a/experiments9/cells.lst b/experiments9/cells.lst
index 14c6c7885de1de24701228eef15e886ee08ed9db..f0f6b3661a14be88b49b9205eb46181566cfc9a3 100644 (file)
--- a/experiments9/cells.lst
+++ b/experiments9/cells.lst
@@ -2,22 +2,34 @@ test_issuer
 adr_l
 adrok_l
 alu0
-alu_17
-alu_31
-alu_3
-alu_47
+alu_alu0
+alu_branch0
+alu_cr0
+alu_div0
+alui_l_102
+alui_l_117
 alui_l_15
-alui_l_29
-alui_l_45
-alui_l_61
+alui_l_28
+alui_l_41
+alui_l_56
+alui_l_68
+alui_l_85
 alui_l
+alu_l_103
+alu_l_118
+alu_l_121
 alu_l_16
-alu_l_30
-alu_l_46
-alu_l_62
-alu_l_65
+alu_l_29
+alu_l_42
+alu_l_57
+alu_l_69
+alu_l_86
+alu_logical0
 alu_l
-alu
+alu_mul0
+alu_shift_rot0
+alu_spr0
+alu_trap0
 bpermd
 branch0
 busy_l
@@ -25,6 +37,8 @@ clz
 core
 cr0
 cr
+cyc_l
+dbg
 dec19
 dec30
 dec31
@@ -59,144 +73,184 @@ dec_sub8
 dec_sub9
 dec
 div0
+div_state_init
+div_state_next
 fast
 fus
 idx_l
 imem
-input_37
-input_53
+input_109
+input_48
+input_74
+input_91
 input
 int
-l0_67
+l0_123
 l0
 ld_active
 ldst0
 lenexp
 lod_l
 logical0
-main_23
-main_38
-main_54
+lsd_l
+lsmem
+main_110
+main_22
+main_35
+main_49
 main_9
 main
 mul0
-mem
+mul1
+mul2
+mul3
+mul_pipe1
+mul_pipe2
+mul_pipe3
+opc_l_113
+opc_l_119
 opc_l_11
-opc_l_25
-opc_l_41
-opc_l_57
-opc_l_63
+opc_l_24
+opc_l_37
+opc_l_52
+opc_l_64
+opc_l_81
+opc_l_98
 opc_l
-output_39
-output_55
+output_111
+output_50
+output_79
+output_96
+output_stage
 output
 pdecode2
 pick
 pimem
-pipe_20
-pipe_34
-pipe_50
+pipe_106
+pipe_19
+pipe_32
+pipe_45
+pipe_60
 pipe_6
+pipe_end
+pipe_middle_0
+pipe_start
 pipe
 popcount
-port0
 rdpick_cr_cr_a
 rdpick_cr_cr_b
 rdpick_cr_cr_c
 rdpick_cr_full_cr
-rdpick_fast_cia
-rdpick_fast_spr1
-rdpick_fast_spr2
+rdpick_fast_fast1
 rdpick_int_ra
-rdpick_int_rb
-rdpick_int_rc
+rdpick_int_rbc
+rdpick_spr_spr1
 rdpick_xer_xer_ca
+rdpick_xer_xer_ov
 rdpick_xer_xer_so
-reg_0_69
-reg_0_77
-reg_0_80
+reg_0_125
+reg_0_133
+reg_0_136
+reg_0_141
 reg_0
 reg_10
+reg_1_126
+reg_1_134
+reg_1_137
+reg_1_142
 reg_11
 reg_12
 reg_13
 reg_14
 reg_15
 reg_16
-reg_1_70
-reg_1_78
 reg_17
-reg_1_81
 reg_18
 reg_19
 reg_1
 reg_20
+reg_2_127
+reg_2_135
+reg_2_138
 reg_21
 reg_22
 reg_23
 reg_24
 reg_25
 reg_26
-reg_2_71
-reg_2_79
 reg_27
-reg_2_82
 reg_28
 reg_29
 reg_2
 reg_30
+reg_3_128
+reg_3_139
 reg_31
-reg_3_72
-reg_3_83
 reg_3
-reg_4_73
-reg_4_84
+reg_4_129
+reg_4_140
 reg_4
-reg_5_74
-reg_5_85
+reg_5_130
 reg_5
-reg_6_75
-reg_6_86
+reg_6_131
 reg_6
-reg_7_76
-reg_7_87
+reg_7_132
 reg_7
 reg_8
 reg_9
+req_l_114
 req_l_12
-req_l_26
-req_l_42
-req_l_58
+req_l_25
+req_l_38
+req_l_53
+req_l_65
+req_l_82
+req_l_99
 req_l
 reset_l
+rok_l_101
+rok_l_116
 rok_l_14
-rok_l_28
-rok_l_44
-rok_l_60
+rok_l_27
+rok_l_40
+rok_l_55
+rok_l_67
+rok_l_84
 rok_l
 rotator
 rotl
-rst_l_66
+rst_l_122
+setup_stage
 shiftrot0
+spr0
+spr_main
+sprmap_1
+sprmap
 src_l_10
-src_l_24
-src_l_40
-src_l_56
-src_l_64
+src_l_112
+src_l_120
+src_l_23
+src_l_36
+src_l_51
+src_l_63
+src_l_80
+src_l_97
 src_l
-state
 st_active
+state
+st_done
 sto_l
 trap0
 upd_l
+valid_l
 wri_l
 wrpick_cr_cr_a
 wrpick_cr_full_cr
-wrpick_fast_nia
-wrpick_fast_spr1
-wrpick_fast_spr2
-wrpick_int_o1
+wrpick_fast_fast1
 wrpick_int_o
+wrpick_spr_spr1
+wrpick_state_msr
+wrpick_state_nia
 wrpick_xer_xer_ca
 wrpick_xer_xer_ov
 wrpick_xer_xer_so

diff --git a/experiments9/coriolis2/settings.py b/experiments9/coriolis2/settings.py
index 57089be8165b1bb027a92f4ff13bd8e297070dfb..bf31f5dd342dad30e01d19b70ff1462970bcd049 100644 (file)
--- a/experiments9/coriolis2/settings.py
+++ b/experiments9/coriolis2/settings.py
@@ -6,52 +6,57 @@ import Viewer
 from   helpers.overlay import CfgCache
 import symbolic.cmos  # do not remove
 
-cfg = CfgCache('')
-cfg.misc.catchCore               = False
-cfg.misc.info                    = False
-cfg.misc.paranoid                = False
-cfg.misc.bug                     = False
-cfg.misc.logMode                 = True
-cfg.misc.verboseLevel1           = True
-cfg.misc.verboseLevel2           = True
-cfg.anabatic.edgeLenght          = 24
-cfg.anabatic.edgeWidth           = 8
-cfg.anabatic.topRoutingLayer     = 'METAL5'
-cfg.etesian.graphics             = 3
-
-#cfg.katana.searchHalo           = 30
-#cfg.katana.eventsLimit          = 1000000
-#cfg.katana.hTracksReservedLocal = 7
-
-# Run 2 (make-cgt-2.log)
-#cfg.etesian.effort              = 2
-#cfg.etesian.uniformDensity      = True
-#cfg.etesian.spaceMargin         = 0.05
-#cfg.etesian.aspectRatio         = 1.0
-#cfg.katana.vTracksReservedLocal = 4
-#cfg.katana.hTracksReservedLocal = 4
-
-# Run 3 (make-cgt-3.log)
-#cfg.etesian.effort              = 2
-#cfg.etesian.uniformDensity      = False
-#cfg.etesian.spaceMargin         = 0.05
-#cfg.etesian.aspectRatio         = 1.0
-#cfg.katana.vTracksReservedLocal = 5
-#cfg.katana.hTracksReservedLocal = 5
-
-# Run 4 (make-cgt-4.log)
-#cfg.etesian.effort              = 2
-#cfg.etesian.uniformDensity      = True
-#cfg.etesian.spaceMargin         = 0.05
-#cfg.etesian.aspectRatio         = 1.0
-
-# Run 5 (make-cgt-5.log)
-cfg.etesian.effort              = 2
-cfg.etesian.uniformDensity      = True
-cfg.etesian.spaceMargin         = 0.05
-cfg.etesian.aspectRatio         = 1.0
-cfg.katana.vTracksReservedLocal = 5
-cfg.katana.hTracksReservedLocal = 5
+with CfgCache('', priority=Cfg.Parameter.Priority.UserFile) as cfg:
+    cfg.misc.catchCore               = False
+    cfg.misc.info                    = False
+    cfg.misc.paranoid                = False
+    cfg.misc.bug                     = False
+    cfg.misc.logMode                 = True
+    cfg.misc.verboseLevel1           = True
+    cfg.misc.verboseLevel2           = True
+    cfg.anabatic.edgeLenght          = 24
+    cfg.anabatic.edgeWidth           = 8
+    cfg.anabatic.topRoutingLayer     = 'METAL5'
+    cfg.etesian.graphics             = 3
+    
+    #cfg.katana.searchHalo           = 30
+    #cfg.katana.eventsLimit          = 1000000
+    #cfg.katana.hTracksReservedLocal = 7
+    
+    # Run 2 (make-cgt-2.log)
+    #cfg.etesian.effort              = 2
+    #cfg.etesian.uniformDensity      = True
+    #cfg.etesian.spaceMargin         = 0.05
+    #cfg.etesian.aspectRatio         = 1.0
+    #cfg.katana.vTracksReservedLocal = 4
+    #cfg.katana.hTracksReservedLocal = 4
+    
+    # Run 3 (make-cgt-3.log)
+    #cfg.etesian.effort              = 2
+    #cfg.etesian.uniformDensity      = False
+    #cfg.etesian.spaceMargin         = 0.05
+    #cfg.etesian.aspectRatio         = 1.0
+    #cfg.katana.vTracksReservedLocal = 5
+    #cfg.katana.hTracksReservedLocal = 5
+    
+    # Run 4 (make-cgt-4.log)
+    #cfg.etesian.effort              = 2
+    #cfg.etesian.uniformDensity      = True
+    #cfg.etesian.spaceMargin         = 0.05
+    #cfg.etesian.aspectRatio         = 1.0
+    
+    # Run 5 (make-cgt-5.log)
+    cfg.etesian.effort               = 2
+    cfg.etesian.uniformDensity       = True
+    cfg.etesian.spaceMargin          = 0.05
+    cfg.etesian.aspectRatio          = 1.0
+    cfg.katana.useGlobalEstimate     = False
+    cfg.katana.vTracksReservedLocal  = 7
+    cfg.katana.hTracksReservedLocal  = 6
+    cfg.katana.bloatOverloadAdd      = 4
+    cfg.conductor.stopLevel          = 0
+    cfg.conductor.maxPlaceIterations = 2
+    cfg.conductor.useFixedAbHeight   = False
 
 env = CRL.AllianceFramework.get().getEnvironment()
 env.setCLOCK ('^clk$|m_clock')