Skip to content

Fix for floating point crashes and warnings for gcc 12 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JaimeRoelandts wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix for floating point crashes and warnings for gcc 12 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc18d76
Fix: typo in output of extio
yihuajack Jul 3, 2022
d368ac8
Fixed crash on floating point and fixed some warnings such as unused
JaimeRoelandts Jul 20, 2023
bd322ee
Merge branch 'typo' into fix-gcc-12
JaimeRoelandts Jul 20, 2023
106de4b
Changed double backed to integer division as this is probably more
JaimeRoelandts Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions basic_circuit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,20 +899,20 @@ double shortcircuit(
double vdd)
{

double p_short_circuit=0, p_short_circuit_discharge=0;//, p_short_circuit_charge, p_short_circuit_discharge_low, p_short_circuit_discharge_high, p_short_circuit_charge_low, p_short_circuit_charge_high; //this is actually energy
double /*fo_n,*/ fo_p, fanout, beta_ratio /*,vt_to_vdd_ratio*/;
double f_alpha, k_v, e, g_v_alpha, h_v_alpha;
double p_short_circuit=0;//, p_short_circuit_discharge=0, p_short_circuit_charge, p_short_circuit_discharge_low, p_short_circuit_discharge_high, p_short_circuit_charge_low, p_short_circuit_charge_high; //this is actually energy
//double /*fo_n,*/ fo_p, fanout, beta_ratio /*,vt_to_vdd_ratio*/;
//double f_alpha, k_v, e, g_v_alpha, h_v_alpha;

///fo_n = i_on_n/i_on_n_in;
fo_p = i_on_p/i_on_p_in;
fanout = 1;
beta_ratio = i_on_p/i_on_n;
//fo_p = i_on_p/i_on_p_in;
//fanout = 1;
//beta_ratio = i_on_p/i_on_n;
///vt_to_vdd_ratio = vt/vdd;
e = 2.71828;
f_alpha = 1/(velocity_index+2) -velocity_index/(2*(velocity_index+3)) +velocity_index/(velocity_index+4)*(velocity_index/2-1);
k_v = 0.9/0.8+(vdd-vt)/0.8*log(10*(vdd-vt)/e);
g_v_alpha = (velocity_index + 1)*pow((1-velocity_index),velocity_index)*pow((1-velocity_index),velocity_index/2)/f_alpha/pow((1-velocity_index-velocity_index),(velocity_index/2+velocity_index+2));
h_v_alpha = pow(2, velocity_index)*(velocity_index+1)*pow((1-velocity_index),velocity_index)/pow((1-velocity_index-velocity_index),(velocity_index+1));
//e = 2.71828;
//f_alpha = 1/(velocity_index+2) -velocity_index/(2*(velocity_index+3)) +velocity_index/(velocity_index+4)*(velocity_index/2-1);
//k_v = 0.9/0.8+(vdd-vt)/0.8*log(10*(vdd-vt)/e);
//g_v_alpha = (velocity_index + 1)*pow((1-velocity_index),velocity_index)*pow((1-velocity_index),velocity_index/2)/f_alpha/pow((1-velocity_index-velocity_index),(velocity_index/2+velocity_index+2));
//h_v_alpha = pow(2, velocity_index)*(velocity_index+1)*pow((1-velocity_index),velocity_index)/pow((1-velocity_index-velocity_index),(velocity_index+1));

//p_short_circuit_discharge_low = 10/3*(pow(0.5-vt_to_vdd_ratio,3.0)/pow(velocity_index,2.0)/pow(2.0,3*vt_to_vdd_ratio*vt_to_vdd_ratio))*c_in*vdd*vdd*fo_p*fo_p/fanout/beta_ratio;
// p_short_circuit_discharge_low = 10/3*(pow(((vdd-vt)-vt_to_vdd_ratio),3.0)/pow(velocity_index,2.0)/pow(2.0,3*vt_to_vdd_ratio*vt_to_vdd_ratio))*c_in*vdd*vdd*fo_p*fo_p/fanout/beta_ratio;
Expand All @@ -936,7 +936,7 @@ double shortcircuit(
//
// p_short_circuit = p_short_circuit_discharge;

p_short_circuit_discharge = k_v*vdd*vdd*c_in*fo_p*fo_p/((vdd-vt)*g_v_alpha*fanout*beta_ratio/2/k_v + h_v_alpha*fo_p);
//p_short_circuit_discharge = k_v*vdd*vdd*c_in*fo_p*fo_p/((vdd-vt)*g_v_alpha*fanout*beta_ratio/2/k_v + h_v_alpha*fo_p);
return (p_short_circuit);
}

Expand Down
2 changes: 1 addition & 1 deletion cacti.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ INCS = -lm

ifeq ($(TAG),dbg)
DBG = -Wall
OPT = -ggdb -g -O0 -DNTHREADS=1 -gstabs+
OPT = -ggdb -g -O0 -DNTHREADS=1
else
DBG =
OPT = -g -msse2 -mfpmath=sse -DNTHREADS=$(NTHREADS)
Expand Down
2 changes: 1 addition & 1 deletion crossbar.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void Crossbar::compute_power()
double cap = g_tp.wire_outside_mat.C_per_um * (area.w + area.h) + n_out*tri_inp_cap + n_inp*tri_out_cap;
delay = horowitz(w1.signal_rise_time(), res*cap, deviceType->Vth/deviceType->Vdd, deviceType->Vth/deviceType->Vdd, RISE);

Wire wreset();
Wire wreset;
}

void Crossbar::print_crossbar()
Expand Down
2 changes: 1 addition & 1 deletion extio.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ void Extio::extio_eye()

printf("IO Timing Margin (ps) = ");
cout << io_tmargin <<endl;
printf("IO Votlage Margin (V) = ");
printf("IO Voltage Margin (V) = ");
cout << io_vmargin << endl;

}
88 changes: 47 additions & 41 deletions extio_technology.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ int IOTechParam::frequnecy_index(Mem_IO_type type)

IOTechParam::IOTechParam(InputParameter * g_ip)
{
num_mem_ca = g_ip->num_mem_dq * (g_ip->num_dq/g_ip->mem_data_width);
num_mem_clk = g_ip->num_mem_dq *
(g_ip->num_dq/g_ip->mem_data_width)/(g_ip->num_clk/2);
num_mem_ca = g_ip->num_mem_dq * (int)(g_ip->num_dq/g_ip->mem_data_width);
num_mem_clk = (int)(g_ip->num_mem_dq *
(g_ip->num_dq/g_ip->mem_data_width)/(g_ip->num_clk/2));


if (g_ip->io_type == LPDDR2) { //LPDDR
Expand Down Expand Up @@ -354,16 +354,16 @@ IOTechParam::IOTechParam(InputParameter * g_ip)
* of experiments method shown in the technical report (), in Chapter 2.2. */

k_noise_write_sen = k_noise_write * (1 + 0.2*(r_on/34 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));
k_noise_read_sen = k_noise_read * (1 + 0.2*(r_on/34 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));
k_noise_addr_sen = k_noise_addr * (1 + 0.1*(rtt_ca/100 - 1) +
0.2*(r_on/34 - 1) + 0.2*(num_mem_ca/16 - 1));

t_jitter_setup_sen = t_jitter_setup * (1 + 0.1*(r_on/34 - 1) +
0.3*(g_ip->num_mem_dq/2 - 1));
0.3*(int)(g_ip->num_mem_dq/2 - 1));
t_jitter_hold_sen = t_jitter_hold * (1 + 0.1*(r_on/34 - 1) +
0.3*(g_ip->num_mem_dq/2 - 1));
0.3*(int)(g_ip->num_mem_dq/2 - 1));
t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.2*(rtt_ca/100 - 1) +
0.1*(r_on/34 - 1) + 0.4*(num_mem_ca/16 - 1));
t_jitter_addr_hold_sen = t_jitter_addr_hold * (1 + 0.2*(rtt_ca/100 - 1) +
Expand Down Expand Up @@ -483,17 +483,17 @@ IOTechParam::IOTechParam(InputParameter * g_ip)
* of experiments method shown in the technical report (), in Chapter 2.2. */

k_noise_write_sen = k_noise_write * (1 + 0.2*(r_on/50 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));
k_noise_read_sen = k_noise_read * (1 + 0.2*(r_on/50 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));
k_noise_addr_sen = k_noise_addr * (1 + 0.2*(r_on/50 - 1) +
0.2*(num_mem_ca/16 - 1));


t_jitter_setup_sen = t_jitter_setup * (1 + 0.1*(r_on/50 - 1) +
0.3*(g_ip->num_mem_dq/2 - 1));
0.3*(int)(g_ip->num_mem_dq/2 - 1));
t_jitter_hold_sen = t_jitter_hold * (1 + 0.1*(r_on/50 - 1) +
0.3*(g_ip->num_mem_dq/2 - 1));
0.3*(int)(g_ip->num_mem_dq/2 - 1));
t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.1*(r_on/50 - 1) +
0.4*(num_mem_ca/16 - 1));
t_jitter_addr_hold_sen = t_jitter_addr_hold * (1 + 0.1*(r_on/50 - 1) +
Expand Down Expand Up @@ -614,23 +614,23 @@ IOTechParam::IOTechParam(InputParameter * g_ip)

k_noise_write_sen = k_noise_write * (1 + 0.1*(rtt1_dq_write/60 - 1) +
0.2*(rtt2_dq_write/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));

k_noise_read_sen = k_noise_read * (1 + 0.1*(rtt1_dq_read/60 - 1) +
0.2*(rtt2_dq_read/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));

k_noise_addr_sen = k_noise_addr * (1 + 0.1*(rtt_ca/50 - 1) +
0.2*(r_on/34 - 1) + 0.2*(num_mem_ca/16 - 1));


t_jitter_setup_sen = t_jitter_setup * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) + 0.1*(r_on/34 - 1) +
0.3*(g_ip->num_mem_dq/2 - 1));
0.3*(int)(g_ip->num_mem_dq/2 - 1));

t_jitter_hold_sen = t_jitter_hold * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) +
0.1*(r_on/34 - 1) + 0.3*(g_ip->num_mem_dq/2 - 1));
0.1*(r_on/34 - 1) + 0.3*(int)(g_ip->num_mem_dq/2 - 1));

t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.2*(rtt_ca/50 - 1) +
0.1*(r_on/34 - 1) + 0.4*(num_mem_ca/16 - 1));
Expand Down Expand Up @@ -752,23 +752,23 @@ IOTechParam::IOTechParam(InputParameter * g_ip)

k_noise_write_sen = k_noise_write * (1 + 0.1*(rtt1_dq_write/60 - 1) +
0.2*(rtt2_dq_write/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));

k_noise_read_sen = k_noise_read * (1 + 0.1*(rtt1_dq_read/60 - 1) +
0.2*(rtt2_dq_read/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(g_ip->num_mem_dq/2 - 1));
0.2*(int)(g_ip->num_mem_dq/2 - 1));

k_noise_addr_sen = k_noise_addr * (1 + 0.1*(rtt_ca/50 - 1) +
0.2*(r_on/34 - 1) + 0.2*(num_mem_ca/16 - 1));


t_jitter_setup_sen = t_jitter_setup * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) + 0.1*(r_on/34 - 1) +
0.3*(g_ip->num_mem_dq/2 - 1));
0.3*(int)(g_ip->num_mem_dq/2 - 1));

t_jitter_hold_sen = t_jitter_hold * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) +
0.1*(r_on/34 - 1) + 0.3*(g_ip->num_mem_dq/2 - 1));
0.1*(r_on/34 - 1) + 0.3*(int)(g_ip->num_mem_dq/2 - 1));

t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.2*(rtt_ca/50 - 1) +
0.1*(r_on/34 - 1) + 0.4*(num_mem_ca/16 - 1));
Expand Down Expand Up @@ -829,6 +829,8 @@ IOTechParam::IOTechParam(InputParameter * g_ip)
t_soc_hold = 10;
t_jitter_setup = 20;
t_jitter_hold = 20;
t_jitter_addr_setup = 40; //SET THIS VAR TO A DEFAULT NUMBER TO AVOID UNDEFINED BEHAVIOUR. THIS NUMBER IS PROBABLY INCORRECT.
t_jitter_addr_hold = 40; //SET THIS VAR TO A DEFAULT NUMBER TO AVOID UNDEFINED BEHAVIOUR. THIS NUMBER IS PROBABLY INCORRECT.

//External IO Configuration Parameters

Expand Down Expand Up @@ -874,7 +876,7 @@ IOTechParam::IOTechParam(InputParameter * g_ip)


}
else
else
{
cout << "Not Yet supported" << endl;
exit(1);
Expand Down Expand Up @@ -914,8 +916,8 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me
, int num_dq, int connection, int num_loads, double freq)
{
num_mem_ca = num_mem_dq * (mem_data_width);
num_mem_clk = num_mem_dq *
(num_dq/mem_data_width)/(g_ip->num_clk/2);
num_mem_clk = (int)(num_mem_dq *
(num_dq/mem_data_width)/(g_ip->num_clk/2));

io_type = io_type1;
frequency = freq;
Expand Down Expand Up @@ -1004,16 +1006,16 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me
* of experiments method shown in the technical report (), in Chapter 2.2. */

k_noise_write_sen = k_noise_write * (1 + 0.2*(r_on/34 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));
k_noise_read_sen = k_noise_read * (1 + 0.2*(r_on/34 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));
k_noise_addr_sen = k_noise_addr * (1 + 0.1*(rtt_ca/100 - 1) +
0.2*(r_on/34 - 1) + 0.2*(num_mem_ca/16 - 1));

t_jitter_setup_sen = t_jitter_setup * (1 + 0.1*(r_on/34 - 1) +
0.3*(num_mem_dq/2 - 1));
0.3*(int)(num_mem_dq/2 - 1));
t_jitter_hold_sen = t_jitter_hold * (1 + 0.1*(r_on/34 - 1) +
0.3*(num_mem_dq/2 - 1));
0.3*(int)(num_mem_dq/2 - 1));
t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.2*(rtt_ca/100 - 1) +
0.1*(r_on/34 - 1) + 0.4*(num_mem_ca/16 - 1));
t_jitter_addr_hold_sen = t_jitter_addr_hold * (1 + 0.2*(rtt_ca/100 - 1) +
Expand Down Expand Up @@ -1054,7 +1056,7 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me


}
else if (io_type == WideIO) { //WIDEIO
else if (io_type == WideIO) { //WIDEIO
//Technology Parameters
vdd_io = 1.2;
v_sw_clk = 1.2;
Expand Down Expand Up @@ -1133,17 +1135,17 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me
* of experiments method shown in the technical report (), in Chapter 2.2. */

k_noise_write_sen = k_noise_write * (1 + 0.2*(r_on/50 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));
k_noise_read_sen = k_noise_read * (1 + 0.2*(r_on/50 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));
k_noise_addr_sen = k_noise_addr * (1 + 0.2*(r_on/50 - 1) +
0.2*(num_mem_ca/16 - 1));


t_jitter_setup_sen = t_jitter_setup * (1 + 0.1*(r_on/50 - 1) +
0.3*(num_mem_dq/2 - 1));
0.3*(int)(num_mem_dq/2 - 1));
t_jitter_hold_sen = t_jitter_hold * (1 + 0.1*(r_on/50 - 1) +
0.3*(num_mem_dq/2 - 1));
0.3*(int)(num_mem_dq/2 - 1));
t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.1*(r_on/50 - 1) +
0.4*(num_mem_ca/16 - 1));
t_jitter_addr_hold_sen = t_jitter_addr_hold * (1 + 0.1*(r_on/50 - 1) +
Expand Down Expand Up @@ -1292,23 +1294,23 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me

k_noise_write_sen = k_noise_write * (1 + 0.1*(rtt1_dq_write/60 - 1) +
0.2*(rtt2_dq_write/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));

k_noise_read_sen = k_noise_read * (1 + 0.1*(rtt1_dq_read/60 - 1) +
0.2*(rtt2_dq_read/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));

k_noise_addr_sen = k_noise_addr * (1 + 0.1*(rtt_ca/50 - 1) +
0.2*(r_on/34 - 1) + 0.2*(num_mem_ca/16 - 1));


t_jitter_setup_sen = t_jitter_setup * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) + 0.1*(r_on/34 - 1) +
0.3*(num_mem_dq/2 - 1));
0.3*(int)(num_mem_dq/2 - 1));

t_jitter_hold_sen = t_jitter_hold * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) +
0.1*(r_on/34 - 1) + 0.3*(num_mem_dq/2 - 1));
0.1*(r_on/34 - 1) + 0.3*(int)(num_mem_dq/2 - 1));

t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.2*(rtt_ca/50 - 1) +
0.1*(r_on/34 - 1) + 0.4*(num_mem_ca/16 - 1));
Expand Down Expand Up @@ -1347,7 +1349,7 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me


}
else if (io_type == DDR4)
else if (io_type == DDR4)
{ //Default parameters for DDR4
// IO Supply voltage (V)
vdd_io = 1.2;
Expand Down Expand Up @@ -1457,23 +1459,23 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me

k_noise_write_sen = k_noise_write * (1 + 0.1*(rtt1_dq_write/60 - 1) +
0.2*(rtt2_dq_write/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));

k_noise_read_sen = k_noise_read * (1 + 0.1*(rtt1_dq_read/60 - 1) +
0.2*(rtt2_dq_read/60 - 1) + 0.2*(r_on/34 - 1) +
0.2*(num_mem_dq/2 - 1));
0.2*(int)(num_mem_dq/2 - 1));

k_noise_addr_sen = k_noise_addr * (1 + 0.1*(rtt_ca/50 - 1) +
0.2*(r_on/34 - 1) + 0.2*(num_mem_ca/16 - 1));


t_jitter_setup_sen = t_jitter_setup * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) + 0.1*(r_on/34 - 1) +
0.3*(num_mem_dq/2 - 1));
0.3*(int)(num_mem_dq/2 - 1));

t_jitter_hold_sen = t_jitter_hold * (1 + 0.2*(rtt1_dq_write/60 - 1) +
0.3*(rtt2_dq_write/60 - 1) +
0.1*(r_on/34 - 1) + 0.3*(num_mem_dq/2 - 1));
0.1*(r_on/34 - 1) + 0.3*(int)(num_mem_dq/2 - 1));

t_jitter_addr_setup_sen = t_jitter_addr_setup * (1 + 0.2*(rtt_ca/50 - 1) +
0.1*(r_on/34 - 1) + 0.4*(num_mem_ca/16 - 1));
Expand Down Expand Up @@ -1534,6 +1536,10 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me
t_soc_hold = 10;
t_jitter_setup = 20;
t_jitter_hold = 20;
t_jitter_addr_setup = 40; //SET THIS VAR TO A DEFAULT NUMBER TO AVOID UNDEFINED BEHAVIOUR. THIS NUMBER IS PROBABLY INCORRECT.
t_jitter_addr_hold = 40; //SET THIS VAR TO A DEFAULT NUMBER TO AVOID UNDEFINED BEHAVIOUR. THIS NUMBER IS PROBABLY INCORRECT.



//External IO Configuration Parameters

Expand Down Expand Up @@ -1579,7 +1585,7 @@ IOTechParam::IOTechParam(InputParameter * g_ip, Mem_IO_type io_type1, int num_me


}
else
else
{
cout << "Not Yet supported" << endl;
exit(1);
Expand Down
8 changes: 4 additions & 4 deletions io.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2733,7 +2733,7 @@ void output_UCA(uca_org_t *fr)
if(g_ip->is_3d_mem)
{

cout<<"------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"."VER_COMMENT_CACTI
cout<<"------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"." VER_COMMENT_CACTI
<< " of " << VER_UPDATE_CACTI << ") 3D DRAM Main Memory -------"<<endl;

cout << "\nMemory Parameters:\n";
Expand Down Expand Up @@ -2810,17 +2810,17 @@ void output_UCA(uca_org_t *fr)
}
else {
if (g_ip->data_arr_ram_cell_tech_type == 3) {
cout << "\n---------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"."VER_COMMENT_CACTI
cout << "\n---------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"." VER_COMMENT_CACTI
<< " of " << VER_UPDATE_CACTI << "), Uniform Cache Access " <<
"Logic Process Based DRAM Model ----------\n";
}
else if (g_ip->data_arr_ram_cell_tech_type == 4) {
cout << "\n---------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"."VER_COMMENT_CACTI
cout << "\n---------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"." VER_COMMENT_CACTI
<< " of " << VER_UPDATE_CACTI << "), Uniform" <<
"Cache Access Commodity DRAM Model ----------\n";
}
else {
cout << "\n---------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"."VER_COMMENT_CACTI
cout << "\n---------- CACTI (version "<< VER_MAJOR_CACTI <<"."<< VER_MINOR_CACTI<<"." VER_COMMENT_CACTI
<< " of " << VER_UPDATE_CACTI << "), Uniform Cache Access "
"SRAM Model ----------\n";
}
Expand Down
Loading