Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Arteris-IP/SystemC-Compo…
Browse files Browse the repository at this point in the history 
…nents into develop
  • Loading branch information
@eyck
eyck committed Jun 14, 2023
2 parents 51464ed + b5af5c4 commit b52fe0f
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 29 deletions.
3 changes: 2 additions & 1 deletion examples/lwtr4axi/sc_main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ int sc_main(int argc, char* argv[]) {
.coloredOutput(true));
// clang-format off
::lwtr::tx_text_init();
::lwtr::tx_db db("lwtr4axi.txlog");
::lwtr::tx_ftr_init(false);
::lwtr::tx_db db("lwtr4axi");
testbench tb("tb");
scc::hierarchy_dumper d("lwtr4axi.json", scc::hierarchy_dumper::D3JSON);
//scc::hierarchy_dumper d("axi_axi_test.elkt", scc::hierarchy_dumper::ELKT);
Expand Down
49 changes: 25 additions & 24 deletions src/sysc/tlm/scc/lwtr/lwtr4tlm2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,64 +6,65 @@ namespace lwtr {

template<> struct value_converter<tlm::tlm_phase> {
static value to_value(tlm::tlm_phase const& v) {
if(v==tlm::BEGIN_REQ) return "BEGIN_REQ";
if(v==tlm::END_REQ) return "END_REQ";
if(v==tlm::BEGIN_RESP) return "BEGIN_RESP";
if(v==tlm::END_RESP) return "END_RESP";
if(v==tlm::UNINITIALIZED_PHASE) return "tlm::UNINITIALIZED_PHASE";
if(v==tlm::BEGIN_REQ) return "tlm::BEGIN_REQ";
if(v==tlm::END_REQ) return "tlm::END_REQ";
if(v==tlm::BEGIN_RESP) return "tlm::BEGIN_RESP";
if(v==tlm::END_RESP) return "tlm::END_RESP";
return value("ILLEGAL");
}
};
template<> struct value_converter<tlm::tlm_sync_enum> {
static value to_value(tlm::tlm_sync_enum v) {
switch(v){
case tlm::TLM_ACCEPTED:return value("TLM_ACCEPTED");
case tlm::TLM_UPDATED:return value("TLM_ACCEPTED");
case tlm::TLM_COMPLETED:return value("TLM_COMPLETED");
case tlm::TLM_ACCEPTED:return value("tlm::TLM_ACCEPTED");
case tlm::TLM_UPDATED:return value("tlm::TLM_UPDATED");
case tlm::TLM_COMPLETED:return value("tlm::TLM_COMPLETED");
default:return value("ILLEGAL");
}
}
};
template<> struct value_converter<tlm::tlm_command> {
static value to_value(tlm::tlm_command v) {
switch(v){
case tlm::TLM_READ_COMMAND:return value("TLM_READ_COMMAND");
case tlm::TLM_WRITE_COMMAND:return value("TLM_WRITE_COMMAND");
case tlm::TLM_IGNORE_COMMAND:return value("TLM_IGNORE_COMMAND");
case tlm::TLM_READ_COMMAND:return value("tlm::TLM_READ_COMMAND");
case tlm::TLM_WRITE_COMMAND:return value("tlm::TLM_WRITE_COMMAND");
case tlm::TLM_IGNORE_COMMAND:return value("tlm::TLM_IGNORE_COMMAND");
default:return value("ILLEGAL");
}
}
};
template<> struct value_converter<tlm::tlm_response_status> {
static value to_value(tlm::tlm_response_status v) {
switch(v){
case tlm::TLM_OK_RESPONSE:return value("TLM_OK_RESPONSE");
case tlm::TLM_INCOMPLETE_RESPONSE:return value("TLM_INCOMPLETE_RESPONSE");
case tlm::TLM_GENERIC_ERROR_RESPONSE:return value("TLM_GENERIC_ERROR_RESPONSE");
case tlm::TLM_ADDRESS_ERROR_RESPONSE:return value("TLM_ADDRESS_ERROR_RESPONSE");
case tlm::TLM_COMMAND_ERROR_RESPONSE:return value("TLM_COMMAND_ERROR_RESPONSE");
case tlm::TLM_BURST_ERROR_RESPONSE:return value("TLM_BURST_ERROR_RESPONSE");
case tlm::TLM_BYTE_ENABLE_ERROR_RESPONSE:return value("TLM_BYTE_ENABLE_ERROR_RESPONSE");
case tlm::TLM_OK_RESPONSE:return value("tlm::TLM_OK_RESPONSE");
case tlm::TLM_INCOMPLETE_RESPONSE:return value("tlm::TLM_INCOMPLETE_RESPONSE");
case tlm::TLM_GENERIC_ERROR_RESPONSE:return value("tlm::TLM_GENERIC_ERROR_RESPONSE");
case tlm::TLM_ADDRESS_ERROR_RESPONSE:return value("tlm::TLM_ADDRESS_ERROR_RESPONSE");
case tlm::TLM_COMMAND_ERROR_RESPONSE:return value("tlm::TLM_COMMAND_ERROR_RESPONSE");
case tlm::TLM_BURST_ERROR_RESPONSE:return value("tlm::TLM_BURST_ERROR_RESPONSE");
case tlm::TLM_BYTE_ENABLE_ERROR_RESPONSE:return value("tlm::TLM_BYTE_ENABLE_ERROR_RESPONSE");
default:return value("ILLEGAL");
}
}
};
template<> struct value_converter<tlm::tlm_gp_option> {
static value to_value(tlm::tlm_gp_option v) {
switch(v){
case tlm::TLM_MIN_PAYLOAD:return value("TLM_MIN_PAYLOAD");
case tlm::TLM_FULL_PAYLOAD:return value("TLM_FULL_PAYLOAD");
case tlm::TLM_FULL_PAYLOAD_ACCEPTED:return value("TLM_FULL_PAYLOAD_ACCEPTED");
case tlm::TLM_MIN_PAYLOAD:return value("tlm::TLM_MIN_PAYLOAD");
case tlm::TLM_FULL_PAYLOAD:return value("tlm::TLM_FULL_PAYLOAD");
case tlm::TLM_FULL_PAYLOAD_ACCEPTED:return value("tlm::TLM_FULL_PAYLOAD_ACCEPTED");
default:return value("ILLEGAL");
}
}
};
template<> struct value_converter<tlm::tlm_dmi::dmi_access_e> {
static value to_value(tlm::tlm_dmi::dmi_access_e v) {
switch(v){
case tlm::tlm_dmi::DMI_ACCESS_NONE:return value("DMI_ACCESS_NONE");
case tlm::tlm_dmi::DMI_ACCESS_READ:return value("DMI_ACCESS_READ");
case tlm::tlm_dmi::DMI_ACCESS_WRITE:return value("DMI_ACCESS_WRITE");
case tlm::tlm_dmi::DMI_ACCESS_READ_WRITE:return value("DMI_ACCESS_READ_WRITE");
case tlm::tlm_dmi::DMI_ACCESS_NONE:return value("tlm::DMI_ACCESS_NONE");
case tlm::tlm_dmi::DMI_ACCESS_READ:return value("tlm::DMI_ACCESS_READ");
case tlm::tlm_dmi::DMI_ACCESS_WRITE:return value("tlm::DMI_ACCESS_WRITE");
case tlm::tlm_dmi::DMI_ACCESS_READ_WRITE:return value("tlm::DMI_ACCESS_READ_WRITE");
default:return value("ILLEGAL");
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/sysc/tlm/scc/lwtr/tlm2_lwtr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ tlm::tlm_sync_enum tlm2_lwtr<TYPES>::nb_transport_fw(typename TYPES::tlm_payload
/*************************************************************************
* handle recording
*************************************************************************/
h.record_attribute("status", status);
h.record_attribute("tlm_sync", status);
h.record_attribute("delay[return_path]", delay);
h.record_attribute("trans", trans);
if(registered)
Expand Down Expand Up @@ -522,7 +522,7 @@ tlm::tlm_sync_enum tlm2_lwtr<TYPES>::nb_transport_bw(typename TYPES::tlm_payload
/*************************************************************************
* handle recording
*************************************************************************/
h.record_attribute("status", status);
h.record_attribute("tlm_sync", status);
h.record_attribute("delay[return_path]", delay);
h.record_attribute("trans", trans);
if(registered)
Expand Down
2 changes: 1 addition & 1 deletion third_party/axi_chi
Submodule axi_chi updated 5 files
+2 −2 axi/lwtr/ace_lwtr.h
+6 −7 axi/lwtr/axi_ace_lwtr.cpp
+2 −2 axi/lwtr/axi_lwtr.h
+4 −9 axi/scv/ace_recorder.h
+8 −6 chi/lwtr/chi_lwtr.cpp
2 changes: 1 addition & 1 deletion third_party/lwtr4sc
Submodule lwtr4sc updated 1 files
+1 −5 src/lwtr/lwtr_ftr.cpp

0 comments on commit b52fe0f

Please sign in to comment.