Include taint slicer/instrumenter to time profiler.

Author: marek-trtik

src/taint-slicer/instrumentation_props.cpp

@@ -18,6 +18,7 @@
 #include <java_bytecode/expr2java.h>
 #include <util/prefix.h>
 #include <util/msgstream.h>
+#include <util/tmprof.h>
 #include <deque>
 
 bool is_primitive_type(const typet &type)
@@ -74,6 +75,8 @@ static void perform_BFS(
   const std::set<taint_function_idt> &functions,
   std::set<taint_propagation_chainst::node_idt> &reachable)
 {
+  TMPROF_BLOCK();
+
   std::deque<taint_propagation_chainst::node_idt> work;
   for(const auto nid :
       do_fwd_search ? chains.get_sources() :
@@ -112,6 +115,8 @@ taint_instrumentation_propst::taint_instrumentation_propst(
   , use_data_flow_insensitive_version(
       use_data_flow_insensitive_instrumentation)
 {
+  TMPROF_BLOCK();
+
   // First we compute "valid" nodes of the propagation chaint w.r.t. the root
   // function. We find these nodes by 2 BFSs: one from sources and one from
   // sinks. During both searches we have to stay inside the set of passed
@@ -155,6 +160,8 @@ void taint_instrumentation_propst::build_map_from_typenames_to_tokennames(
   const taint_propagation_chainst &chains,
   const taint_programt &program)
 {
+  TMPROF_BLOCK();
+
   for(const auto &loc : get_location_props())
   {
     const goto_programt::instructiont &I=*loc.get_instruction_id();
@@ -223,6 +230,8 @@ void taint_build_instrumentation_props(
   std::vector<taint_instrumentation_propst> &output,
   const bool use_data_flow_insensitive_instrumentation)
 {
+  TMPROF_BLOCK();
+
   // First we collect all functions mentioned in the graph of chains.
   std::set<irep_idt> functions;
   {
@@ -336,6 +345,8 @@ void taint_build_instrumentation_props(
 
 void dump_as_json(const taint_instrumentation_propst &props, json_objectt &out)
 {
+  TMPROF_BLOCK();
+
   out["data_flow_insensitive_instrumentation_applied"]=jsont::json_boolean(
     props.data_flow_insensitive_version_applied());
   {

src/taint-slicer/instrumenter.cpp

@@ -16,6 +16,7 @@
 #include <util/arith_tools.h>
 #include <util/pointer_offset_size.h>
 #include <util/msgstream.h>
+#include <util/tmprof.h>
 #include <util/std_expr.h>
 
 const c_bool_typet &get_shadow_variable_type()
@@ -133,6 +134,8 @@ exprt make_or_update_initialiser(
   const std::set<taint_instrumentert::automaton_variable_idt> &
     names_of_shadow_variables)
 {
+  TMPROF_BLOCK();
+
   if(new_type.id() != ID_struct)
   {
     // Rewrite type regardless, for example to turn (array*)null into
@@ -205,6 +208,8 @@ static void get_access_paths_to_shadow_vars(
   const symbol_tablet &instrumented_symbols_table,
   const std::set<taint_instrumented_variable_idt> &names_of_shadow_variables)
 {
+  TMPROF_BLOCK();
+
   // The only expected type of the dereferenced lhs of MALLOC
   // statement is ID_struct. Arrays are not supported yet.
   PRECONDITION(expr.type().id()==ID_struct);
@@ -245,6 +250,8 @@ static exprt get_super_if_subclassed(
     &inverse_substitutions,
   const symbol_tablet &symbol_table)
 {
+  TMPROF_BLOCK();
+
   namespacet ns(symbol_table);
   const typet &expr_type=ns.follow(expr.type());
 
@@ -327,6 +334,8 @@ static bool is_unary_expression(const exprt &expr)
 exprt taint_instrumentert::drive_access_path_through_super_classes(
   const exprt &access_path) const
 {
+  TMPROF_BLOCK();
+
   const irept fixed_type_irep=
     instrument(access_path.type(), std::bind(
       &substitute_subclassed_types,
@@ -499,6 +508,8 @@ void taint_instrumentert::instrument_instructions_with_shadow_variables(
   goto_programt &program_to_be_instrumented,
   const taint_instrumentation_propst &props) const
 {
+  TMPROF_BLOCK();
+
   goto_programt::instructionst &instructions_to_be_instrumented=
     program_to_be_instrumented.instructions;
   const namespacet ns(get_instrumented_symbol_table());
@@ -773,6 +784,8 @@ taint_instrumentert::taint_instrumentert(
 /// individual elements of props.get_location_props().
 void taint_instrumentert::run()
 {
+  TMPROF_BLOCK();
+
   PRECONDITION(program!=nullptr);
   PRECONDITION(statistics!=nullptr);
 
@@ -924,6 +937,8 @@ void taint_instrumentert::run()
 void taint_instrumentert::instrument_data_types(
   const taint_instrumentation_propst &props)
 {
+  TMPROF_BLOCK();
+
   std::set<irep_idt> new_type_names;
   for(const auto &id_info : props.get_datatypes())
   {
@@ -1066,6 +1081,8 @@ static exprt make_accessor_expression_to_shadow_variable(
   const std::string &shadow_variable_name,
   const symbol_tablet &symbol_table)
 {
+  TMPROF_BLOCK();
+
   namespacet ns(symbol_table);
   const typet &arg_type = ns.follow(argument.type());
   if(arg_type.id() == ID_pointer)
@@ -1108,6 +1125,8 @@ void taint_instrumentert::instrument_location(
   const taint_mutable_instruction_idt rule_instruction_ptr,
   const taint_instrumentation_propst &props)
 {
+  TMPROF_BLOCK();
+
   const taint_instrumentation_propst::location_propst &loc=
     props.get_location_props().at(lid);
 
@@ -1178,6 +1197,8 @@ void taint_instrumentert::instrument_location(
       const irep_idt function_id,
       goto_programt &instrumentation_code)
     {
+      TMPROF_BLOCK();
+
       for(const auto &arg_token : args_and_tokens)
       {
         const exprt acc_path=
@@ -1231,6 +1252,8 @@ void taint_instrumentert::instrument_location_data_flow_insensitive(
   const taint_mutable_instruction_idt instrumention_tail_instruction,
   const taint_instrumentation_propst &props)
 {
+  TMPROF_BLOCK();
+
   const taint_instrumentation_propst::location_propst &loc=
     props.get_location_props().at(lid);
   goto_functionst::goto_functiont &instrumented_function=

src/taint-slicer/irept_instrument.cpp

@@ -12,6 +12,7 @@ Date: May 2017
 \*******************************************************************/
 
 #include <taint-slicer/irept_instrument.h>
+#include <util/tmprof.h>
 
 #include <cassert>
 
@@ -22,6 +23,8 @@ Date: May 2017
 
 irept instrument(const irept irep, const instrumenter_fnt &instrumenter)
 {
+  TMPROF_BLOCK();
+
   bool modified=false;
 
   irept::subt new_sub;
@@ -76,6 +79,8 @@ irept instrument_using_guide(
   const irept irep,
   const guide_instrumenter_fnt &instrumenter)
 {
+  TMPROF_BLOCK();
+
   bool modified=false;
 
   irept::subt new_sub;

src/taint-slicer/propagation_chains.cpp

@@ -14,6 +14,7 @@
 #include <taint-slicer/propagation_chains.h>
 #include <util/file_util.h>
 #include <util/msgstream.h>
+#include <util/tmprof.h>
 #include <unordered_set>
 #include <deque>
 #include <algorithm>
@@ -31,6 +32,8 @@ static void compute_automaton_state_update_data(
   std::vector<argidx_and_tokennamet> &turn_on,
   std::vector<argidx_and_tokennamet> &turn_off)
 {
+  TMPROF_BLOCK();
+
   const bool is_sanitiser=
     tokens_propagation_graph.get_sanitiser_rules().count(rid)!=0UL;
 
@@ -109,6 +112,8 @@ taint_propagation_chainst::taint_propagation_chainst(
   const taint_map_from_rules_to_their_application_sitest &rule_applications,
   taint_statisticst * const statistics)
 {
+  TMPROF_BLOCK();
+
   // First we collect sources and sinks
   for(const auto &rid :
       tokens_propagation_graph.get_forward_rules_from_token(
@@ -201,6 +206,8 @@ taint_propagation_chainst::extend_chain_by_transition(
   const call_grapht &inverted_call_graph,
   const taint_tokens_propagation_grapht &tokens_propagation_graph)
 {
+  TMPROF_BLOCK();
+
   // First we check call-graph reachability from instrumentation location of
   // "nid" to the target instrumentation location (identified by "fid" and
   // "iid"). If no path exists, then we terminate with failure (no transition
@@ -269,6 +276,8 @@ taint_propagation_chainst::extend_chain_by_transition(
 taint_propagation_chainst::node_idt
 taint_propagation_chainst::erase_node(const node_idt nid)
 {
+  TMPROF_BLOCK();
+
   nodes.at(nid)=nodes.back();
   nodes.pop_back();
 
@@ -349,6 +358,8 @@ taint_propagation_chainst::erase_node(const node_idt nid)
 
 void taint_propagation_chainst::erase_dead_branches()
 {
+  TMPROF_BLOCK();
+
   std::set<node_idt> dead_nodes;
   {
     // Use BFS to find all nodes forward-reachable from sources.
@@ -439,6 +450,8 @@ std::ostream &to_dot(
   const taint_propagation_chainst &chains,
   std::ostream &ostr)
 {
+  TMPROF_BLOCK();
+
   ostr << "digraph propagation_chains {\n"
        << "  rankdir=TB;\n"
        << "  node [fontsize=12 shape=box];\n"

src/taint-slicer/search_for_rule_applications.cpp

@@ -7,13 +7,16 @@
 #include <taint-slicer/search_for_rule_applications.h>
 #include <taint-analysis/taint_summary.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
+#include <util/tmprof.h>
 #include <string>
 #include <vector>
 
 void taint_search_for_rule_applications(
   const taint_summaryt::dbt * const summaries,
   taint_map_from_rules_to_their_application_sitest &result)
 {
+  TMPROF_BLOCK();
+
   for(taint_summaryt::dbt::const_reference summary : *summaries)
   {
     for(const auto &iit_props : summary.second->get_transition_props())
@@ -43,6 +46,8 @@ void to_json(
     map_from_functions_to_rule_application_sites,
   json_objectt &result)
 {
+  TMPROF_BLOCK();
+
   for(const auto &rid_map : map_from_functions_to_rule_application_sites)
   {
     json_objectt rid;

src/taint-slicer/slicer.cpp

@@ -12,6 +12,7 @@
 #include <taint-slicer/slicing_tasks_builder.h>
 #include <util/msgstream.h>
 #include <util/file_util.h>
+#include <util/tmprof.h>
 #include <summaries/summary_dump.h>
 #include <algorithm>
 #include <fstream>
@@ -49,6 +50,8 @@ taint_slicert::taint_slicert(
 void taint_slicert::compute_slice(
   const bool use_data_flow_insensitive_instrumentation)
 {
+  TMPROF_BLOCK();
+
   statistics->begin_search_for_rule_applications();
 
   taint_map_from_rules_to_their_application_sitest

src/taint-slicer/slicing_tasks_builder.cpp

@@ -21,6 +21,7 @@
 #include <util/file_util.h>
 #include <util/fresh_symbol.h>
 #include <util/msgstream.h>
+#include <util/tmprof.h>
 #include <summaries/summary_dump.h>
 #include <exception>
 #include <iostream>
@@ -33,6 +34,8 @@ static void remove_calls_to_functions_without_bodies(
   goto_functionst &goto_functions,
   symbol_tablet &symbol_table)
 {
+  TMPROF_BLOCK();
+
   std::set<irep_idt> fns_without_bodies;
   for(auto &fname_prog : goto_functions.function_map)
   {
@@ -100,6 +103,8 @@ static void add_nondet_retval_assignments_after_calls(
   const std::string &callee_name,
   const typet &callee_ret_type)
 {
+  TMPROF_BLOCK();
+
   for(auto it=goto_program.instructions.begin();
       it!=goto_program.instructions.end();
       ++it)
@@ -143,6 +148,8 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
   const bool perform_html_dump,
   const bool string_refinement_enabled)
 {
+  TMPROF_BLOCK();
+
   // The pathname of the output GOTO program binary file of the slicing task.
   const auto pathname=
     (output_dir /
@@ -392,6 +399,8 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
 
 void dump_as_json(const taint_slicing_taskt &task, json_objectt &out)
 {
+  TMPROF_BLOCK();
+
   out["root_function"]=json_stringt(task.get_root_function());
   out["goto_binary_file"]=json_stringt(task.get_goto_binary_file());
   json_arrayt jsinks;