Dennis
/
srdl2sv
mirror of https://github.com/Silicon1602/srdl2sv.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Closes #10: sw read/write side-effects now honor byte-enables if enabled

This commit is contained in:
Dennis Potter 2021-10-31 22:36:51 -07:00
parent 22a822c097
commit 8df25ece01
Signed by: Dennis
GPG Key ID: 186A8AD440942BAF
2 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
srdl2sv/components/field.py
View File

@ -139,22 +139,9 @@ class Field(Component):
) )
# Check if an onwrite property is set # Check if an onwrite property is set
onwrite = obj.get_property('onwrite') if onwrite := obj.get_property('onwrite'):
if onwrite is OnWriteType.wuser:
if onwrite: self.logger.error("The OnWriteType.wuser is not yet supported!")
if onwrite == OnWriteType.wuser:
self.logger.warning("The OnWriteType.wuser is not yet supported!")
elif onwrite in (OnWriteType.wclr, OnWriteType.wset):
access_rtl['sw_write'][0].append(
self._process_yaml(
Field.templ_dict[str(onwrite)],
{'path': path_underscored,
'genvars': self.genvars_str,
'width': obj.width,
'path_wo_field': path_wo_field,
'field_type': self.field_type}
)
)
else: else:
# If field spans multiple bytes, every byte shall have a seperate enable! # If field spans multiple bytes, every byte shall have a seperate enable!
for i in range(self.lsbyte, self.msbyte+1): for i in range(self.lsbyte, self.msbyte+1):
@ -167,7 +154,7 @@ class Field(Component):
{'path': path_underscored, {'path': path_underscored,
'genvars': self.genvars_str, 'genvars': self.genvars_str,
'i': i, 'i': i,
'width': obj.width, 'width': msb_bus - lsb_bus + 1,
'msb_bus': str(msb_bus), 'msb_bus': str(msb_bus),
'lsb_bus': str(lsb_bus), 'lsb_bus': str(lsb_bus),
'msb_field': str(msb_bus-obj.inst.lsb), 'msb_field': str(msb_bus-obj.inst.lsb),
@ -216,14 +203,30 @@ class Field(Component):
access_rtl['sw_read'][0].append( access_rtl['sw_read'][0].append(
self._process_yaml( self._process_yaml(
Field.templ_dict[str(onread)], Field.templ_dict['sw_read_access_field'],
{'width': obj.width, {'path_wo_field': path_wo_field,
'path': path_underscored,
'genvars': self.genvars_str, 'genvars': self.genvars_str,
'path_wo_field': path_wo_field} 'field_type': self.field_type}
)
)
# If field spans multiple bytes, every byte shall have a seperate enable!
for i in range(self.lsbyte, self.msbyte+1):
access_rtl['sw_read'][0].append(
self._process_yaml(
Field.templ_dict[str(onread)],
{'path': path_underscored,
'genvars': self.genvars_str,
'i': i,
'width': msb_bus - lsb_bus + 1,
'msb_field': str(msb_bus-obj.inst.lsb),
'lsb_field': str(lsb_bus-obj.inst.lsb),
}
) )
) )
access_rtl['sw_read'][0].append("end")
# Add singlepulse property # Add singlepulse property
# Property cannot be overwritten by alias # Property cannot be overwritten by alias
if obj.get_property('singlepulse'): if obj.get_property('singlepulse'):

51
srdl2sv/components/templates/fields.yaml
View File

@ -133,52 +133,61 @@ end_field_ff:
OnWriteType.woset: OnWriteType.woset:
rtl: |- rtl: |-
if (widget_if.byte_en[{i}]) // woset property if (widget_if.byte_en[{i}]) // woset property
begin <<INDENT>>
{path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] | widget_if.w_data[{msb_bus}:{lsb_bus}]; {path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] | widget_if.w_data[{msb_bus}:{lsb_bus}];
end <<UNINDENT>>
OnWriteType.woclr: OnWriteType.woclr:
rtl: |- rtl: |-
if (widget_if.byte_en[{i}]) // woclr property if (widget_if.byte_en[{i}]) // woclr property
begin <<INDENT>>
{path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] & ~widget_if.w_data[{msb_bus}:{lsb_bus}]; {path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] & ~widget_if.w_data[{msb_bus}:{lsb_bus}];
end <<UNINDENT>>
OnWriteType.wot: OnWriteType.wot:
rtl: |- rtl: |-
if (widget_if.byte_en[{i}]) // wot property if (widget_if.byte_en[{i}]) // wot property
begin <<INDENT>>
{path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] ^ widget_if.w_data[{msb_bus}:{lsb_bus}]; {path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] ^ widget_if.w_data[{msb_bus}:{lsb_bus}];
end <<UNINDENT>>
OnWriteType.wzs: OnWriteType.wzs:
rtl: |- rtl: |-
if (widget_if.byte_en[{i}]) // wzs property if (widget_if.byte_en[{i}]) // wzs property
begin <<INDENT>>
{path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] & widget_if.w_data[{msb_bus}:{lsb_bus}]; {path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] & widget_if.w_data[{msb_bus}:{lsb_bus}];
end <<UNINDENT>>
OnWriteType.wzt: OnWriteType.wzt:
rtl: |- rtl: |-
if (widget_if.byte_en[{i}]) // wzt property if (widget_if.byte_en[{i}]) // wzt property
begin <<INDENT>>
{path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] ~^ widget_if.w_data[{msb_bus}:{lsb_bus}]; {path}_q{genvars}[{msb_field}:{lsb_field}] <= {path}_q{genvars}[{msb_field}:{lsb_field}] ~^ widget_if.w_data[{msb_bus}:{lsb_bus}];
end <<UNINDENT>>
OnWriteType.wclr: OnWriteType.wclr:
rtl: |- rtl: |-
{path}_q{genvars} <= {{{width}{{1'b0}}}}; if (widget_if.byte_en[{i}]) // wclr property
<<INDENT>>
{path}_q{genvars}[{msb_field}:{lsb_field}] <= {width}'b0;
<<UNINDENT>>
OnWriteType.wset: OnWriteType.wset:
rtl: |- rtl: |-
{path}_q{genvars} <= {{{width}{{1'b1}}}}; if (widget_if.byte_en[{i}]) // wclr property
<<INDENT>>
{path}_q{genvars}[{msb_field}:{lsb_field}] <= {{{width}{{1'b1}}}};
<<UNINDENT>>
sw_read_access_field:
rtl: |-
if ({path_wo_field}_sw_rd{genvars})
begin
OnReadType.rclr: OnReadType.rclr:
rtl: |- rtl: |-
if ({path_wo_field}_sw_rd{genvars}) // rclr property if (widget_if.byte_en[{i}]) // rclr property
begin <<INDENT>>
{path}_q{genvars} <= {{{width}{{1'b0}}}}; {path}_q{genvars}[{msb_field}:{lsb_field}] <= {width}'b0;
end <<UNINDENT>>
OnReadType.rset: OnReadType.rset:
rtl: |- rtl: |-
if ({path_wo_field}_sw_rd{genvars}) // rset property if (widget_if.byte_en[{i}]) // rset property
begin <<INDENT>>
{path}_q{genvars} <= {{{width}{{1'b1}}}}; {path}_q{genvars}[{msb_field}:{lsb_field}] <= {{{width}{{1'b1}}}};
end <<UNINDENT>>
field_comment: field_comment:
rtl: |- rtl: |-