Remove the old performance monitoring code.

7 files changed, 0 insertions, 427 deletions

diff --git a/elaborate.cxx b/elaborate.cxx
index 3a0e6dd9..f656ff92 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -1548,7 +1548,6 @@ systemtap_session::systemtap_session ():
   mark_derived_probes(0),
   tracepoint_derived_probes(0),
   hrtimer_derived_probes(0),
-  perfmon_derived_probes(0),
   procfs_derived_probes(0),
   op (0), up (0),
   sym_kprobes_text_start (0),
diff --git a/main.cxx b/main.cxx
index c3769bae..6c5b9e8c 100644
--- a/main.cxx
+++ b/main.cxx
@@ -554,7 +554,6 @@ main (int argc, char * const argv [])
   s.keep_tmpdir = false;
   s.cmd = "";
   s.target_pid = 0;
-  s.perfmon=0;
   s.symtab = false;
   s.use_cache = true;
   s.use_script_cache = true;
diff --git a/session.h b/session.h
index 1df94680..eb1d82c0 100644
--- a/session.h
+++ b/session.h
@@ -42,7 +42,6 @@ struct profile_derived_probe_group;
 struct mark_derived_probe_group;
 struct tracepoint_derived_probe_group;
 struct hrtimer_derived_probe_group;
-struct perfmon_derived_probe_group;
 struct procfs_derived_probe_group;
 struct embeddedcode;
 struct translator_output;
@@ -113,7 +112,6 @@ struct systemtap_session
   bool suppress_warnings;
   bool panic_warnings;
   int buffer_size;
-  unsigned perfmon;
   bool symtab; /* true: emit symbol table at translation time; false: let staprun do it. */
   bool prologue_searching;
   bool tapset_compile_coverage;
@@ -192,7 +190,6 @@ struct systemtap_session
   mark_derived_probe_group* mark_derived_probes;
   tracepoint_derived_probe_group* tracepoint_derived_probes;
   hrtimer_derived_probe_group* hrtimer_derived_probes;
-  perfmon_derived_probe_group* perfmon_derived_probes;
   procfs_derived_probe_group* procfs_derived_probes;
 
   // NB: It is very important for all of the above (and below) fields
diff --git a/tapset-perfmon.cxx b/tapset-perfmon.cxx
index 0c1fec53..e97ec5e6 100644
--- a/tapset-perfmon.cxx
+++ b/tapset-perfmon.cxx
@@ -14,12 +14,6 @@
 
 #include <string>
 
-#ifdef PERFMON
-#include <perfmon/pfmlib.h>
-#include <perfmon/perfmon.h>
-#endif
-
-
 using namespace std;
 using namespace __gnu_cxx;
 
@@ -31,414 +25,4 @@ using namespace __gnu_cxx;
 // This is a new interface to the perfmon hw.
 //
 
-
-struct perfmon_var_expanding_visitor: public var_expanding_visitor
-{
-  systemtap_session & sess;
-  unsigned counter_number;
-  perfmon_var_expanding_visitor(systemtap_session & s, unsigned c):
-    sess(s), counter_number(c) {}
-  void visit_target_symbol (target_symbol* e);
-};
-
-
-void
-perfmon_var_expanding_visitor::visit_target_symbol (target_symbol *e)
-{
-  assert(e->base_name.size() > 0 && e->base_name[0] == '$');
-
-  // Synthesize a function.
-  functiondecl *fdecl = new functiondecl;
-  fdecl->synthetic = true;
-  fdecl->tok = e->tok;
-  embeddedcode *ec = new embeddedcode;
-  ec->tok = e->tok;
-  bool lvalue = is_active_lvalue(e);
-
-  if (lvalue )
-    throw semantic_error("writes to $counter not permitted");
-
-  string fname = string("_perfmon_tvar_get")
-                  + "_" + e->base_name.substr(1)
-                  + "_" + lex_cast(counter_number);
-
-  if (e->base_name != "$counter")
-    throw semantic_error ("target variables not available to perfmon probes");
-
-  if (e->addressof)
-    throw semantic_error("cannot take address of perfmon variable", e->tok);
-
-  e->assert_no_components("perfmon");
-
-  ec->code = "THIS->__retvalue = _pfm_pmd_x[" +
-          lex_cast(counter_number) + "].reg_num;";
-  ec->code += "/* pure */";
-  fdecl->name = fname;
-  fdecl->body = ec;
-  fdecl->type = pe_long;
-  sess.functions[fdecl->name]=fdecl;
-
-  // Synthesize a functioncall.
-  functioncall* n = new functioncall;
-  n->tok = e->tok;
-  n->function = fname;
-  n->referent = 0;  // NB: must not resolve yet, to ensure inclusion in session
-
-  provide (n);
-}
-
-
-enum perfmon_mode
-{
-  perfmon_count,
-  perfmon_sample
-};
-
-
-struct perfmon_derived_probe: public derived_probe
-{
-  systemtap_session & sess;
-  string event;
-  perfmon_mode mode;
-
-  perfmon_derived_probe (probe* p, probe_point* l, systemtap_session &s,
-                         string e, perfmon_mode m);
-  virtual void join_group (systemtap_session& s);
-};
-
-
-struct perfmon_derived_probe_group: public generic_dpg<perfmon_derived_probe>
-{
-public:
-  void emit_module_decls (systemtap_session&) {}
-  void emit_module_init (systemtap_session&) {}
-  void emit_module_exit (systemtap_session&) {}
-};
-
-
-struct perfmon_builder: public derived_probe_builder
-{
-  perfmon_builder() {}
-  virtual void build(systemtap_session & sess,
-                     probe * base,
-                     probe_point * location,
-                     literal_map_t const & parameters,
-                     vector<derived_probe *> & finished_results)
-  {
-    string event;
-    if (!get_param (parameters, "counter", event))
-      throw semantic_error("perfmon requires an event");
-
-    sess.perfmon++;
-
-    // XXX: need to revise when doing sampling
-    finished_results.push_back(new perfmon_derived_probe(base, location,
-                                                         sess, event,
-                                                         perfmon_count));
-  }
-};
-
-
-perfmon_derived_probe::perfmon_derived_probe (probe* p, probe_point* l,
-                                              systemtap_session &s,
-                                              string e, perfmon_mode m)
-        : derived_probe (p, l), sess(s), event(e), mode(m)
-{
-  static unsigned probes_allocated = 0;
-
-  // Now expand the local variables in the probe body
-  perfmon_var_expanding_visitor v (sess, probes_allocated++);
-  v.replace (this->body);
-
-  if (sess.verbose > 1)
-    clog << "perfmon-based probe" << endl;
-}
-
-
-void
-perfmon_derived_probe::join_group (systemtap_session& s)
-{
-  throw semantic_error ("incomplete", this->tok);
-
-  if (! s.perfmon_derived_probes)
-    s.perfmon_derived_probes = new perfmon_derived_probe_group ();
-  s.perfmon_derived_probes->enroll (this);
-}
-
-
-#if 0
-void
-perfmon_derived_probe::emit_registrations_start (translator_output* o,
-                                                 unsigned index)
-{
-  for (unsigned i=0; i<locations.size(); i++)
-    o->newline() << "enter_" << name << "_" << i << " ();";
-}
-
-
-void
-perfmon_derived_probe::emit_registrations_end (translator_output * o,
-                                               unsigned index)
-{
-}
-
-
-void
-perfmon_derived_probe::emit_deregistrations (translator_output * o)
-{
-}
-
-
-void
-perfmon_derived_probe::emit_probe_entries (translator_output * o)
-{
-  o->newline() << "#ifdef STP_TIMING";
-  // NB: This variable may be multiply (but identically) defined.
-  o->newline() << "static __cacheline_aligned Stat " << "time_" << basest()->name << ";";
-  o->newline() << "#endif";
-
-  for (unsigned i=0; i<locations.size(); i++)
-    {
-      probe_point *l = locations[i];
-      o->newline() << "/* location " << i << ": " << *l << " */";
-      o->newline() << "static void enter_" << name << "_" << i << " (void) {";
-
-      o->indent(1);
-      o->newline() << "const char* probe_point = "
-                   << lex_cast_qstring(*l) << ";";
-
-      o->newline() << "static struct pfarg_ctx _pfm_context;";
-      o->newline() << "static void *_pfm_desc;";
-      o->newline() << "static struct pfarg_pmc *_pfm_pmc_x;";
-      o->newline() << "static int _pfm_num_pmc_x;";
-      o->newline() << "static struct pfarg_pmd *_pfm_pmd_x;";
-      o->newline() << "static int _pfm_num_pmd_x;";
-
-      emit_probe_prologue (o,
-                           (mode == perfmon_count ?
-                            "STAP_SESSION_STARTING" :
-                            "STAP_SESSION_RUNNING"),
-                           "probe_point");
-
-      // NB: locals are initialized by probe function itself
-      o->newline() << name << " (c);";
-
-      emit_probe_epilogue (o);
-
-      o->newline(-1) << "}\n";
-    }
-}
-#endif
-
-
-#if 0
-void no_pfm_event_error (string s)
-{
-  string msg(string("Cannot find event:" + s));
-  throw semantic_error(msg);
-}
-
-
-void no_pfm_mask_error (string s)
-{
-  string msg(string("Cannot find mask:" + s));
-  throw semantic_error(msg);
-}
-
-
-void
-split(const string& s, vector<string>& v, const string & separator)
-{
-  string::size_type last_pos = s.find_first_not_of(separator, 0);
-  string::size_type pos = s.find_first_of(separator, last_pos);
-
-  while (string::npos != pos || string::npos != last_pos) {
-    v.push_back(s.substr(last_pos, pos - last_pos));
-    last_pos = s.find_first_not_of(separator, pos);
-    pos = s.find_first_of(separator, last_pos);
-  }
-}
-
-
-void
-perfmon_derived_probe_group::emit_probes (translator_output* op, unparser* up)
-{
-  for (unsigned i=0; i < probes.size(); i++)
-    {
-      op->newline ();
-      up->emit_probe (probes[i]);
-    }
-}
-
-
-void
-perfmon_derived_probe_group::emit_module_init (translator_output* o)
-{
-  int ret;
-  pfmlib_input_param_t inp;
-  pfmlib_output_param_t outp;
-  pfarg_pmd_t pd[PFMLIB_MAX_PMDS];
-  pfarg_pmc_t pc[PFMLIB_MAX_PMCS];
-  pfarg_ctx_t ctx;
-  pfarg_load_t load_args;
-  pfmlib_options_t pfmlib_options;
-  unsigned int max_counters;
-
-  if ( probes.size() == 0)
-          return;
-  ret = pfm_initialize();
-  if (ret != PFMLIB_SUCCESS)
-    throw semantic_error("Unable to generate performance monitoring events (no libpfm)");
-
-  pfm_get_num_counters(&max_counters);
-
-  memset(&pfmlib_options, 0, sizeof(pfmlib_options));
-  pfmlib_options.pfm_debug   = 0; /* set to 1 for debug */
-  pfmlib_options.pfm_verbose = 0; /* set to 1 for debug */
-  pfm_set_options(&pfmlib_options);
-
-  memset(pd, 0, sizeof(pd));
-  memset(pc, 0, sizeof(pc));
-  memset(&ctx, 0, sizeof(ctx));
-  memset(&load_args, 0, sizeof(load_args));
-
-  /*
-   * prepare parameters to library.
-   */
-  memset(&inp,0, sizeof(inp));
-  memset(&outp,0, sizeof(outp));
-
-  /* figure out the events */
-  for (unsigned i=0; i<probes.size(); ++i)
-    {
-      if (probes[i]->event == "cycles") {
-        if (pfm_get_cycle_event( &inp.pfp_events[i].event) != PFMLIB_SUCCESS)
-          no_pfm_event_error(probes[i]->event);
-      } else if (probes[i]->event == "instructions") {
-        if (pfm_get_inst_retired_event( &inp.pfp_events[i].event) !=
-            PFMLIB_SUCCESS)
-          no_pfm_event_error(probes[i]->event);
-      } else {
-        unsigned int event_id = 0;
-        unsigned int mask_id = 0;
-        vector<string> event_spec;
-        split(probes[i]->event, event_spec, ":");
-        int num =  event_spec.size();
-        int masks = num - 1;
-
-        if (num == 0)
-          throw semantic_error("No events found");
-
-        /* setup event */
-        if (pfm_find_event(event_spec[0].c_str(), &event_id) != PFMLIB_SUCCESS)
-          no_pfm_event_error(event_spec[0]);
-        inp.pfp_events[i].event = event_id;
-
-        /* set up masks */
-        if (masks > PFMLIB_MAX_MASKS_PER_EVENT)
-          throw semantic_error("Too many unit masks specified");
-
-        for (int j=0; j < masks; j++) {
-                if (pfm_find_event_mask(event_id, event_spec[j+1].c_str(),
-                                        &mask_id) != PFMLIB_SUCCESS)
-            no_pfm_mask_error(string(event_spec[j+1]));
-          inp.pfp_events[i].unit_masks[j] = mask_id;
-        }
-        inp.pfp_events[i].num_masks = masks;
-      }
-    }
-
-  /* number of counters in use */
-  inp.pfp_event_count = probes.size();
-
-  // XXX: no elimination of duplicated counters
-  if (inp.pfp_event_count>max_counters)
-          throw semantic_error("Too many performance monitoring events.");
-
-  /* count events both in kernel and user-space */
-  inp.pfp_dfl_plm   = PFM_PLM0 | PFM_PLM3;
-
-  /* XXX: some cases a perfmon register might be used of watch dog
-     this code doesn't handle that case */
-
-  /* figure out the pmcs for the events */
-  if ((ret=pfm_dispatch_events(&inp, NULL, &outp, NULL)) != PFMLIB_SUCCESS)
-          throw semantic_error("Cannot configure events");
-
-  for (unsigned i=0; i < outp.pfp_pmc_count; i++) {
-    pc[i].reg_num   = outp.pfp_pmcs[i].reg_num;
-    pc[i].reg_value = outp.pfp_pmcs[i].reg_value;
-  }
-
-  /*
-   * There could be more pmc settings than pmd.
-   * Figure out the actual pmds to use.
-   */
-  for (unsigned i=0, j=0; i < inp.pfp_event_count; i++) {
-    pd[i].reg_num   = outp.pfp_pmcs[j].reg_pmd_num;
-    for(; j < outp.pfp_pmc_count; j++)
-      if (outp.pfp_pmcs[j].reg_evt_idx != i) break;
-  }
-
-  // Output the be probes create function
-  o->newline() << "static int register_perfmon_probes (void) {";
-  o->newline(1) << "int rc = 0;";
-
-  o->newline() << "/* data for perfmon */";
-  o->newline() << "static int _pfm_num_pmc = " << outp.pfp_pmc_count << ";";
-  o->newline() << "static struct pfarg_pmc _pfm_pmc[" << outp.pfp_pmc_count
-               << "] = {";
-  /* output the needed bits for pmc here */
-  for (unsigned i=0; i < outp.pfp_pmc_count; i++) {
-    o->newline() << "{.reg_num=" << pc[i].reg_num << ", "
-                 << ".reg_value=" << lex_cast_hex(pc[i].reg_value)
-                 << "},";
-  }
-
-  o->newline() << "};";
-  o->newline() << "static int _pfm_num_pmd = " << inp.pfp_event_count << ";";
-  o->newline() << "static struct pfarg_pmd _pfm_pmd[" << inp.pfp_event_count
-               << "] = {";
-  /* output the needed bits for pmd here */
-  for (unsigned i=0; i < inp.pfp_event_count; i++) {
-    o->newline() << "{.reg_num=" << pd[i].reg_num << ", "
-                 << ".reg_value=" << pd[i].reg_value << "},";
-  }
-  o->newline() << "};";
-  o->newline();
-
-  o->newline() << "_pfm_pmc_x=_pfm_pmc;";
-  o->newline() << "_pfm_num_pmc_x=_pfm_num_pmc;";
-  o->newline() << "_pfm_pmd_x=_pfm_pmd;";
-  o->newline() << "_pfm_num_pmd_x=_pfm_num_pmd;";
-
-  // call all the function bodies associated with perfcounters
-  for (unsigned i=0; i < probes.size (); i++)
-    probes[i]->emit_registrations_start (o,i);
-
-  /* generate call to turn on instrumentation */
-  o->newline() << "_pfm_context.ctx_flags |= PFM_FL_SYSTEM_WIDE;";
-  o->newline() << "rc = rc || _stp_perfmon_setup(&_pfm_desc, &_pfm_context,";
-  o->newline(1) << "_pfm_pmc, _pfm_num_pmc,";
-  o->newline() << "_pfm_pmd, _pfm_num_pmd);";
-  o->newline(-1);
-
-  o->newline() << "return rc;";
-  o->newline(-1) << "}\n";
-
-  // Output the be probes destroy function
-  o->newline() << "static void unregister_perfmon_probes (void) {";
-  o->newline(1) << "_stp_perfmon_shutdown(_pfm_desc);";
-  o->newline(-1) << "}\n";
-}
-#endif
-
-
-void
-register_tapset_perfmon(systemtap_session& s)
-{
-  s.pattern_root->bind("perfmon")->bind_str("counter")
-    ->bind(new perfmon_builder());
-}
-
 /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */
diff --git a/tapsets.cxx b/tapsets.cxx
index 9f05cc70..73959768 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -6668,7 +6668,6 @@ register_standard_tapsets(systemtap_session & s)
   register_tapset_been(s);
   register_tapset_itrace(s);
   register_tapset_mark(s);
-  register_tapset_perfmon(s);
   register_tapset_procfs(s);
   register_tapset_timers(s);
   register_tapset_utrace(s);
@@ -6751,7 +6750,6 @@ all_session_groups(systemtap_session& s)
   DOONE(kprobe);
   DOONE(hwbkpt);
   DOONE(hrtimer);
-  DOONE(perfmon);
   DOONE(procfs);
 
   // Another "order is important" item.  We want to make sure we
diff --git a/tapsets.h b/tapsets.h
index 1d5ba942..9d12ee7d 100644
--- a/tapsets.h
+++ b/tapsets.h
@@ -22,7 +22,6 @@ void common_probe_entryfn_epilogue (translator_output* o, bool overload_processi
 void register_tapset_been(systemtap_session& sess);
 void register_tapset_itrace(systemtap_session& sess);
 void register_tapset_mark(systemtap_session& sess);
-void register_tapset_perfmon(systemtap_session& sess);
 void register_tapset_procfs(systemtap_session& sess);
 void register_tapset_timers(systemtap_session& sess);
 void register_tapset_utrace(systemtap_session& sess);
diff --git a/translate.cxx b/translate.cxx
index cb4988ee..c02c84a0 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -5343,9 +5343,6 @@ translate_pass (systemtap_session& s)
       if (s.timing)
 	s.op->newline() << "#define STP_TIMING";
 
-      if (s.perfmon)
-	s.op->newline() << "#define STP_PERFMON";
-
       s.op->newline() << "#include \"runtime.h\"";
       s.op->newline() << "#include \"stack.c\"";
       s.op->newline() << "#include \"stat.c\"";