X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=tests%2Flong%2Ffs%2F80.solaris-boot%2Fref%2Fsparc%2Fsolaris%2Ft1000-simple-atomic%2Fconfig.ini;h=e058c4cd930970bcb308e2af874eadc6e9983d05;hb=143dfa31df3cc61c76e76d8b1418b73183943705;hp=ed2841d64993d5acd177aac141af3f485a7fe5a5;hpb=c9e45f01e4f84bce12cd77a3f0ecdb47b8051caa;p=gem5.git

diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
index ed2841d64..e058c4cd9 100644
--- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
+++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
@@ -8,32 +8,33 @@ time_sync_spin_threshold=200000
 
 [system]
 type=SparcSystem
-children=bridge cpu disk0 hypervisor_desc intrctrl iobus membus nvram partition_desc physmem physmem2 rom t1000
+children=bridge clk_domain cpu cpu_clk_domain disk0 hypervisor_desc intrctrl iobus membus nvram partition_desc physmem0 physmem1 rom t1000 voltage_domain
 boot_osflags=a
-clock=2
+cache_line_size=64
+clk_domain=system.clk_domain
 hypervisor_addr=1099243257856
-hypervisor_bin=/dist/m5/system/binaries/q_new.bin
+hypervisor_bin=/scratch/nilay/GEM5/system/binaries/q_new.bin
 hypervisor_desc=system.hypervisor_desc
 hypervisor_desc_addr=133446500352
-hypervisor_desc_bin=/dist/m5/system/binaries/1up-hv.bin
+hypervisor_desc_bin=/scratch/nilay/GEM5/system/binaries/1up-hv.bin
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=atomic
 mem_ranges=1048576:68157439 2147483648:2415919103
-memories=system.partition_desc system.physmem system.rom system.hypervisor_desc system.physmem2 system.nvram
+memories=system.hypervisor_desc system.nvram system.physmem1 system.physmem0 system.partition_desc system.rom
 num_work_ids=16
 nvram=system.nvram
 nvram_addr=133429198848
-nvram_bin=/dist/m5/system/binaries/nvram1
+nvram_bin=/scratch/nilay/GEM5/system/binaries/nvram1
 openboot_addr=1099243716608
-openboot_bin=/dist/m5/system/binaries/openboot_new.bin
+openboot_bin=/scratch/nilay/GEM5/system/binaries/openboot_new.bin
 partition_desc=system.partition_desc
 partition_desc_addr=133445976064
-partition_desc_bin=/dist/m5/system/binaries/1up-md.bin
+partition_desc_bin=/scratch/nilay/GEM5/system/binaries/1up-md.bin
 readfile=tests/halt.sh
 reset_addr=1099243192320
-reset_bin=/dist/m5/system/binaries/reset_new.bin
+reset_bin=/scratch/nilay/GEM5/system/binaries/reset_new.bin
 rom=system.rom
 symbolfile=
 work_begin_ckpt_count=0
@@ -47,7 +48,7 @@ system_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
-clock=2
+clk_domain=system.clk_domain
 delay=100
 ranges=133412421632:133412421639 134217728000:554050781183 644245094400:652835028991 725849473024:1095485095935 1099255955456:1099255955463
 req_size=16
@@ -55,12 +56,16 @@ resp_size=16
 master=system.iobus.slave[0]
 slave=system.membus.master[2]
 
+[system.clk_domain]
+type=SrcClockDomain
+clock=2
+voltage_domain=system.voltage_domain
+
 [system.cpu]
 type=AtomicSimpleCPU
 children=dtb interrupts isa itb tracer
-branchPred=Null
 checker=Null
-clock=2
+clk_domain=system.cpu_clk_domain
 cpu_id=0
 do_checkpoint_insts=true
 do_quiesce=true
@@ -79,6 +84,10 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_interval=100000000
+simpoint_profile=false
+simpoint_profile_file=simpoint.bb.gz
+simpoint_start_insts=
 simulate_data_stalls=false
 simulate_inst_stalls=false
 switched_out=false
@@ -106,10 +115,15 @@ size=64
 [system.cpu.tracer]
 type=ExeTracer
 
+[system.cpu_clk_domain]
+type=SrcClockDomain
+clock=2
+voltage_domain=system.voltage_domain
+
 [system.disk0]
 type=MmDisk
 children=image
-clock=2
+clk_domain=system.clk_domain
 image=system.disk0.image
 pio_addr=134217728000
 pio_latency=200
@@ -126,21 +140,20 @@ table_size=65536
 
 [system.disk0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/disk.s10hw2
+image_file=/scratch/nilay/GEM5/system/disks/disk.s10hw2
 read_only=true
 
 [system.hypervisor_desc]
 type=SimpleMemory
 bandwidth=0.000000
-clock=2
-conf_table_reported=false
+clk_domain=system.clk_domain
+conf_table_reported=true
 in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=133446500352:133446508543
-zero=false
-port=system.membus.master[7]
+port=system.membus.master[5]
 
 [system.intrctrl]
 type=IntrControl
@@ -148,8 +161,7 @@ sys=system
 
 [system.iobus]
 type=NoncoherentBus
-block_size=64
-clock=2
+clk_domain=system.clk_domain
 header_cycles=1
 use_default_range=false
 width=8
@@ -159,19 +171,18 @@ slave=system.bridge.master
 [system.membus]
 type=CoherentBus
 children=badaddr_responder
-block_size=64
-clock=2
+clk_domain=system.clk_domain
 header_cycles=1
 system=system
 use_default_range=false
 width=8
 default=system.membus.badaddr_responder.pio
-master=system.t1000.iob.pio system.t1000.htod.pio system.bridge.slave system.physmem.port system.physmem2.port system.rom.port system.nvram.port system.hypervisor_desc.port system.partition_desc.port
+master=system.t1000.iob.pio system.t1000.htod.pio system.bridge.slave system.rom.port system.nvram.port system.hypervisor_desc.port system.partition_desc.port system.physmem0.port system.physmem1.port
 slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
 
 [system.membus.badaddr_responder]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=0
 pio_latency=200
@@ -189,99 +200,62 @@ pio=system.membus.default
 [system.nvram]
 type=SimpleMemory
 bandwidth=0.000000
-clock=2
-conf_table_reported=false
+clk_domain=system.clk_domain
+conf_table_reported=true
 in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=133429198848:133429207039
-zero=false
-port=system.membus.master[6]
+port=system.membus.master[4]
 
 [system.partition_desc]
 type=SimpleMemory
 bandwidth=0.000000
-clock=2
-conf_table_reported=false
+clk_domain=system.clk_domain
+conf_table_reported=true
 in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=133445976064:133445984255
-zero=false
-port=system.membus.master[8]
+port=system.membus.master[6]
 
-[system.physmem]
-type=SimpleDRAM
-activation_limit=4
-addr_mapping=openmap
-banks_per_rank=8
-channels=1
-clock=2
-conf_table_reported=false
+[system.physmem0]
+type=SimpleMemory
+bandwidth=0.000000
+clk_domain=system.clk_domain
+conf_table_reported=true
 in_addr_map=true
-lines_per_rowbuffer=32
-mem_sched_policy=frfcfs
+latency=60
+latency_var=0
 null=false
-page_policy=open
 range=1048576:68157439
-ranks_per_channel=2
-read_buffer_size=32
-tBURST=10
-tCL=28
-tRCD=28
-tREFI=15600
-tRFC=600
-tRP=28
-tWTR=15
-tXAW=80
-write_buffer_size=32
-write_thresh_perc=70
-zero=true
-port=system.membus.master[3]
+port=system.membus.master[7]
 
-[system.physmem2]
-type=SimpleDRAM
-activation_limit=4
-addr_mapping=openmap
-banks_per_rank=8
-channels=1
-clock=2
-conf_table_reported=false
+[system.physmem1]
+type=SimpleMemory
+bandwidth=0.000000
+clk_domain=system.clk_domain
+conf_table_reported=true
 in_addr_map=true
-lines_per_rowbuffer=32
-mem_sched_policy=frfcfs
+latency=60
+latency_var=0
 null=false
-page_policy=open
 range=2147483648:2415919103
-ranks_per_channel=2
-read_buffer_size=32
-tBURST=10
-tCL=28
-tRCD=28
-tREFI=15600
-tRFC=600
-tRP=28
-tWTR=15
-tXAW=80
-write_buffer_size=32
-write_thresh_perc=70
-zero=true
-port=system.membus.master[4]
+port=system.membus.master[8]
 
 [system.rom]
 type=SimpleMemory
 bandwidth=0.000000
-clock=2
-conf_table_reported=false
+clk_domain=system.clk_domain
+conf_table_reported=true
 in_addr_map=true
 latency=60
 latency_var=0
 null=false
 range=1099243192320:1099251580927
-zero=false
-port=system.membus.master[5]
+port=system.membus.master[3]
 
 [system.t1000]
 type=T1000
@@ -291,7 +265,7 @@ system=system
 
 [system.t1000.fake_clk]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=644245094400
 pio_latency=200
@@ -308,7 +282,7 @@ pio=system.iobus.master[0]
 
 [system.t1000.fake_jbi]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=549755813888
 pio_latency=200
@@ -325,7 +299,7 @@ pio=system.iobus.master[11]
 
 [system.t1000.fake_l2_1]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=725849473024
 pio_latency=200
@@ -342,7 +316,7 @@ pio=system.iobus.master[2]
 
 [system.t1000.fake_l2_2]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=725849473088
 pio_latency=200
@@ -359,7 +333,7 @@ pio=system.iobus.master[3]
 
 [system.t1000.fake_l2_3]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=725849473152
 pio_latency=200
@@ -376,7 +350,7 @@ pio=system.iobus.master[4]
 
 [system.t1000.fake_l2_4]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=725849473216
 pio_latency=200
@@ -393,7 +367,7 @@ pio=system.iobus.master[5]
 
 [system.t1000.fake_l2esr_1]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=734439407616
 pio_latency=200
@@ -410,7 +384,7 @@ pio=system.iobus.master[6]
 
 [system.t1000.fake_l2esr_2]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=734439407680
 pio_latency=200
@@ -427,7 +401,7 @@ pio=system.iobus.master[7]
 
 [system.t1000.fake_l2esr_3]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=734439407744
 pio_latency=200
@@ -444,7 +418,7 @@ pio=system.iobus.master[8]
 
 [system.t1000.fake_l2esr_4]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=734439407808
 pio_latency=200
@@ -461,7 +435,7 @@ pio=system.iobus.master[9]
 
 [system.t1000.fake_membnks]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=648540061696
 pio_latency=200
@@ -478,7 +452,7 @@ pio=system.iobus.master[1]
 
 [system.t1000.fake_ssi]
 type=IsaFake
-clock=2
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=1095216660480
 pio_latency=200
@@ -502,7 +476,7 @@ port=3456
 
 [system.t1000.htod]
 type=DumbTOD
-clock=2
+clk_domain=system.clk_domain
 pio_addr=1099255906296
 pio_latency=200
 system=system
@@ -511,7 +485,7 @@ pio=system.membus.master[1]
 
 [system.t1000.hvuart]
 type=Uart8250
-clock=2
+clk_domain=system.clk_domain
 pio_addr=1099255955456
 pio_latency=200
 platform=system.t1000
@@ -521,7 +495,7 @@ pio=system.iobus.master[13]
 
 [system.t1000.iob]
 type=Iob
-clock=2
+clk_domain=system.clk_domain
 pio_latency=2
 platform=system.t1000
 system=system
@@ -536,7 +510,7 @@ port=3456
 
 [system.t1000.puart0]
 type=Uart8250
-clock=2
+clk_domain=system.clk_domain
 pio_addr=133412421632
 pio_latency=200
 platform=system.t1000
@@ -544,3 +518,7 @@ system=system
 terminal=system.t1000.pterm
 pio=system.iobus.master[12]
 
+[system.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+