luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge 

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
This commit is contained in:
Matt Liberty 2023-12-12 16:27:37 -08:00
parent 2c568bf4eb
commit 7a184d00dd
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
liberty/TableModel.cc
View File

@ -225,24 +225,24 @@ GateTableModel::findAxisValues(const TableModel *model,
axis_value3 = 0.0; axis_value3 = 0.0;
break; break;
case 1: case 1:
axis_value1 = axisValue(model->readonly_axis1(), in_slew, load_cap, axis_value1 = axisValue(model->axis1(), in_slew, load_cap,
related_out_cap); related_out_cap);
axis_value2 = 0.0; axis_value2 = 0.0;
axis_value3 = 0.0; axis_value3 = 0.0;
break; break;
case 2: case 2:
axis_value1 = axisValue(model->readonly_axis1(), in_slew, load_cap, axis_value1 = axisValue(model->axis1(), in_slew, load_cap,
related_out_cap); related_out_cap);
axis_value2 = axisValue(model->readonly_axis2(), in_slew, load_cap, axis_value2 = axisValue(model->axis2(), in_slew, load_cap,
related_out_cap); related_out_cap);
axis_value3 = 0.0; axis_value3 = 0.0;
break; break;
case 3: case 3:
axis_value1 = axisValue(model->readonly_axis1(), in_slew, load_cap, axis_value1 = axisValue(model->axis1(), in_slew, load_cap,
related_out_cap); related_out_cap);
axis_value2 = axisValue(model->readonly_axis2(), in_slew, load_cap, axis_value2 = axisValue(model->axis2(), in_slew, load_cap,
related_out_cap); related_out_cap);
axis_value3 = axisValue(model->readonly_axis3(), in_slew, load_cap, axis_value3 = axisValue(model->axis3(), in_slew, load_cap,
related_out_cap); related_out_cap);
break; break;
default: default:
@ -633,24 +633,6 @@ TableModel::axis3() const
return table_->axis3(); return table_->axis3();
} }
const TableAxisPtr&
TableModel::readonly_axis1() const
{
return table_->readonly_axis1();
}
const TableAxisPtr&
TableModel::readonly_axis2() const
{
return table_->readonly_axis2();
}
const TableAxisPtr&
TableModel::readonly_axis3() const
{
return table_->readonly_axis3();
}
float float
TableModel::value(size_t axis_index1, TableModel::value(size_t axis_index1,
size_t axis_index2, size_t axis_index2,
@ -1626,9 +1608,9 @@ OutputWaveforms::~OutputWaveforms()
bool bool
OutputWaveforms::checkAxes(TableTemplate *tbl_template) OutputWaveforms::checkAxes(TableTemplate *tbl_template)
{ {
const TableAxisPtr& axis1 = tbl_template->readonly_axis1(); TableAxisPtr axis1 = tbl_template->axis1();
const TableAxisPtr& axis2 = tbl_template->readonly_axis2(); TableAxisPtr axis2 = tbl_template->axis2();
const TableAxisPtr& axis3 = tbl_template->readonly_axis3(); TableAxisPtr axis3 = tbl_template->axis3();
return (axis1 && axis1->variable() == TableAxisVariable::input_net_transition return (axis1 && axis1->variable() == TableAxisVariable::input_net_transition
&& axis2->variable() == TableAxisVariable::time && axis2->variable() == TableAxisVariable::time
&& axis3 == nullptr) && axis3 == nullptr)