mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 67 Wiki Activity

FPGA: Remove data collection counter

Browse Source
This commit is contained in:
leonarski_f
2023-05-30 20:13:54 +02:00
parent 8c1e55b6f3
commit a3996a81e3
15 changed files with 57 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/FPGAIntegrationTest.cpp
-13
View File
@@ -673,7 +673,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
ap_uint<1> run_data_collection = 0;
ap_uint<1> cancel_data_collection = 0;
ap_uint<1> idle_data_collection;
uint32_t data_collection_counter = 0;
uint32_t save_data_collection_counter;
act_reg.mode = MODE_CONV;
@@ -684,7 +683,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -693,7 +691,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
REQUIRE(idle_data_collection == 1);
REQUIRE(addr1.empty());
REQUIRE(raw1.empty());
save_data_collection_counter = data_collection_counter;
run_data_collection = 1;
@@ -703,7 +700,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -719,7 +715,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -738,7 +733,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -754,7 +748,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -772,7 +765,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -783,7 +775,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
REQUIRE(addr1.size() == 1);
REQUIRE(raw1.size() == 1);
REQUIRE(data_collection_counter == save_data_collection_counter + 1);
// state = INIT
cancel_data_collection = 1;
@@ -793,7 +784,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -811,7 +801,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -829,7 +818,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
run_data_collection,
cancel_data_collection,
idle_data_collection,
data_collection_counter,
act_reg.mode,
act_reg.one_over_energy,
act_reg.nframes,
@@ -851,7 +839,6 @@ TEST_CASE("HLS_DataCollectionFSM","[OpenCAPI]") {
addr = addr1.read();
REQUIRE(addr_last_flag(addr));
REQUIRE(data_collection_counter == save_data_collection_counter + 1);
}
TEST_CASE("HLS_C_Simulation_internal_packet_generator_storage_cell_convert_G0", "[FPGA][Full]") {