From ba94d9fd84efe0396160aac93cecd6e4f157a49e Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Fri, 24 Jan 2025 14:42:48 +0100 Subject: [PATCH] Have a one cycle END_RESP delay in the standard initiator --- src/simulator/simulator/request/RequestIssuer.cpp | 2 +- .../DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb | 2 +- .../DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb | 2 +- .../DDR5/expected/DRAMSys_ddr5-example_ddr5_ch0.tdb | 4 ++-- .../DDR5/expected/DRAMSys_ddr5-example_ddr5_ch1.tdb | 2 +- .../HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb | 2 +- .../HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb | 2 +- .../HBM3/expected/DRAMSys_hbm3-example_hbm3_ch0.tdb | 2 +- .../LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb | 4 ++-- .../LPDDR5/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb | 3 --- .../LPDDR5/expected/DRAMSys_lpddr5-example_example_ch0.tdb | 3 +++ 11 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb create mode 100644 tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr5-example_example_ch0.tdb diff --git a/src/simulator/simulator/request/RequestIssuer.cpp b/src/simulator/simulator/request/RequestIssuer.cpp index e5b825ae..a91f138e 100644 --- a/src/simulator/simulator/request/RequestIssuer.cpp +++ b/src/simulator/simulator/request/RequestIssuer.cpp @@ -131,7 +131,7 @@ void RequestIssuer::peqCallback(tlm::tlm_generic_payload& payload, const tlm::tl else if (phase == tlm::BEGIN_RESP) { tlm::tlm_phase nextPhase = tlm::END_RESP; - sc_core::sc_time delay = sc_core::SC_ZERO_TIME; + sc_core::sc_time delay = clkPeriod; iSocket->nb_transport_fw(payload, nextPhase, delay); payload.release(); diff --git a/tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb b/tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb index 34af54f0..88d7a543 100644 --- a/tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb +++ b/tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a70796cd5737f5196f00f90aea6650166447f710791dfb502908ebc81e50c9b3 +oid sha256:ce0fe36061b63a23c0323a2748f1da657bedda18bbf27e2a34edb0fad4c0fdb8 size 139264 diff --git a/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb b/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb index 00999871..f78440a3 100644 --- a/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb +++ b/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93a341b43bd3cc86b92fdb752a442c5e377e533072976604169ccedf8b3ba27e +oid sha256:df2c6750bfad509dc4746a876ebc090eae5a4006df05b9d8ccb5aeac673830ac size 5050368 diff --git a/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch0.tdb b/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch0.tdb index 672822b6..422b368a 100644 --- a/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch0.tdb +++ b/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch0.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa41c4bc86b3e93ed4b425e3e4ee57eadda073b1fdc1c7937f592fa5807119b5 -size 6094848 +oid sha256:a8b0a34309e16c0e2b5ef35f4c07e1e427c4803bf9eb31789f3b0f9569fd211e +size 6082560 diff --git a/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch1.tdb b/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch1.tdb index 84dc9006..351f93b0 100644 --- a/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch1.tdb +++ b/tests/tests_regression/DDR5/expected/DRAMSys_ddr5-example_ddr5_ch1.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35383e4cf7774769c957730022c6455307b99c9d89e0c7575735f0a61f187f70 +oid sha256:cd92a1a680c0d9e38e199b5730f8f6ccacd6e2371adb5af58e9ea2ab70f4d647 size 86016 diff --git a/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb index 5a1cd5af..cbf342c2 100644 --- a/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb +++ b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b459e5ccff77d82f0322662ddf6d9755c361d4a7d5d859118c1b54cdaac696a +oid sha256:c07d0788e550884138f84803c0baf0c634a61ce225698eaedb39f9e828f62c65 size 675840 diff --git a/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb index 20500403..1bea7de6 100644 --- a/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb +++ b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9df69fa35ff2d16496b88581d9b5e102fcda9f2cd6da4f41343347cdfca23a4b +oid sha256:db5321193521e8eb75654a545ba1155b7c707ee993ab67ae96b2639e278fc9d7 size 684032 diff --git a/tests/tests_regression/HBM3/expected/DRAMSys_hbm3-example_hbm3_ch0.tdb b/tests/tests_regression/HBM3/expected/DRAMSys_hbm3-example_hbm3_ch0.tdb index 9430840f..2b9be0e0 100644 --- a/tests/tests_regression/HBM3/expected/DRAMSys_hbm3-example_hbm3_ch0.tdb +++ b/tests/tests_regression/HBM3/expected/DRAMSys_hbm3-example_hbm3_ch0.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f16b3b2af3376497e605f92f1a24b5e3aeda1426eb418edc3180f4b08f4ca6dc +oid sha256:a024bffa4f7c2653b0dae899cbef84e8e7e6af7d0fe72e6bd14c45fe627c6cd7 size 1376256 diff --git a/tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb b/tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb index 476a5dcd..756b5039 100644 --- a/tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb +++ b/tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ccf95f3c3ef976e392239c189fe0e992a0eaac90783918f29230e03af0fd4b8 -size 2834432 +oid sha256:a4921b32bbb3f0ff22c462d8a6c768fcbeca0b6e05b6c00f79efbccb364acde4 +size 2863104 diff --git a/tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb b/tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb deleted file mode 100644 index b2c11196..00000000 --- a/tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64acfb8c773c65c91a3bcad996419de80cff7780378a663c9ead2e53da0030c2 -size 2826240 diff --git a/tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr5-example_example_ch0.tdb b/tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr5-example_example_ch0.tdb new file mode 100644 index 00000000..41e0c57c --- /dev/null +++ b/tests/tests_regression/LPDDR5/expected/DRAMSys_lpddr5-example_example_ch0.tdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0224d8e5daa7bd509951a7cf61dbac80bb9747a4773d30da64f08b5a31c7de3a +size 3727360