Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

i2f Bug Fix #59

Merged
merged 1 commit into from
Jun 29, 2023
Merged

i2f Bug Fix #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions core/ExecutePipe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "sparta/utils/SpartaAssert.hpp"
#include "sparta/utils/LogUtils.hpp"
#include "ExecutePipe.hpp"
#include "CoreUtils.hpp"

namespace olympia
{
Expand Down Expand Up @@ -139,8 +140,13 @@ namespace olympia
ex_inst->setStatus(Inst::Status::COMPLETED);

// set scoreboard
const auto & dest_bits = ex_inst->getDestRegisterBitMask(reg_file_);
scoreboard_views_[reg_file_]->setReady(dest_bits);
const auto & dests = ex_inst->getDestOpInfoList();
if(dests.size() > 0){
sparta_assert(dests.size() == 1); // we should only have one destination
core_types::RegFile reg_file_complete = olympia::coreutils::determineRegisterFile(dests[0]);
const auto & dest_bits = ex_inst->getDestRegisterBitMask(reg_file_complete);
scoreboard_views_[reg_file_complete]->setReady(dest_bits);
}

// We're not busy anymore
unit_busy_ = false;
Expand Down
2 changes: 2 additions & 0 deletions test/core/rename/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/expected_output ${CMAKE_CURRENT_BI
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/rename_multiple_instructions.json ${CMAKE_CURRENT_BINARY_DIR}/rename_multiple_instructions.json SYMBOLIC)
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/raw_integer.json ${CMAKE_CURRENT_BINARY_DIR}/raw_integer.json SYMBOLIC)
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/raw_lsu.json ${CMAKE_CURRENT_BINARY_DIR}/raw_lsu.json SYMBOLIC)
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/i2f.json ${CMAKE_CURRENT_BINARY_DIR}/i2f.json SYMBOLIC)

# Single add per cycle
sparta_named_test(Rename_test_Run_Small Rename_test small_core.out -c test_cores/test_small_core.yaml --input-file rename_multiple_instructions.json)
Expand All @@ -21,3 +22,4 @@ sparta_named_test(Rename_test_Run_Big Rename_test big_core.out -c test_cores/
sparta_named_test(Rename_test_Run_Big_Small_Rename Rename_test big_core_small_rename.out -c test_cores/test_big_core_small_rename.yaml --input-file rename_multiple_instructions.json)
sparta_named_test(Rename_test_Run_Small_lsu_dependency Rename_test small_core.out -c test_cores/test_small_core_full.yaml --input-file raw_lsu.json)
sparta_named_test(Rename_test_Run_Small_int_dependency Rename_test small_core.out -c test_cores/test_medium_core_full.yaml --input-file raw_integer.json)
sparta_named_test(Rename_test_i2f Rename_test small_core.out -c test_cores/test_medium_core_full.yaml --input-file i2f.json)
20 changes: 17 additions & 3 deletions test/core/rename/Rename_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ class olympia::RenameTester
EXPECT_TRUE(rename.reference_counter_[0][34] == 0);

}
void test_float(olympia::Rename & rename){
// ensure the correct register file is used
EXPECT_TRUE(rename.freelist_[1].size() == 94);
EXPECT_TRUE(rename.freelist_[0].size() == 96);
}
};

class olympia::ExecutePipeTester
Expand Down Expand Up @@ -395,6 +400,15 @@ void runTest(int argc, char **argv)
executepipe_tester.test_dependent_integer_first_instruction(*my_executepipe);
executepipe_tester.test_dependent_integer_second_instruction(*my_executepipe1);
}
else if(input_file == "i2f.json"){
cls.populateSimulation(&sim);
sparta::RootTreeNode* root_node = sim.getRoot();
olympia::Rename* my_rename = root_node->getChild("cpu.core0.rename")->getResourceAs<olympia::Rename*>();

olympia::RenameTester rename_tester;
cls.runSimulator(&sim, 4);
rename_tester.test_float(*my_rename);
}
else if(input_file == "raw_lsu.json"){
cls.populateSimulation(&sim);
sparta::RootTreeNode* root_node = sim.getRoot();
Expand All @@ -417,13 +431,13 @@ void runTest(int argc, char **argv)
olympia::Rename* my_rename = root_node->getChild("rename")->getResourceAs<olympia::Rename*>();
olympia::RenameTester rename_tester;
rename_tester.test_startup_rename_structures(*my_rename);
cls.runSimulator(& rename_sim, 2);
cls.runSimulator(&rename_sim, 2);
rename_tester.test_one_instruction(*my_rename);

cls.runSimulator(& rename_sim, 3);
cls.runSimulator(&rename_sim, 3);
rename_tester.test_multiple_instructions(*my_rename);

cls.runSimulator(& rename_sim);
cls.runSimulator(&rename_sim);
rename_tester.test_clearing_rename_structures(*my_rename);

EXPECT_FILES_EQUAL(datafiles[0], "expected_output/" + datafiles[0] + ".EXPECTED");
Expand Down
13 changes: 13 additions & 0 deletions test/core/rename/i2f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[
{
"mnemonic": "fmv.d.x",
"rs1": 1,
"fd": 17
},
{
"mnemonic": "fadd.d",
"fs1": 10,
"fs2": 17,
"fd": 7
}
]
10 changes: 5 additions & 5 deletions test/core/rename/raw_lsu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"vaddr" : "0xdeadbeef"
},
{
"mnemonic": "lw",
"rs1": 3,
"rs2": 4,
"rd": 5,
"vaddr" : "0xdeadbeef"
"mnemonic": "lw",
"rs1": 3,
"rs2": 4,
"rd": 5,
"vaddr" : "0xdeadbeef"
}
]