Merge pull request diffblue#490 from diffblue/extends_stats_by_instrumenter

SEC-517: Extends stats by instrumenter

Author: marek-trtik

src/taint-analysis/taint_statistics.cpp

@@ -559,6 +559,46 @@ void taint_statisticst::on_taint_analysis_apply_sink_rule(
   it->second.on_application_of_sink_rule(rule_id);
 }
 
+void taint_statisticst::begin_search_for_rule_applications()
+{
+  time_point_begin_search_for_rule_applications = get_current_time();
+}
+
+void taint_statisticst::end_search_for_rule_applications()
+{
+  time_point_end_search_for_rule_applications = get_current_time();
+}
+
+void taint_statisticst::begin_propagation_chains()
+{
+  time_point_begin_propagation_chains = get_current_time();
+}
+
+void taint_statisticst::end_propagation_chains()
+{
+  time_point_end_propagation_chains = get_current_time();
+}
+
+void taint_statisticst::begin_instrumentation_props()
+{
+  time_point_begin_instrumentation_props = get_current_time();
+}
+
+void taint_statisticst::end_instrumentation_props()
+{
+  time_point_end_instrumentation_props = get_current_time();
+}
+
+void taint_statisticst::begin_slicing_tasks_build()
+{
+  time_point_begin_slicing_tasks_build = get_current_time();
+}
+
+void taint_statisticst::end_slicing_tasks_build()
+{
+  time_point_end_slicing_tasks_build = get_current_time();
+}
+
 void taint_statisticst::begin_error_traces_recognition()
 {
   time_point_begin_error_traces_recognition = get_current_time();
@@ -653,6 +693,42 @@ taint_statisticst::get_duration_of_loading_taint_database() const
                       time_point_end_load_taint_database);
 }
 
+
+taint_statisticst::durationt
+taint_statisticst::get_duration_of_taint_slicer_and_instrumenter() const
+{
+  return get_duration(time_point_begin_search_for_rule_applications,
+                      time_point_end_slicing_tasks_build);
+}
+
+taint_statisticst::durationt
+taint_statisticst::get_duration_of_search_for_rule_applications() const
+{
+  return get_duration(time_point_begin_search_for_rule_applications,
+                      time_point_end_search_for_rule_applications);
+}
+
+taint_statisticst::durationt
+taint_statisticst::get_duration_of_propagation_chains() const
+{
+  return get_duration(time_point_begin_propagation_chains,
+                      time_point_end_propagation_chains);
+}
+
+taint_statisticst::durationt
+taint_statisticst::get_duration_of_instrumentation_props() const
+{
+  return get_duration(time_point_begin_instrumentation_props,
+                      time_point_end_instrumentation_props);
+}
+
+taint_statisticst::durationt
+taint_statisticst::get_duration_of_slicing_tasks_build() const
+{
+  return get_duration(time_point_begin_slicing_tasks_build,
+                      time_point_end_slicing_tasks_build);
+}
+
 taint_statisticst::durationt
 taint_statisticst::get_duration_of_error_traces_recognition() const
 {

src/taint-analysis/taint_statistics.h

@@ -254,6 +254,15 @@ class taint_statisticst
     const std::size_t rule_id,
     const unsigned int location_number);
 
+  void begin_search_for_rule_applications();
+  void end_search_for_rule_applications();
+  void begin_propagation_chains();
+  void end_propagation_chains();
+  void begin_instrumentation_props();
+  void end_instrumentation_props();
+  void begin_slicing_tasks_build();
+  void end_slicing_tasks_build();
+
   void begin_error_traces_recognition();
   void end_error_traces_recognition();
 
@@ -280,6 +289,11 @@ class taint_statisticst
   durationt get_duration_of_program_info_collecting() const;
   durationt get_duration_of_loading_lvsa_database() const;
   durationt get_duration_of_loading_taint_database() const;
+  durationt get_duration_of_taint_slicer_and_instrumenter() const;
+  durationt get_duration_of_search_for_rule_applications() const;
+  durationt get_duration_of_propagation_chains() const;
+  durationt get_duration_of_instrumentation_props() const;
+  durationt get_duration_of_slicing_tasks_build() const;
   durationt get_duration_of_error_traces_recognition() const;
   durationt get_duration_of_dump_of_taint_html_summaries() const;
   durationt get_duration_of_dump_of_taint_json_summaries() const;
@@ -317,6 +331,15 @@ class taint_statisticst
   time_pointt time_point_begin_load_taint_database;
   time_pointt time_point_end_load_taint_database;
 
+  time_pointt time_point_begin_search_for_rule_applications;
+  time_pointt time_point_end_search_for_rule_applications;
+  time_pointt time_point_begin_propagation_chains;
+  time_pointt time_point_end_propagation_chains;
+  time_pointt time_point_begin_instrumentation_props;
+  time_pointt time_point_end_instrumentation_props;
+  time_pointt time_point_begin_slicing_tasks_build;
+  time_pointt time_point_end_slicing_tasks_build;
+
   time_pointt time_point_begin_error_traces_recognition;
   time_pointt time_point_end_error_traces_recognition;
 

src/taint-analysis/taint_statistics_dump_json.cpp

@@ -54,6 +54,18 @@ static void  taint_dump_phases_table(
   table["TA-summary-save-in-JSON"] =
       json_numbert(msgstream() <<
                    S.get_duration_of_dump_of_taint_json_summaries());
+  table["taint-slicer-instrumenter-search-for-rule-applications"] =
+    json_numbert(msgstream() <<
+      S.get_duration_of_search_for_rule_applications());
+  table["taint-slicer-instrumenter-propagation-chains"] =
+    json_numbert(msgstream() <<
+      S.get_duration_of_propagation_chains());
+  table["taint-slicer-instrumenter-instrumentation-props"] =
+    json_numbert(msgstream() <<
+      S.get_duration_of_instrumentation_props());
+  table["taint-slicer-instrumenter-slicing-tasks-build"] =
+    json_numbert(msgstream() <<
+      S.get_duration_of_slicing_tasks_build());
   table["error-traces-save-in-HTML"] =
       json_numbert(msgstream() <<
                    S.get_duration_of_dump_of_taint_html_traces());

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;