remove perfctr support

Perfctr is a Linux kernel extension that allows programmatic access
to the performance monitoring counters found in most current CPUs.
However, development of perfctr ceased after 2010, and it cannot be
used with Linux kernels newer than 2.6.32.

Therefore the perfctr support code in the Erlang VM is effectively
dead code, so this patch removes it.

7 files changed, 3 insertions, 451 deletions

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index e4cd566285..a632faf57d 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -349,16 +349,6 @@ endif
 EPCRE_LIB = $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/$(LIB_PREFIX)epcre$(LIB_SUFFIX)
 DEPLIBS += $(EPCRE_LIB)
 
-PERFCTR_PATH=@PERFCTR_PATH@
-USE_PERFCTR=@USE_PERFCTR@
-ifdef PERFCTR_PATH
-LIBS += $(PERFCTR_PATH)/usr.lib/libperfctr.a
-else
-ifdef USE_PERFCTR
-LIBS += -lperfctr
-endif
-endif
-
 LIBSCTP = @LIBSCTP@
 
 ORG_THR_LIBS=@EMU_THR_LIBS@
@@ -566,9 +556,6 @@ HIPE_ppc64_TAB=hipe/hipe_ppc64.tab $(HIPE_ARCH64_TAB)
 HIPE_arm_TAB=hipe/hipe_arm.tab
 HIPE_ARCH_TAB=$(HIPE_$(ARCH)_TAB)
 BIFS += hipe/hipe_bif0.tab hipe/hipe_bif1.tab hipe/hipe_bif2.tab $(HIPE_ARCH_TAB)
-ifdef USE_PERFCTR
-BIFS += hipe/hipe_perfctr.tab
-endif
 endif
 
 $(TARGET)/erl_bif_table.c \
@@ -664,10 +651,6 @@ COMMON_INCLUDES += -I../include/internal -I../include/internal/$(TARGET)
 
 INCLUDES  =  -I$(TTF_DIR) $(COMMON_INCLUDES)
 
-ifdef PERFCTR_PATH
-INCLUDES += -I$(PERFCTR_PATH)/usr.lib -I$(PERFCTR_PATH)/linux/include
-endif
-
 ifeq ($(TARGET),win32)
 $(OBJDIR)/dll_sys.o: sys/$(ERLANG_OSTYPE)/sys.c
 	$(V_CC) $(CFLAGS) -DERL_RUN_SHARED_LIB=1 $(INCLUDES) -c $< -o $@
@@ -927,9 +910,6 @@ HIPE_OBJS= \
 	$(OBJDIR)/hipe_mode_switch.o \
 	$(OBJDIR)/hipe_native_bif.o \
 	$(OBJDIR)/hipe_stack.o $(HIPE_ARCH_OBJS)
-ifdef USE_PERFCTR
-HIPE_OBJS += $(OBJDIR)/hipe_perfctr.o
-endif
 ifdef HIPE_ENABLED
 EXTRA_BASE_OBJS += $(HIPE_OBJS)
 endif
diff --git a/erts/emulator/beam/benchmark.c b/erts/emulator/beam/benchmark.c
index 8613131176..b16fe6b271 100644
--- a/erts/emulator/beam/benchmark.c
+++ b/erts/emulator/beam/benchmark.c
@@ -37,37 +37,9 @@ unsigned long long major_gc;
 
 #ifdef BM_TIMERS
 
-#if (defined(__i386__) || defined(__x86_64__)) && USE_PERFCTR
-
-#include "libperfctr.h"
-struct vperfctr *system_clock;
-double cpu_khz;
-BM_NEW_TIMER(start);
-
-static double get_hrvtime(void)
-{
-    unsigned long long ticks;
-    double milli_seconds;
-
-    ticks = vperfctr_read_tsc(system_clock);
-    milli_seconds = (double)ticks / cpu_khz;
-    return milli_seconds;
-}
-
-static void stop_hrvtime(void)
-{
-    if(system_clock)
-    {
-	vperfctr_stop(system_clock);
-	vperfctr_close(system_clock);
-	system_clock = NULL;
-    }
-}
-
-#else /* not perfctr, asuming Solaris */
+/* assuming Solaris */
 #include <time.h>
 BM_TIMER_T system_clock;
-#endif
 
 unsigned long local_pause_times[MAX_PAUSE_TIME];
 unsigned long pause_times[MAX_PAUSE_TIME];
@@ -117,40 +89,6 @@ unsigned long long message_sizes[1000];
 void init_benchmarking()
 {
 #ifdef BM_TIMERS
-#if (defined(__i386__) || defined(__x86_64__)) && USE_PERFCTR
-    /* pass `--with-perfctr=/path/to/perfctr' when configuring */
-    struct perfctr_info info;
-    struct vperfctr_control control;
-    int i;
-
-    system_clock = vperfctr_open();
-    if (system_clock != NULL)
-    {
-        if (vperfctr_info(system_clock,&info) >= 0)
-        {
-            cpu_khz = (double)info.cpu_khz;
-            if (info.cpu_features & PERFCTR_FEATURE_RDTSC)
-            {
-                memset(&control,0,sizeof control);
-                control.cpu_control.tsc_on = 1;
-            }
-        }
-        if (vperfctr_control(system_clock,&control) < 0)
-        {
-            vperfctr_close(system_clock);
-            system_clock = NULL;
-        }
-    }
-
-    for (i = 0; i < 1000; i++)
-    {
-        BM_START_TIMER(system);
-        BM_STOP_TIMER(system);
-    }
-
-    timer_time = system_time / 1000;
-    start_time = 0;
-#else
     int i;
     for (i = 0; i < 1000; i++)
     {
@@ -158,7 +96,6 @@ void init_benchmarking()
         BM_STOP_TIMER(system);
     }
     timer_time = system_time / 1000;
-#endif
 
     for (i = 0; i < MAX_PAUSE_TIME; i++) {
         local_pause_times[i] = 0;
diff --git a/erts/emulator/beam/benchmark.h b/erts/emulator/beam/benchmark.h
index 766edaac42..904564a96b 100644
--- a/erts/emulator/beam/benchmark.h
+++ b/erts/emulator/beam/benchmark.h
@@ -37,10 +37,7 @@
 
 /* BM_TIMERS keeps track of the time spent in diferent parts of the
  * system. It only measures accual active time, not time spent in idle
- * mode. These timers requires hardware support.  For Linux, use the
- * package perfctr from user.it.uu.se/~mikpe/linux/perfctr. If this
- * package is not specified when configuring the system
- * (--with-perfctr=PATH), the Solaris hrtime_t will be used.
+ * mode. Currently, the Solaris hrtime_t will be used.
  * To add new timers look below.
  */
 #define BM_TIMERS
@@ -142,38 +139,7 @@ extern unsigned long long major_gc;
  * meassure (send time in shared heap for instance).
  */
 
-#if (defined(__i386__) || defined(__x86_64__)) && USE_PERFCTR
-#include "libperfctr.h"
-
-#define BM_TIMER_T double
-
-extern struct vperfctr *system_clock;
-extern double cpu_khz;
-extern BM_TIMER_T start_time;
-
-#define BM_START_TIMER(t) start_time =                                        \
-                          (BM_TIMER_T)vperfctr_read_tsc(system_clock) /       \
-                          cpu_khz;
-
-#define BM_STOP_TIMER(t) do {                                                 \
-    BM_TIMER_T tmp = ((BM_TIMER_T)vperfctr_read_tsc(system_clock) / cpu_khz); \
-    tmp -= (start_time + timer_time);                                         \
-    t##_time += (tmp > 0 ? tmp : 0);                                          \
-} while(0)
-
-#define BM_TIME_PRINTER(str,time) do {                                 \
-    int min,sec,milli,micro;                                           \
-    BM_TIMER_T tmp = (time) * 1000;                                    \
-    micro = (uint)(tmp - ((int)(tmp / 1000)) * 1000);                  \
-    tmp /= 1000;                                                       \
-    milli = (uint)(tmp - ((int)(tmp / 1000)) * 1000);                  \
-    tmp /= 1000;                                                       \
-    sec = (uint)(tmp - ((int)(tmp / 60)) * 60);                        \
-    min = (uint)tmp / 60;                                              \
-    erts_fprintf(file,str": %d:%02d.%03d %03d\n",min,sec,milli,micro);  \
-} while(0)
-
-#else /* !USE_PERFCTR  (Assuming Solaris) */
+/* (Assuming Solaris) */
 
 #define BM_TIMER_T hrtime_t
 #define BM_START_TIMER(t) system_clock = sys_gethrtime()
@@ -196,7 +162,6 @@ extern BM_TIMER_T start_time;
 } while(0)
 
 extern BM_TIMER_T system_clock;
-#endif /* USE_PERFCTR */
 
 extern BM_TIMER_T timer_time;
 extern BM_TIMER_T system_time;
diff --git a/erts/emulator/hipe/hipe_bif1.c b/erts/emulator/hipe/hipe_bif1.c
index 56767ef04b..ecb34df412 100644
--- a/erts/emulator/hipe/hipe_bif1.c
+++ b/erts/emulator/hipe/hipe_bif1.c
@@ -574,22 +574,6 @@ BIF_RETTYPE hipe_bifs_pause_times_0(BIF_ALIST_0)
 
 /* XXX: these macros have free variables */
 #ifdef BM_TIMERS
-#if USE_PERFCTR
-#define MAKE_TIME(_timer_) {			      \
-    BM_TIMER_T tmp = _timer_##_time;		      \
-    milli = (uint)(tmp - ((int)(tmp / 1000)) * 1000); \
-    tmp /= 1000;				      \
-    sec = (uint)(tmp - ((int)(tmp / 60)) * 60);	      \
-    min = (uint)tmp / 60;			      }
-
-#define MAKE_MICRO_TIME(_timer_) {		      \
-    BM_TIMER_T tmp = _timer_##_time * 1000;	      \
-    micro = (uint)(tmp - ((int)(tmp / 1000)) * 1000); \
-    tmp /= 1000;				      \
-    milli = (uint)(tmp - ((int)(tmp / 1000)) * 1000); \
-    sec = (uint)tmp / 1000;			      }
-
-#else
 #define MAKE_TIME(_timer_) {			      \
     BM_TIMER_T tmp = _timer_##_time / 1000000;	      \
     milli = tmp % 1000;				      \
@@ -604,7 +588,6 @@ BIF_RETTYPE hipe_bifs_pause_times_0(BIF_ALIST_0)
     milli = tmp % 1000;				      \
     sec = tmp / 1000;				      }
 
-#endif
 #else
 #define MAKE_TIME(_timer_)
 #define MAKE_MICRO_TIME(_timer_)
@@ -852,9 +835,6 @@ BIF_RETTYPE hipe_bifs_misc_timer_clear_0(BIF_ALIST_0)
 /*
  * HiPE hrvtime().
  * These implementations are currently available:
- * + On Linux with the perfctr extension we can use the process'
- *   virtualised time-stamp counter. To enable this mode you must
- *   pass `--with-perfctr=/path/to/perfctr' when configuring.
  * + The fallback, which is the same as {X,_} = runtime(statistics).
  */
 
@@ -866,37 +846,6 @@ static double fallback_get_hrvtime(void)
     return (double)ms_user;
 }
 
-#if USE_PERFCTR
-
-#include "hipe_perfctr.h"
-static int hrvtime_started;	/* 0: closed, +1: perfctr, -1: fallback */
-#define hrvtime_is_started()	(hrvtime_started != 0)
-
-static void start_hrvtime(void)
-{
-    if (hipe_perfctr_hrvtime_open() >= 0)
-	hrvtime_started = 1;
-    else
-	hrvtime_started = -1;
-}
-
-static void stop_hrvtime(void)
-{
-    if (hrvtime_started > 0)
-	hipe_perfctr_hrvtime_close();
-    hrvtime_started = 0;
-}
-
-static double get_hrvtime(void)
-{
-    if (hrvtime_started > 0)
-	return hipe_perfctr_hrvtime_get();
-    else
-	return fallback_get_hrvtime();
-}
-
-#else	/* !USE_PERFCTR */
-
 /*
  * Fallback, if nothing better exists.
  * This is the same as {X,_} = statistics(runtime), which uses
@@ -908,8 +857,6 @@ static double get_hrvtime(void)
 #define stop_hrvtime()		do{}while(0)
 #define get_hrvtime()		fallback_get_hrvtime()
 
-#endif	/* !USE_PERFCTR */
-
 BIF_RETTYPE hipe_bifs_get_hrvtime_0(BIF_ALIST_0)
 {
     Eterm *hp;
diff --git a/erts/emulator/hipe/hipe_perfctr.c b/erts/emulator/hipe/hipe_perfctr.c
deleted file mode 100644
index 371b3fb097..0000000000
--- a/erts/emulator/hipe/hipe_perfctr.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2004-2011. All Rights Reserved.
- *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * %CopyrightEnd%
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "sys.h"
-#include "error.h"
-#include "global.h"
-#include "bif.h"
-#include "big.h"
-#include "erl_binary.h"
-#include "hipe_perfctr.h"
-#include "libperfctr.h"
-
-static struct vperfctr *vperfctr;
-static unsigned int have_rdtsc;
-static double tsc_to_ms;
-static unsigned int tsc_on; /* control calls must set tsc_on if have_rdtsc is true */
-static unsigned int nractrs;
-static unsigned int users;
-#define USER_BIFS	(1<<0)
-#define USER_HRVTIME	(1<<1)
-
-static int hipe_perfctr_open(unsigned int user)
-{
-    struct perfctr_info info;
-
-    if (!vperfctr) {
-	vperfctr = vperfctr_open();
-	if (!vperfctr)
-	    return -1;
-	if (vperfctr_info(vperfctr, &info) >= 0) {
-	    tsc_to_ms = (double)(info.tsc_to_cpu_mult ? : 1) / (double)info.cpu_khz;
-	    have_rdtsc = (info.cpu_features & PERFCTR_FEATURE_RDTSC) ? 1 : 0;
-	}
-	tsc_on = 0;
-	nractrs = 0;
-    }
-    users |= user;
-    return 0;
-}
-
-static void hipe_perfctr_reset(void)
-{
-    struct vperfctr_control control;
-
-    memset(&control, 0, sizeof control);
-    if (have_rdtsc)
-	control.cpu_control.tsc_on = 1;
-    nractrs = 0;
-    if (vperfctr_control(vperfctr, &control) >= 0)
-	tsc_on = 1;
-}
-
-static void hipe_perfctr_close(unsigned int user)
-{
-    if (!vperfctr)
-	return;
-    users &= ~user;
-    switch (users) {
-      case 0:
-	vperfctr_unlink(vperfctr);
-	vperfctr_close(vperfctr);
-	vperfctr = NULL;
-	tsc_on = 0;
-	nractrs = 0;
-	break;
-      case USER_HRVTIME:
-	hipe_perfctr_reset();
-    }
-}
-
-/*
- * Interface for HiPE's hrvtime code.
- */
-
-int hipe_perfctr_hrvtime_open(void)
-{
-    if (hipe_perfctr_open(USER_HRVTIME) < 0)
-	return -1;
-    if (have_rdtsc) {
-	if (!tsc_on)
-	    hipe_perfctr_reset(); /* note: updates tsc_on */
-	if (tsc_on)
-	    return 0;
-    }
-    hipe_perfctr_hrvtime_close();
-    return -1;
-}
-
-void hipe_perfctr_hrvtime_close(void)
-{
-    hipe_perfctr_close(USER_HRVTIME);
-}
-
-double hipe_perfctr_hrvtime_get(void)
-{
-    return (double)vperfctr_read_tsc(vperfctr) * tsc_to_ms;
-}
-
-/*
- * BIF interface for user-programmable performance counters.
- */
-
-BIF_RETTYPE hipe_bifs_vperfctr_open_0(BIF_ALIST_0)
-{
-    if (hipe_perfctr_open(USER_BIFS) < 0)
-	BIF_RET(am_false); /* arity 0 BIFs can't fail :-( */
-    BIF_RET(am_true);
-}
-
-BIF_RETTYPE hipe_bifs_vperfctr_close_0(BIF_ALIST_0)
-{
-    hipe_perfctr_close(USER_BIFS);
-    BIF_RET(NIL);
-}
-
-static Eterm ull_to_integer(unsigned long long x, Process *p)
-{
-    unsigned long long tmpx;
-    unsigned int ds, i;
-    size_t sz;
-    Eterm *hp;
-    ErtsDigit *xp;
-
-    if (x <= (unsigned long long)MAX_SMALL)
-	return make_small(x);
-
-    /* Calculate number of digits. */
-    ds = 0;
-    tmpx = x;
-    do {
-	++ds;
-	tmpx = (tmpx >> (D_EXP / 2)) >> (D_EXP / 2);
-    } while (tmpx != 0);
-
-    sz = BIG_NEED_SIZE(ds);	/* number of words including arity */
-    hp = HAlloc(p, sz);
-    *hp = make_pos_bignum_header(sz-1);
-
-    xp = (ErtsDigit*)(hp+1);
-    i = 0;
-    do {
-	xp[i++] = (ErtsDigit)x;
-	x = (x >> (D_EXP / 2)) >> (D_EXP / 2);
-    } while (i < ds);
-    while (i & (BIG_DIGITS_PER_WORD-1))
-	xp[i++] = 0;
-
-    return make_big(hp);
-}
-
-BIF_RETTYPE hipe_bifs_vperfctr_info_0(BIF_ALIST_0)
-{
-    struct perfctr_info info;
-
-    if (!vperfctr || vperfctr_info(vperfctr, &info) < 0)
-	BIF_RET(am_false); /* arity 0 BIFs can't fail :-( */
-    BIF_RET(new_binary(BIF_P, (void*)&info, sizeof info));
-}
-
-BIF_RETTYPE hipe_bifs_vperfctr_read_tsc_0(BIF_ALIST_0)
-{
-    unsigned long long val;
-
-    if (!vperfctr || !tsc_on)
-	BIF_RET(am_false); /* arity 0 BIFs can't fail :-( */
-    val = vperfctr_read_tsc(vperfctr);
-    BIF_RET(ull_to_integer(val, BIF_P));
-}
-
-BIF_RETTYPE hipe_bifs_vperfctr_read_pmc_1(BIF_ALIST_1)
-{
-    Uint pmc;
-    unsigned long long val;
-
-    if (!vperfctr ||
-	is_not_small(BIF_ARG_1) ||
-	(pmc = unsigned_val(BIF_ARG_1), pmc >= nractrs))
-	BIF_RET(am_false); /* for consistency with the arity 0 BIFs */
-    val = vperfctr_read_pmc(vperfctr, pmc);
-    BIF_RET(ull_to_integer(val, BIF_P));
-}
-
-BIF_RETTYPE hipe_bifs_vperfctr_control_1(BIF_ALIST_1)
-{
-    void *bytes;
-    struct vperfctr_control control;
-    Uint bitoffs;
-    Uint bitsize;
-
-    if (!vperfctr)
-	BIF_ERROR(BIF_P, BADARG);
-    if (is_not_binary(BIF_ARG_1))
-	BIF_ERROR(BIF_P, BADARG);
-    if (binary_size(BIF_ARG_1) != sizeof control)
-	BIF_ERROR(BIF_P, BADARG);
-    ERTS_GET_BINARY_BYTES(BIF_ARG_1, bytes, bitoffs, bitsize);
-    ASSERT(bitoffs == 0);
-    ASSERT(bitsize == 0);
-    memcpy(&control, bytes, sizeof control);
-    if (have_rdtsc)
-	control.cpu_control.tsc_on = 1;
-    if (vperfctr_control(vperfctr, &control) < 0) {
-	hipe_perfctr_reset();
-	BIF_ERROR(BIF_P, BADARG);
-    }
-    tsc_on = control.cpu_control.tsc_on;
-    nractrs = control.cpu_control.nractrs;
-    BIF_RET(NIL);
-}
diff --git a/erts/emulator/hipe/hipe_perfctr.h b/erts/emulator/hipe/hipe_perfctr.h
deleted file mode 100644
index 8fbf9ecf35..0000000000
--- a/erts/emulator/hipe/hipe_perfctr.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2004-2011. All Rights Reserved.
- *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * %CopyrightEnd%
- */
-
-
-extern int hipe_perfctr_hrvtime_open(void);
-extern void hipe_perfctr_hrvtime_close(void);
-extern double hipe_perfctr_hrvtime_get(void);
diff --git a/erts/emulator/hipe/hipe_perfctr.tab b/erts/emulator/hipe/hipe_perfctr.tab
deleted file mode 100644
index eaecea4651..0000000000
--- a/erts/emulator/hipe/hipe_perfctr.tab
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2004-2011. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-#
-
-bif hipe_bifs:vperfctr_open/0
-bif hipe_bifs:vperfctr_close/0
-bif hipe_bifs:vperfctr_info/0
-bif hipe_bifs:vperfctr_read_tsc/0
-bif hipe_bifs:vperfctr_read_pmc/1
-bif hipe_bifs:vperfctr_control/1