From 1f7becc4c643f26f002ebc73a8ba94f57f5fb2b4 Mon Sep 17 00:00:00 2001 From: mc2zk <mc2zk@git.zephyr-software.com> Date: Fri, 5 Jan 2018 20:07:54 +0000 Subject: [PATCH] Adjusting formatting of assurance case evidence Former-commit-id: 2faecb4356884bb7558df4979a0584af59ba14c9 --- libIRDB/test/calc_conflicts.cpp | 1 + libIRDB/test/fix_calls.cpp | 6 +++--- libIRDB/test/ilr.cpp | 2 +- libIRDB/test/split_eh_frame.cpp | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libIRDB/test/calc_conflicts.cpp b/libIRDB/test/calc_conflicts.cpp index b501e0b09..ca7287990 100644 --- a/libIRDB/test/calc_conflicts.cpp +++ b/libIRDB/test/calc_conflicts.cpp @@ -189,6 +189,7 @@ main(int argc, char* argv[]) cout<<"# ATTRIBUTE calc_conflicts::num_addresses="<<std::dec<<num_addresses<<endl; cout<<"# ATTRIBUTE calc_conflicts::num_conflicts="<<std::dec<<num_conflicts<<endl; cout<<"# ATTRIBUTE calc_conflicts::total_conflicts="<<std::dec<<tot_conflicts<<endl; + cout<<"# ATTRIBUTE calc_conflicts::pct_conflicts="<<std::fixed<<((float)num_conflicts/(float)tot_conflicts)*100.00<<"%"<<endl; cout<<"# ATTRIBUTE calc_conflicts::ave_conflicts="<<std::dec<<((double)tot_conflicts/num_addresses)<<endl; cout<<"# ATTRIBUTE calc_conflicts::ave_bytes_conflicted="<<std::dec<<((double)num_conflicts/num_addresses)<<endl; cout <<"# ATTRIBUTE calc_conflicts::total_executable_bytes = "<< std::dec << total_bytes<<endl; diff --git a/libIRDB/test/fix_calls.cpp b/libIRDB/test/fix_calls.cpp index d6d79d5e9..91c40af22 100644 --- a/libIRDB/test/fix_calls.cpp +++ b/libIRDB/test/fix_calls.cpp @@ -852,9 +852,9 @@ void fix_all_calls(FileIR_t* firp, bool print_stats, bool fix_all) cout << "# ATTRIBUTE fix_calls::fixed_calls="<<std::dec<<fixed_calls<<endl; cout << "# ATTRIBUTE fix_calls::no_fix_needed_calls="<<std::dec<<not_fixed_calls<<endl; cout << "# ATTRIBUTE fix_calls::other_instructions="<<std::dec<<not_calls<<endl; - cout << "# ATTRIBUTE fix_calls::fixed_ratio="<<std::fixed<<(((float)fixed_calls)/((float)(not_fixed_calls+fixed_calls+not_calls)))<<endl; - cout << "# ATTRIBUTE fix_calls::remaining_ratio="<<std::fixed<<((float)not_fixed_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))<<endl; - cout << "# ATTRIBUTE fix_calls::other_insts_ratio="<<std::fixed<<((float)not_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))<<endl; + cout << "# ATTRIBUTE fix_calls::fixed_pct="<<std::fixed<<(((float)fixed_calls)/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl; + cout << "# ATTRIBUTE fix_calls::remaining_ratio="<<std::fixed<<((float)not_fixed_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl; + cout << "# ATTRIBUTE fix_calls::other_insts_ratio="<<std::fixed<<((float)not_calls/((float)(not_fixed_calls+fixed_calls+not_calls)))*100.00<<"%"<<endl; cout << "# ATTRIBUTE fix_calls::no_target_insn="<<std::dec<< no_target_insn << endl; cout << "# ATTRIBUTE fix_calls::no_fallthrough_insn="<<std::dec<< no_fallthrough_insn << endl; cout << "# ATTRIBUTE fix_calls::target_not_in_function="<<std::dec<< target_not_in_function << endl; diff --git a/libIRDB/test/ilr.cpp b/libIRDB/test/ilr.cpp index b2bd4c3c9..21273a4e7 100644 --- a/libIRDB/test/ilr.cpp +++ b/libIRDB/test/ilr.cpp @@ -114,7 +114,7 @@ void do_ilr(VariantID_t *pidp, FileIR_t* firp) cout << "# ATTRIBUTE ilr::filename="<<firp->GetFile()->GetURL()<<endl; cout << "# ATTRIBUTE ilr::unmoved_instructions="<<std::dec<<unmoved_instr<<endl; cout << "# ATTRIBUTE ilr::moved_instructions="<<std::dec<<moved_instr<<endl; - cout << "# ATTRIBUTE ilr::moved_ratio="<<std::fixed<<(float)moved_instr/(moved_instr+unmoved_instr)<<endl; + cout << "# ATTRIBUTE ilr::moved_insts_pct="<<std::fixed<<((float)moved_instr/(moved_instr+unmoved_instr))*100.00<<"%"<<endl; cout<<"Writing variant "<<*pidp<<" back to database." << endl; firp->WriteToDB(); diff --git a/libIRDB/test/split_eh_frame.cpp b/libIRDB/test/split_eh_frame.cpp index 759aac86c..3e3eeb8f4 100644 --- a/libIRDB/test/split_eh_frame.cpp +++ b/libIRDB/test/split_eh_frame.cpp @@ -2010,6 +2010,8 @@ void split_eh_frame_impl_t<ptrsize>::build_ir() const cout<<"# ATTRIBUTE split_eh::total_eh_programs_created="<<dec<<firp->GetAllEhPrograms().size()<<endl; cout<<"# ATTRIBUTE split_eh::total_eh_programs_reused="<<dec<<reusedpgms<<endl; cout<<"# ATTRIBUTE split_eh::total_eh_programs="<<dec<<firp->GetAllEhPrograms().size()+reusedpgms<<endl; + cout<<"# ATTRIBUTE split_eh::pct_eh_programs="<<std::fixed<<((float)GetAllEhPrograms().size/(float)firp->GetAllEhPrograms().size()+reusedpgms)*100.00<<"%"<<endl; + cout<<"# ATTRIBUTE split_eh::pct_eh_programs_reused="<<std::fixed<<((float)reusedpgms/(float)firp->GetAllEhPrograms().size()+reusedpgms)*100.00<<"%"<<endl; remove_scoop(eh_frame_scoop); remove_scoop(eh_frame_hdr_scoop); -- GitLab