Merge branch 'maint'

Conflicts:
	erts/emulator/Makefile.in

9 files changed, 0 insertions, 1416 deletions

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 6cbf22066c..3430ea5f7b 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -744,7 +744,6 @@ EMU_OBJS = \
 	$(OBJDIR)/beam_ranges.o
 
 RUN_OBJS = \
-	$(OBJDIR)/benchmark.o \
 	$(OBJDIR)/erl_alloc.o		$(OBJDIR)/erl_mtrace.o \
 	$(OBJDIR)/erl_alloc_util.o	$(OBJDIR)/erl_goodfit_alloc.o \
 	$(OBJDIR)/erl_bestfit_alloc.o	$(OBJDIR)/erl_afit_alloc.o \
diff --git a/erts/emulator/beam/benchmark.c b/erts/emulator/beam/benchmark.c
deleted file mode 100644
index c8409784ef..0000000000
--- a/erts/emulator/beam/benchmark.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#include "global.h"
-#include "benchmark.h"
-
-#ifdef BM_COUNTERS
-unsigned long long processes_busy;
-unsigned long long processes_spawned;
-unsigned long long messages_sent;
-unsigned long long messages_copied;
-unsigned long long messages_ego;
-unsigned long long minor_gc;
-unsigned long long major_gc;
-#endif /* BM_COUNTERS */
-
-#ifdef BM_TIMERS
-
-/* assuming Solaris */
-#include <time.h>
-BM_TIMER_T system_clock;
-
-unsigned long local_pause_times[MAX_PAUSE_TIME];
-unsigned long pause_times[MAX_PAUSE_TIME];
-unsigned long pause_times_old[MAX_PAUSE_TIME];
-
-BM_TIMER_T mmu;
-BM_TIMER_T mmu_counter;
-
-BM_NEW_TIMER(timer);
-BM_NEW_TIMER(system);
-BM_NEW_TIMER(gc);
-BM_NEW_TIMER(minor_gc);
-BM_NEW_TIMER(major_gc);
-BM_NEW_TIMER(minor_global_gc);
-BM_NEW_TIMER(major_global_gc);
-BM_NEW_TIMER(send);
-BM_NEW_TIMER(copy);
-BM_NEW_TIMER(size);
-BM_NEW_TIMER(max_minor);
-BM_NEW_TIMER(max_major);
-BM_NEW_TIMER(max_global_minor);
-BM_NEW_TIMER(max_global_major);
-BM_NEW_TIMER(misc0);
-BM_NEW_TIMER(misc1);
-BM_NEW_TIMER(misc2);
-#endif /* BM_TIMERS */
-
-#ifdef BM_HEAP_SIZES
-unsigned long long max_used_heap;
-unsigned long long max_allocated_heap;
-unsigned long long max_used_global_heap;
-unsigned long long max_allocated_global_heap;
-#endif /* BM_HEAP_SIZES */
-
-#ifdef BM_MESSAGE_SIZES
-unsigned long long words_sent;
-unsigned long long words_copied;
-unsigned long long words_prealloc;
-unsigned long long message_sizes[1000];
-#endif /* BM_MESSAGE_SIZES */
-
-/*****
- * The following functions have to be defined, but they only have contents
- * if certain keywords are defined.
- */
-
-void init_benchmarking()
-{
-#ifdef BM_TIMERS
-    int i;
-    for (i = 0; i < 1000; i++)
-    {
-        BM_START_TIMER(system);
-        BM_STOP_TIMER(system);
-    }
-    timer_time = system_time / 1000;
-
-    for (i = 0; i < MAX_PAUSE_TIME; i++) {
-        local_pause_times[i] = 0;
-        pause_times[i] = 0;
-        pause_times_old[i] = 0;
-    }
-
-    mmu = 0;
-    mmu_counter = 0;
-
-    BM_MMU_INIT();
-#endif /* BM_TIMERS */
-
-#ifdef BM_COUNTERS
-    processes_busy     = 0;
-    processes_spawned  = 0;
-    messages_sent      = 0;
-    messages_copied    = 0;
-    messages_ego       = 0;
-    minor_gc           = 0;
-    major_gc           = 0;
-#endif /* BM_COUNTERS */
-
-#ifdef BM_HEAP_SIZES
-    max_used_heap             = 0;
-    max_allocated_heap        = 0;
-    max_used_global_heap      = 0;
-    max_allocated_global_heap = 0;
-#endif /* BM_HEAP_SIZES */
-
-#ifdef BM_MESSAGE_SIZES
-    words_sent   = 0;
-    words_copied = 0;
-    words_prealloc = 0;
-    {
-        int i;
-        for (i = 0; i < 1000; i++)
-            message_sizes[i] = 0;
-    }
-#endif /* BM_MESSAGE_SIZES */
-}
-
-void save_statistics()
-{
-#ifdef BM_STATISTICS
-    FILE *file = fopen(BM_STATISTICS_FILE,"a");
-    long i = 0;
-
-    if (file)
-    {
-        erts_fprintf(file,"-------------------------------------------------------------------------\n");
-        erts_fprintf(file,"The counters are reset at system start and are sums over the entire node.\n");
-        erts_fprintf(file,"You may reset them manually using the BIFs in the module hipe_bifs.\n");
-        erts_fprintf(file,"All times are given in milliseconds.\n");
-        erts_fprintf(file,"-------------------------------------------------------------------------\n");
-
-	erts_fprintf(file,"Node: %T\n",erts_this_node->sysname);
-
-#ifdef BM_COUNTERS
-        erts_fprintf(file,"Number of processes spawned: %lld\n",processes_spawned);
-        erts_fprintf(file,"Number of local minor GCs: %lld\n",minor_gc);
-        erts_fprintf(file,"Number of local major GCs: %lld\n",major_gc);
-        erts_fprintf(file,"Number of messages sent: %lld\n",messages_sent);
-        erts_fprintf(file,"Number of messages copied: %lld\n",messages_copied);
-        erts_fprintf(file,"Number of messages sent to self: %lld\n",messages_ego);
-#endif /* BM_COUNTERS */
-
-#ifdef BM_MESSAGE_SIZES
-        erts_fprintf(file,"Number of words sent: %lld\n",words_sent);
-        erts_fprintf(file,"Number of words copied: %lld\n",words_copied);
-        erts_fprintf(file,"Number of words preallocated: %lld\n",words_prealloc);
-#endif /* BM_MESSAGE_SIZES */
-
-#ifdef BM_HEAP_SIZES
-        erts_fprintf(file,"Biggest local heap used (in words): %lld\n",max_used_heap);
-        erts_fprintf(file,"Biggest local heap allocated (in words): %lld\n",max_allocated_heap);
-        erts_fprintf(file,"Biggest global heap used (in words): %lld\n",max_used_global_heap);
-        erts_fprintf(file,"Biggest global heap allocated (in words): %lld\n",max_allocated_global_heap);
-#endif /* BM_HEAP_SIZES */
-
-#ifdef BM_TIMERS
-        erts_fprintf(file,"--- The total active system time is the sum of all times below ---\n");
-        BM_TIME_PRINTER("Mutator time",system_time);
-        BM_TIME_PRINTER("Time spent in send (excluding size & copy)",send_time);
-        BM_TIME_PRINTER("Time spent in size",size_time);
-        BM_TIME_PRINTER("Time spent in copy",copy_time);
-        BM_TIME_PRINTER("Time spent in local minor GC",minor_gc_time);
-        BM_TIME_PRINTER("Time spent in local major GC",major_gc_time);
-        BM_TIME_PRINTER("Time spent in global minor GC",minor_global_gc_time);
-        BM_TIME_PRINTER("Time spent in global major GC",major_global_gc_time);
-        erts_fprintf(file,"---\n");
-        BM_TIME_PRINTER("Maximum time spent in one separate local minor GC",max_minor_time);
-        BM_TIME_PRINTER("Maximum time spent in one separate local major GC",max_major_time);
-        BM_TIME_PRINTER("Maximum time spent in one separate global minor GC",max_global_minor_time);
-        BM_TIME_PRINTER("Maximum time spent in one separate global major GC",max_global_major_time);
-#endif /* BM_TIMERS */
-
-#if 0
-        /* Save a log file for import into excel */
-
-        long long total_time, n;
-        long left, right, mid;
-
-#ifdef BM_COUNTERS
-        erts_fprintf(file,"Spawns\tLocalGC\tMAGC\tMessages\tMutator_t\tLocalGC_t\tMAGC_t\tLocMaxP\tLocMeanP\tLocGeoMP\tMAMaxP\tMAMeanP\tMAGeoMP\t\tCMAGC\tCMAGC_t\n");
-        erts_fprintf(file,"%lld\t%lld\t%lld\t%lld\t",
-                processes_spawned,
-                minor_garbage_cols + major_garbage_cols,
-                minor_global_garbage_cols + major_global_garbage_cols,
-                messages_sent);
-#endif /* BM_COUNTERS */
-
-#ifdef BM_TIMERS
-        erts_fprintf(file,"%lld\t%lld\t%lld\t",
-                (long long)(system_time + send_time + size_time + copy_time),
-                (long long)(minor_gc_time + major_gc_time),
-                (long long)(minor_global_gc_time + major_global_gc_time));
-
-        total_time = 0; n = 0;
-        left = 0; right = 0; mid = 0;
-        for (i = 0; i < MAX_PAUSE_TIME; i++) {
-            total_time += local_pause_times[i] * i;
-            n += local_pause_times[i];
-            if (i > mid)
-                right += local_pause_times[i];
-            while(right > left) {
-                left += local_pause_times[mid++];
-                right -= local_pause_times[mid];
-            }
-        }
-        erts_fprintf(file,"%lld\t%lld\t%ld\t",
-                (long long)((max_minor_time > max_major_time ?
-                             max_minor_time :
-                             max_major_time)*1000),
-                total_time / n,
-                mid);
-
-        total_time = 0; n = 0;
-        left = 0; right = 0; mid = 0;
-        for (i = 0; i < MAX_PAUSE_TIME; i++) {
-            if (pause_times[i] > 0) {
-                total_time += pause_times[i] * i;
-                n += pause_times[i];
-                if (i > mid)
-                    right += pause_times[i];
-                while(right > left) {
-                    left += pause_times[mid++];
-                    right -= pause_times[mid];
-                }
-            }
-        }
-        erts_fprintf(file,"%lld\t%lld\t%ld\t",
-                (long long)((max_global_minor_time > max_global_major_time ?
-                             max_global_minor_time :
-                             max_global_major_time)*1000),
-                (n > 0 ? total_time / n : 0),
-                mid);
-
-        erts_fprintf(file,"\t%lld\t%lld\n",n,total_time);
-
-        erts_fprintf(file,"\nMinor:\n");
-        for (i = 0; i < MAX_PAUSE_TIME; i++) {
-            if (i < 1000 || pause_times[i] > 0) {
-                erts_fprintf(file,"%d\t%ld\n",i,pause_times[i]);
-            }
-        }
-
-        fprintf(file,"Major:\n");
-        for (i = 0; i < MAX_PAUSE_TIME; i++) {
-            if (pause_times_old[i] > 0) {
-                fprintf(file,"%d\t%ld\n",i,pause_times_old[i]);
-            }
-        }
-#endif /* BM_TIMERS */
-
-#ifdef BM_TIMERS
-        total_time = 0; n = 0;
-        left = 0; right = 0; mid = 0;
-        fprintf(file,"\nLocal:\n");
-        for (i = 0; i < MAX_PAUSE_TIME; i++) {
-            if (local_pause_times[i] > 0) {
-                erts_fprintf(file,"%d\t%ld\n",i,local_pause_times[i]);
-                total_time += local_pause_times[i] * i;
-                n += local_pause_times[i];
-                if (i > mid)
-                    right += local_pause_times[i];
-                while(right > left) {
-                    left += local_pause_times[mid++];
-                    right -= local_pause_times[mid];
-                }
-            }
-        }
-        erts_fprintf(file,"Mid: %ld  Mean: %ld\n",(long)mid,
-                (long)(n > 0 ? total_time / n : 0));
-#endif
-#endif /* 0 */
-        fclose(file);
-    }
-    else
-        fprintf(stderr,"Sorry... Can not write to %s!\n\r",BM_STATISTICS_FILE);
-#endif /* BM_STATISTICS */
-}
diff --git a/erts/emulator/beam/benchmark.h b/erts/emulator/beam/benchmark.h
deleted file mode 100644
index 0272896f4f..0000000000
--- a/erts/emulator/beam/benchmark.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- */
-
-#ifndef __BENCHMARK_H__
-#define __BENCHMARK_H__
-
-/* The define __BENCHMARK__ is the master switch to turn on and off
- * benchmarking. This will enable the benchmark-BIFs in hipe_bif1.c.
- * Documentation for the BIFs is in hipe_bif1.c, and that is where you
- * will find the information about how to accually get some data out
- * from these timers and counters.
- */
-/* #define __BENCHMARK__ */
-
-#ifdef __BENCHMARK__
-/*
- * The defines below enables different parts of the benchmaring.
- * Counters and timers that are disabled, always report zero in
- * the BIFs.
- */
-
-/* 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. Currently, the Solaris hrtime_t will be used.
- * To add new timers look below.
- */
-#define BM_TIMERS
-
-/* BM_COUNTERS count all kinds of events that occurs in the system.
- * Among other things it counts the number of messages, then number of
- * garbage collections, the number of processes spawned etc.
- * To add new counters look below.
- */
-#define BM_COUNTERS
-
-/* BM_MESSAGE_SIZES keeps a log of the size of all messages sent in
- * the system. This introduce an overhead in time for the shared heap
- * system since all message sizes have to be calculated at send.
- */
-/* #define BM_MESSAGE_SIZES */
-
-/* BM_HEAP_SIZES goes through all processes at garbage collection time
- * to sum their allocated and used heap sizes. In anything else than a
- * shared heap system, this will cost.
- */
-/* #define BM_HEAP_SIZES */
-
-/* BM_STATISTICS saves an entry in the file BM_STATISTICS_FILE. This
- * is done for each erlang node at exit time.
- */
-/* #define BM_STATISTICS */
-
-#endif /* __BENCHMARK__ */
-
-
-#ifdef BM_STATISTICS
-#  define BM_STATISTICS_FILE "/tmp/erlang_statistics.joppe.log"
-#endif /* BM_STATISTICS */
-
-
-/************ There are no more settings below this line *************/
-
-/*
- * Maintenance and how to add new stuff is documented by the code
- * below ;-)
- */
-
-#ifdef BM_COUNTERS
-/*********************************************************************
- * To add new counters:
- *
- * Add the variable here AND in benchmark.c. Use the macro
- * BM_COUNT(var) in the code where you want to increase it.
- *
- */
-extern unsigned long long processes_busy;
-extern unsigned long long processes_spawned;
-extern unsigned long long messages_sent;
-extern unsigned long long messages_copied;
-extern unsigned long long messages_ego;
-extern unsigned long long minor_gc;
-extern unsigned long long major_gc;
-
-#define BM_COUNT(var) (var)++;
-
-#define BM_EGO_COUNT(send,rec) {     \
-    if ((send) == (rec))             \
-        BM_COUNT(messages_ego);      }
-
-#define BM_LAZY_COPY_START long long gcs = minor_global_gc + major_global_gc;
-#define BM_LAZY_COPY_STOP { gcs = (minor_global_gc + major_global_gc) - gcs; \
-    if (gcs > gc_in_copy) gc_in_copy = gcs; }
-
-#else /* !BM_COUNTERS */
-#  define BM_COUNT(var)
-#  define BM_EGO_COUNT(send,rec)
-#  define BM_LAZY_COPY_START
-#  define BM_LAZY_COPY_STOP
-#endif /* BM_COUNTERS */
-
-
-#ifdef BM_TIMERS
-/*********************************************************************
- * To add new timers:
- *
- * Add the variable below using the form extern BM_TIMER_T blah_time.
- * Also add them in benchmark.c using the macro NEW_TIMER(blah).  Use
- * the macro BM_SWAP_TIMER(from,blah) ... BM_SWAP_TIMER(blah,to) to
- * start and stop the new timer. Note, that you have to know what
- * timer is running at the place where you want to insert your new
- * timer to be able to stop and start (from,to) it.
- *
- * You can use the macros BM_STOP_TIMER(blah) and BM_START_TIMER(blah)
- * around code that should not be timed at all. As above, you have to
- * know what timer to start and stop. The system timer is running at
- * most places in the emulator. Only the garbage collector and the
- * message sending has its own timers at the moment.
- *
- * The timer_time used when stopping timers is the time it takes to
- * start and stop the timers, calculated in init_benchmarking(). If it
- * is not there, the time it takes to do this will accually be
- * substantial compared to some small times in the system we want to
- * meassure (send time in shared heap for instance).
- */
-
-/* (Assuming Solaris) */
-
-#define BM_TIMER_T ErtsMonotonicTime
-#define BM_START_TIMER(t) system_clock = ERTS_MONOTONIC_TO_NSEC(erts_os_monotonic_time())
-#define BM_STOP_TIMER(t) do {                                        \
-    BM_TIMER_T tmp = (ERTS_MONOTONIC_TO_NSEC(erts_os_monotonic_time()) - system_clock) - 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;                                                  \
-    tmp = (time) / 1000;                                             \
-    micro = tmp % 1000;                                              \
-    tmp /= 1000;                                                     \
-    milli = tmp % 1000;                                              \
-    tmp /= 1000;                                                     \
-    sec = tmp % 60;                                                  \
-    min = tmp / 60;                                                  \
-    erts_fprintf(file,str": %d:%02d.%03d %03d\n",min,sec,milli,micro);  \
-} while(0)
-
-extern BM_TIMER_T system_clock;
-
-extern BM_TIMER_T timer_time;
-extern BM_TIMER_T system_time;
-extern BM_TIMER_T gc_time;
-extern BM_TIMER_T minor_gc_time;
-extern BM_TIMER_T major_gc_time;
-extern BM_TIMER_T minor_global_gc_time;
-extern BM_TIMER_T major_global_gc_time;
-extern BM_TIMER_T send_time;
-extern BM_TIMER_T copy_time;
-extern BM_TIMER_T size_time;
-extern BM_TIMER_T max_minor_time;
-extern BM_TIMER_T max_major_time;
-extern BM_TIMER_T max_global_minor_time;
-extern BM_TIMER_T max_global_major_time;
-extern BM_TIMER_T misc0_time;
-extern BM_TIMER_T misc1_time;
-extern BM_TIMER_T misc2_time;
-
-#define MAX_PAUSE_TIME 500000
-extern unsigned long local_pause_times[MAX_PAUSE_TIME];
-extern unsigned long pause_times[MAX_PAUSE_TIME];
-extern unsigned long pause_times_old[MAX_PAUSE_TIME];
-
-#define MMU_INTERVAL 5  /* milli seconds */
-extern BM_TIMER_T mmu_counter;
-extern BM_TIMER_T mmu;
-
-#define BM_NEW_TIMER(t) BM_TIMER_T t##_time = 0;
-#define BM_RESET_TIMER(t) t##_time = 0;
-#define BM_SWAP_TIMER(t1,t2) do { BM_STOP_TIMER(t1); BM_START_TIMER(t2); } while(0)
-#define BM_MMU_INIT() do {                                              \
-    BM_TIMER_T gc = gc_time;                                            \
-    while (gc > 0) {                                                    \
-        if (gc > MMU_INTERVAL) {                                        \
-            gc -= MMU_INTERVAL - mmu_counter;                           \
-            erts_printf("%d\n",(int)((mmu / MMU_INTERVAL) * 100));      \
-            mmu_counter = 0; mmu = 0;                                   \
-        } else {                                                        \
-            mmu_counter += gc;                                          \
-            if (mmu_counter >= MMU_INTERVAL) {                          \
-                mmu_counter -= MMU_INTERVAL;                            \
-                erts_printf("%d\n",(int)((mmu / MMU_INTERVAL) * 100));  \
-                mmu = 0;                                                \
-            }                                                           \
-            gc = 0;                                                     \
-        }                                                               \
-    }                                                                   \
-    BM_RESET_TIMER(system);                                             \
-    BM_RESET_TIMER(send);                                               \
-    BM_RESET_TIMER(copy);                                               \
-    BM_RESET_TIMER(size);                                               \
-} while(0)
-
-#define BM_MMU_READ() do {                                              \
-    BM_TIMER_T mut = system_time + send_time + copy_time + size_time;   \
-    while (mut > 0) {                                                   \
-        if (mut > MMU_INTERVAL) {                                       \
-            BM_TIMER_T tmp = MMU_INTERVAL - mmu_counter;                \
-            mmu += tmp; mut -= tmp;                                     \
-            erts_printf("%d\n",(int)((mmu / MMU_INTERVAL) * 100));      \
-            mmu_counter = 0; mmu = 0;                                   \
-        } else {                                                        \
-            mmu_counter += mut; mmu += mut;                             \
-            if (mmu_counter >= MMU_INTERVAL) {                          \
-                mmu_counter -= MMU_INTERVAL;                            \
-                mmu -= mmu_counter;                                     \
-                erts_printf("%d\n",(int)((mmu / MMU_INTERVAL) * 100));  \
-                mmu = mmu_counter;                                      \
-            }                                                           \
-            mut = 0;                                                    \
-        }                                                               \
-    }                                                                   \
-} while(0)
-
-#else /* !BM_TIMERS */
-#  define BM_NEW_TIMER(t)
-#  define BM_START_TIMER(t)
-#  define BM_STOP_TIMER(t)
-#  define BM_RESET_TIMER(t)
-#  define BM_SWAP_TIMER(t1,t2)
-#  define BM_TIME_PRINTER(str,time)
-#  define BM_MMU_INIT()
-#  define BM_MMU_READ()
-#endif /* BM_TIMERS */
-
-#ifdef BM_HEAP_SIZES
-extern unsigned long long max_used_heap;
-extern unsigned long long max_allocated_heap;
-extern unsigned long long max_used_global_heap;
-extern unsigned long long max_allocated_global_heap;
-#endif /* BM_HEAP_SIZES */
-
-#ifdef BM_MESSAGE_SIZES
-extern unsigned long long words_sent;
-extern unsigned long long words_copied;
-extern unsigned long long words_prealloc;
-extern unsigned long long message_sizes[1000];
-
-#define BM_MESSAGE_COPIED(size) { \
-    words_copied += size;         \
-    BM_COUNT(messages_copied);    }
-
-#define BM_PREALLOC_DATA(size) { \
-    words_prealloc += size;      }
-
-#define BM_MESSAGE(mess,send,rec) {  \
-    Uint msize = size_object(mess);  \
-    words_sent += msize;             \
-    if (msize < 1000)                \
-        message_sizes[msize]++;      \
-    else                             \
-        message_sizes[999]++;        \
-    BM_EGO_COUNT(send,rec);          \
-    BM_COUNT(messages_sent);         }
-
-#else /* !BM_MESSAGE_SIZES */
-
-#define BM_MESSAGE_COPIED(size) BM_COUNT(messages_copied);
-#define BM_PREALLOC_DATA(size)
-#define BM_MESSAGE(mess,send,rec) {  \
-    BM_EGO_COUNT(send,rec);          \
-    BM_COUNT(messages_sent);         }
-
-#endif /* BM_MESSAGE_SIZES */
-
-void init_benchmarking(void);
-void save_statistics(void);
-
-#endif /* _BENCHMARK_H_ */
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index fbdafec4ef..2239b6f045 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -332,8 +332,6 @@ erl_init(int ncpu,
 	 int node_tab_delete_delay,
 	 ErtsDbSpinCount db_spin_count)
 {
-    init_benchmarking();
-
     erts_bif_unique_init();
     erts_init_monitors();
     erts_init_time(time_correction, time_warp_mode);
@@ -2345,8 +2343,6 @@ erts_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2)
 {
     system_cleanup(flush_async);
 
-    save_statistics();
-
     if (erts_mtrace_enabled)
 	erts_mtrace_exit((Uint32) n);
 
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 71ab92937d..91e06cde2d 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -697,9 +697,6 @@ erts_send_message(Process* sender,
 #ifdef SHCOPY_SEND
     erts_shcopy_t info;
 #endif
-    BM_STOP_TIMER(system);
-    BM_MESSAGE(message,sender,receiver);
-    BM_START_TIMER(send);
 
 #ifdef USE_VM_PROBES
     *sender_name = *receiver_name = '\0';
@@ -720,7 +717,6 @@ erts_send_message(Process* sender,
 #ifdef USE_VM_PROBES
 	Uint dt_utag_size = 0;
 #endif
-        BM_SWAP_TIMER(send,size);
 
         /* SHCOPY corrupts the heap between
          * copy_shared_calculate, and
@@ -747,8 +743,6 @@ erts_send_message(Process* sender,
 #else
         msize = size_object(message);
 #endif
-        BM_SWAP_TIMER(size,send);
-
         mp = erts_alloc_message_heap_state(receiver,
                                            &receiver_state,
                                            receiver_locks,
@@ -760,8 +754,6 @@ erts_send_message(Process* sender,
                                            &hp,
                                            &ohp);
 
-        BM_SWAP_TIMER(send,copy);
-
 #ifdef SHCOPY_SEND
 	if (is_not_immed(message))
             message = copy_shared_perform(message, msize, &info, &hp, ohp);
@@ -792,9 +784,6 @@ erts_send_message(Process* sender,
 		    msize, tok_label, tok_lastcnt, tok_serial);
         }
 #endif
-        BM_MESSAGE_COPIED(msize);
-        BM_SWAP_TIMER(copy,send);
-
     } else {
         Eterm *hp;
 
@@ -803,22 +792,18 @@ erts_send_message(Process* sender,
 	    msize = 0;
 	}
 	else {
-	    BM_SWAP_TIMER(send,size);
 #ifdef SHCOPY_SEND
             INITIALIZE_SHCOPY(info);
             msize = copy_shared_calculate(message, &info);
 #else
             msize = size_object(message);
 #endif
-	    BM_SWAP_TIMER(size,send);
-
 	    mp = erts_alloc_message_heap_state(receiver,
 					       &receiver_state,
 					       receiver_locks,
 					       msize,
 					       &hp,
 					       &ohp);
-	    BM_SWAP_TIMER(send,copy);
 #ifdef SHCOPY_SEND
             if (is_not_immed(message))
                 message = copy_shared_perform(message, msize, &info, &hp, ohp);
@@ -827,8 +812,6 @@ erts_send_message(Process* sender,
             if (is_not_immed(message))
                 message = copy_struct(message, msize, &hp, ohp);
 #endif
-	    BM_MESSAGE_COPIED(msz);
-	    BM_SWAP_TIMER(copy,send);
 	}
 #ifdef USE_VM_PROBES
         DTRACE6(message_send, sender_name, receiver_name,
@@ -846,8 +829,6 @@ erts_send_message(Process* sender,
 			mp, message,
                         sender->common.id);
 
-    BM_SWAP_TIMER(send,system);
-    
     return res;
 }
 
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 66f22979ad..f0f5b13f9d 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9588,8 +9588,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 		erts_smp_runq_lock(rq);
 	    }
 	}
-	BM_STOP_TIMER(system);
-
     }
 
     ERTS_SMP_LC_ASSERT(!is_normal_sched || !erts_thr_progress_is_blocking());
@@ -9827,8 +9825,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 
             ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_EMULATOR);
 
-	    BM_START_TIMER(system);
-
 	    /*
 	     * Take the chosen process out of the queue.
 	     */
@@ -11154,18 +11150,11 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	   || (erts_smp_atomic32_read_nob(&p->state)
 	       & ERTS_PSFLG_OFF_HEAP_MSGQ));
 
-#ifdef BM_COUNTERS
-    processes_busy++;
-#endif
-    BM_COUNT(processes_spawned);
-
-    BM_SWAP_TIMER(system,size);
 #ifdef SHCOPY_SPAWN
     arg_size = copy_shared_calculate(args, &info);
 #else
     arg_size = size_object(args);
 #endif
-    BM_SWAP_TIMER(size,system);
     heap_need = arg_size;
 
     p->flags = flags;
@@ -11242,18 +11231,12 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     p->max_arg_reg = sizeof(p->def_arg_reg)/sizeof(p->def_arg_reg[0]);
     p->arg_reg[0] = mod;
     p->arg_reg[1] = func;
-    BM_STOP_TIMER(system);
-    BM_MESSAGE(args,p,parent);
-    BM_START_TIMER(system);
-    BM_SWAP_TIMER(system,copy);
 #ifdef SHCOPY_SPAWN
     p->arg_reg[2] = copy_shared_perform(args, arg_size, &info, &p->htop, &p->off_heap);
     DESTROY_SHCOPY(info);
 #else
     p->arg_reg[2] = copy_struct(args, arg_size, &p->htop, &p->off_heap);
 #endif
-    BM_MESSAGE_COPIED(arg_size);
-    BM_SWAP_TIMER(copy,system);
     p->arity = 3;
 
     p->fvalue = NIL;
@@ -12826,9 +12809,6 @@ erts_continue_exit_process(Process *p)
     dep = (p->flags & F_DISTRIBUTION) ? erts_this_dist_entry : NULL;
 
     erts_smp_proc_unlock(p, ERTS_PROC_LOCKS_ALL);
-#ifdef BM_COUNTERS
-    processes_busy--;
-#endif
 
     if (dep) {
 	erts_do_net_exits(dep, reason);
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 961260041f..bf2e50e52f 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -35,7 +35,6 @@
 #include "register.h"
 #include "erl_fun.h"
 #include "erl_node_tables.h"
-#include "benchmark.h"
 #include "erl_process.h"
 #include "erl_sys_driver.h"
 #include "erl_debug.h"
diff --git a/erts/emulator/hipe/hipe_bif1.c b/erts/emulator/hipe/hipe_bif1.c
index 08adbd474e..5e127755c6 100644
--- a/erts/emulator/hipe/hipe_bif1.c
+++ b/erts/emulator/hipe/hipe_bif1.c
@@ -124,757 +124,3 @@ BIF_RETTYPE hipe_bifs_trap_count_clear_0(BIF_ALIST_0)
     hipe_trap_count = 0;
     BIF_RET(make_small(count));
 }
-
-/*****************************************************************************
- * BIFs for benchmarking. These only do useful things if
- * __BENCHMARK__ is defined in beam/benchmark.h. For documentation
- * about how to add new counters or maintain the existing counters,
- * see benchmark.h.
- *
- * If benchmarking is not enabled all BIFs will return false. If the
- * required benchmark feature is not enabled, the counter will remain
- * zero.
- *
- * process_info/0 -> { Number of live processes,
- *		       Processes spawned in total }
- *
- *   Live processes are increased when a new process is created, and
- *   decreased when a process dies. Processes spawned is increased
- *   when a process is created.
- *
- *
- * process_info_clear/0 -> true
- *
- *   Will reset the processes spawned-counters to zero. If this is
- *   done at some improper time, live processes may become a negative
- *   value. This is not a problem in itself, just as long as you know
- *   about it.
- *
- *
- * message_info/0 -> { Messages sent,
- *		       Messages copied,
- *		       Ego messages (sender = receiver),
- *		       Words sent,
- *		       Words copied,
- *		       Words preallocated }
- *
- *   Counting the words sent in a shared heap system will affect
- *   runtime performance since it means that we have to calculate the
- *   size of the mesage. With private heaps, this is done anyway and
- *   will not affect performance.
- *
- *
- * message_info_clear/0 -> true
- *
- *   Reset the message counters to zero.
- *
- *
- * message_sizes/0 -> true
- *
- *   Displays a text-mode bar diagram with message sizes. There are no
- *   guaranties that this is printed in a way the Erlang system is
- *   supposed to print things.
- *
- *
- * gc_info/0 -> { Minor collections,
- *		  Major collections,
- *		  Used heap,
- *		  Allocated heap,
- *		  Max used heap,
- *		  Max allocated heap }
- *
- *   Information about private heap garbage collections. Number of
- *   minor and major collections, how much heap is used and allocated
- *   and how much heap has been in use and allocated at most since the
- *   counters were reset.
- *
- *
- * shared_gc_info/0 -> { Minor collections of the shared heap,
- *			 Major collections of the shared heap,
- *			 Used shared heap,
- *			 Allocated shared heap,
- *			 Max used shared heap,
- *			 Max allocated shared heap }
- *
- *   The same as above, but for the shared heap / message area. Note,
- *   that in a shared heap system the max used heap and max allocated
- *   heap are mostly the same, since the heap allways is filled before
- *   a garbage collection, and most garbage collections do not enlarge
- *   the heap. The private heap numbers are much more interesting.
- *
- *
- * incremental_gc_info/0 -> { Complete minor GC cycles,
- *			      Complete major GC cycles,
- *			      Minor GC stages,
- *			      Major GC stages }
- *
- *
- * gc_info_clear/0 -> true
- *
- *   Reset counters for both private and shared garbage collection.
- *
- *
- * BM Timers
- * ---------
- *
- * All timers returns tuples of the kind: { Minutes, Seconds, Milliseconds }
- * except for the max times in garbage collection where times are normally
- * small. The tuple is therefor: { Seconds, Milliseconds, Microseconds }
- *
- * system_timer/0 -> Mutator time
- *
- *   This timer is not a real-time clock, it only runs when a process
- *   is scheduled to run. You can not find out the accual time a
- *   program has taken to run using this timer.
- *
- *
- * system_timer_clear/0 -> true
- *
- *   Reset system timer to zero.
- *
- *
- * send_timer/0 -> { Send time,
- *		     Copy time,
- *		     Size time }
- *
- *   Time spent in sending messages. The copy time and size time are
- *   only active if the copying is needed in send. Copying of data
- *   into ETS-tables etc is not timed with this timer.
- *
- *
- * send_timer_clear/0 -> true
- *
- *   Reset send timers to zero.
- *
- *
- * gc_timer/0 -> { Time in minor collection,
- *		   Time in major collection,
- *		   Max time in minor collection (�s),
- *		   Max time in major collection (�s) }
- *
- *   Total time spent in garbage collection of the private heaps. The
- *   max times are for one separate collection.
- *
- *
- * shared_gc_timer/0 -> { Time in minor collection,
- *			  Time in major collection,
- *			  Max time in minor collection (�s),
- *			  Max time in major collection (�s) }
- *
- *   Total time spent in garbage collection of the shared heap /
- *   message area. The max times are for one separate collection.
- *
- *
- * gc_timer_clear/0 -> true
- *
- *   Reset private and shared garbage collection timers to zero. Note,
- *   that the max-times are also reset.
- *
- *
- * misc_timer/0 -> { Misc 0, Misc 1, Misc 2 }
- *
- *   Timers for debug purposes. In a normal system, these timers are
- *   never used. Add these timers at places where you want to time
- *   something not covered here. Use BM_SWAP_TIMER(from,to) to start
- *   one of the misc timers.
- *
- *   ... code timed by the system timer ...
- *   BM_SWAP_TIMER(system,misc1);
- *   ... code we want to time ...
- *   BM_SWAP_TIMER(misc1,system);
- *   ... back on system time ...
- *
- *
- * misc_timer_clear/0 -> true
- *
- *   Reset misc timers to zero.
- */
-
-BIF_RETTYPE hipe_bifs_process_info_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-#ifndef BM_COUNTERS
-    Uint processes_busy	   = 0;
-    Uint processes_spawned = 0;
-#endif
-    Eterm *hp;
-
-    hp = HAlloc(BIF_P, 3);
-    BIF_RET(TUPLE2(hp,
-		   make_small(processes_busy),
-		   make_small(processes_spawned)));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_process_info_clear_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-#ifdef BM_COUNTERS
-    processes_spawned = 0;
-#endif
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_message_info_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-    Eterm *hp;
-#ifndef BM_COUNTERS
-    unsigned long messages_sent	  = 0;
-    unsigned long messages_copied = 0;
-    unsigned long messages_ego	  = 0;
-#endif
-#ifndef BM_MESSAGE_SIZES
-    unsigned long words_sent   = 0;
-    unsigned long words_copied = 0;
-    unsigned long words_prealloc = 0;
-#endif
-
-    hp = HAlloc(BIF_P, 7);
-    BIF_RET(TUPLE6(hp,
-		   make_small(messages_sent),
-		   make_small(messages_copied),
-		   make_small(messages_ego),
-		   make_small(words_sent),
-		   make_small(words_copied),
-		   make_small(words_prealloc)));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_message_info_clear_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-#ifdef BM_COUNTERS
-    messages_sent   = 0;
-    messages_copied = 0;
-    messages_ego    = 0;
-#endif
-#ifdef BM_MESSAGE_SIZES
-    words_sent	 = 0;
-    words_copied = 0;
-    words_prealloc = 0;
-    {
-	int i;
-	for (i = 0; i < 1000; i++)
-	    message_sizes[i] = 0;
-    }
-#endif
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_message_sizes_0(BIF_ALIST_0)
-{
-#ifdef BM_MESSAGE_SIZES
-    int i, j, max = 0;
-    int tmp[12] = {0,0,0,0,0,0,0,0,0,0,0,0};
-
-    for (i = 0; i < 65; i++) {
-	tmp[0] += message_sizes[i];
-	if (tmp[0] > max)
-	    max = tmp[0];
-    }
-    for (i = 65; i < 999; i++) {
-	tmp[i / 100 + 1] += message_sizes[i];
-	if (tmp[i / 100 + 1] > max)
-	    max = tmp[i / 100 + 1];
-    }
-    tmp[11] = message_sizes[999];
-    if (tmp[11] > max)
-	max = tmp[11];
-    for (i = -1; i < 11; i++) {
-	int num = (tmp[i + 1] * 50) / max;
-	if (i == -1)
-	    printf("\n\r  0 -  64: (%6d) |", tmp[0]);
-	else if (i == 0)
-	    printf("\n\r 65 -  99: (%6d) |", tmp[1]);
-	else if (i == 10)
-	    printf("\n\r  >= 1000: (%6d) |", tmp[11]);
-	else
-	    printf("\n\r%3d - %3d: (%6d) |", i * 100, i * 100 + 99,
-		   tmp[i + 1]);
-
-	for (j = 0; j < num; j++)
-	    printf(".");
-    }
-    printf("\n\r");
-
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_gc_info_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-#ifndef BM_COUNTERS
-    Uint minor_gc = 0;
-    Uint major_gc = 0;
-#endif
-#ifndef BM_HEAP_SIZES
-    Uint max_used_heap	    = 0;
-    Uint max_allocated_heap = 0;
-#endif
-    Eterm *hp;
-    Uint used_heap = (BIF_P->htop - BIF_P->heap) +
-		     (OLD_HTOP(BIF_P) - OLD_HEAP(BIF_P)) +
-		     MBUF_SIZE(BIF_P);
-
-    Uint alloc_heap = (BIF_P->hend - BIF_P->heap) +
-		      (OLD_HEND(BIF_P) - OLD_HEAP(BIF_P)) +
-		      MBUF_SIZE(BIF_P);
-
-    hp = HAlloc(BIF_P, 7);
-    BIF_RET(TUPLE6(hp,
-		   make_small((Uint)minor_gc),
-		   make_small((Uint)major_gc),
-		   make_small((Uint)used_heap),
-		   make_small((Uint)alloc_heap),
-		   make_small(max_used_heap),
-		   make_small(max_allocated_heap)));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_shared_gc_info_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-#if !(defined(BM_COUNTERS))
-    Uint minor_global_gc = 0;
-    Uint major_global_gc = 0;
-#endif
-#ifndef BM_HEAP_SIZES
-    Uint max_used_global_heap	   = 0;
-    Uint max_allocated_global_heap = 0;
-#endif
-    Eterm *hp;
-
-    Uint tmp_used_heap = 0;
-    Uint tmp_allocated_heap = 0;
-
-    hp = HAlloc(BIF_P, 7);
-    BIF_RET(TUPLE6(hp,
-		   make_small((uint)minor_global_gc),
-		   make_small((uint)major_global_gc),
-		   make_small(tmp_used_heap),
-		   make_small(tmp_allocated_heap),
-		   make_small(max_used_global_heap),
-		   make_small(max_allocated_global_heap)));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_incremental_gc_info_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-#if !defined(BM_COUNTERS)
-    Uint minor_gc_cycles = 0;
-    Uint major_gc_cycles = 0;
-    Uint minor_gc_stages = 0;
-    Uint major_gc_stages = 0;
-#endif
-    Eterm *hp;
-
-    hp = HAlloc(BIF_P, 5);
-    BIF_RET(TUPLE4(hp,
-		   make_small(minor_gc_cycles),
-		   make_small(major_gc_cycles),
-		   make_small(minor_gc_stages),
-		   make_small(major_gc_stages)));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_gc_info_clear_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-
-#ifdef BM_COUNTERS
-    minor_gc	    = 0;
-    major_gc	    = 0;
-#endif
-
-#ifdef BM_HEAP_SIZES
-    max_used_heap	      = 0;
-    max_allocated_heap	      = 0;
-    max_used_global_heap      = 0;
-    max_allocated_global_heap = 0;
-#endif
-
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_pause_times_0(BIF_ALIST_0)
-{
-#ifdef BM_TIMERS
-    int i;
-    int total_time = 0, n = 0;
-    int left = 0, right = 0, mid = 0;
-
-    printf("Pause times in minor collection:\r\n");
-    for (i = 0; i < MAX_PAUSE_TIME; i++) {
-	if (pause_times[i] > 0) {
-	    printf("%d: %ld\r\n", i, pause_times[i]);
-	    total_time += pause_times[i] * i;
-	    n += pause_times[i];
-
-	    if (i > mid)
-		right += pause_times[i];
-
-	    while (right > left) {
-		left += pause_times[mid++];
-		right -= pause_times[mid];
-	    }
-	}
-    }
-
-    printf("Number of collections: %d\r\n", n);
-    printf("Total collection time: %d\r\n", total_time);
-    if (n > 0)
-	printf("Mean pause time: %d\r\n", total_time / n);
-
-    printf("Geometrical mean: %d\r\n", mid);
-
-    total_time = 0; n = 0;
-    left = 0; right = 0; mid = 0;
-    printf("Pause times in major collection:\r\n");
-    for (i = 0; i < MAX_PAUSE_TIME; i++) {
-	if (pause_times_old[i] > 0) {
-	    printf("%d: %ld\r\n", i, pause_times_old[i]);
-	    total_time += pause_times_old[i] * i;
-	    n += pause_times_old[i];
-	}
-    }
-
-    printf("Number of collections: %d\r\n", n);
-    printf("Total collection time: %d\r\n", total_time);
-    if (n > 0)
-	printf("Mean pause time: %d\r\n", total_time / n);
-
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-/* XXX: these macros have free variables */
-#ifdef BM_TIMERS
-#define MAKE_TIME(_timer_) {			      \
-    BM_TIMER_T tmp = _timer_##_time / 1000000;	      \
-    milli = tmp % 1000;				      \
-    tmp /= 1000;				      \
-    sec = tmp % 60;				      \
-    min = tmp / 60;				      }
-
-#define MAKE_MICRO_TIME(_timer_) {		      \
-    BM_TIMER_T tmp = _timer_##_time / 1000;	      \
-    micro = tmp % 1000;				      \
-    tmp /= 1000;				      \
-    milli = tmp % 1000;				      \
-    sec = tmp / 1000;				      }
-
-#else
-#define MAKE_TIME(_timer_)
-#define MAKE_MICRO_TIME(_timer_)
-#endif
-
-BIF_RETTYPE hipe_bifs_system_timer_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-    uint min = 0;
-    uint sec = 0;
-    uint milli = 0;
-    Eterm *hp;
-
-    hp = HAlloc(BIF_P, 4);
-    MAKE_TIME(system);
-    BIF_RET(TUPLE3(hp,
-		   make_small(min),
-		   make_small(sec),
-		   make_small(milli)));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_system_timer_clear_0(BIF_ALIST_0)
-{
-#ifdef BM_TIMERS
-    system_time = 0;
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_send_timer_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-    uint min   = 0;
-    uint sec   = 0;
-    uint milli = 0;
-    Eterm *hp;
-    Eterm sendtime, copytime, sizetime;
-
-    hp = HAlloc(BIF_P, 4 * 4);
-
-    MAKE_TIME(send);
-    sendtime = TUPLE3(hp,
-		      make_small(min),
-		      make_small(sec),
-		      make_small(milli));
-    hp += 4;
-
-    MAKE_TIME(copy);
-    copytime = TUPLE3(hp,
-		      make_small(min),
-		      make_small(sec),
-		      make_small(milli));
-    hp += 4;
-
-    MAKE_TIME(size);
-    sizetime = TUPLE3(hp,
-		      make_small(min),
-		      make_small(sec),
-		      make_small(milli));
-    hp += 4;
-    BIF_RET(TUPLE3(hp, sendtime, copytime, sizetime));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_send_timer_clear_0(BIF_ALIST_0)
-{
-#ifdef BM_TIMERS
-    send_time = 0;
-    copy_time = 0;
-    size_time = 0;
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_gc_timer_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-    Eterm *hp;
-    uint min = 0;
-    uint sec = 0;
-    uint milli = 0;
-    uint micro = 0;
-    Eterm minor, major, max_min, max_maj;
-
-    hp = HAlloc(BIF_P, 4 * 4 + 5);
-
-    MAKE_TIME(minor_gc);
-    minor = TUPLE3(hp,
-		   make_small(min),
-		   make_small(sec),
-		   make_small(milli));
-    hp += 4;
-
-    MAKE_TIME(major_gc);
-    major = TUPLE3(hp,
-		   make_small(min),
-		   make_small(sec),
-		   make_small(milli));
-    hp += 4;
-
-    MAKE_MICRO_TIME(max_minor);
-    max_min = TUPLE3(hp,
-		     make_small(sec),
-		     make_small(milli),
-		     make_small(micro));
-    hp += 4;
-
-    MAKE_MICRO_TIME(max_major);
-    max_maj = TUPLE3(hp,
-		     make_small(sec),
-		     make_small(milli),
-		     make_small(micro));
-    hp += 4;
-
-    BIF_RET(TUPLE4(hp, minor, major, max_min, max_maj));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_shared_gc_timer_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-    Eterm *hp;
-    uint min = 0;
-    uint sec = 0;
-    uint milli = 0;
-    uint micro = 0;
-    Eterm minor, major, max_min, max_maj;
-
-    hp = HAlloc(BIF_P, 4 * 4 + 5);
-
-    MAKE_TIME(minor_global_gc);
-    minor = TUPLE3(hp,
-		   make_small(min),
-		   make_small(sec),
-		   make_small(milli));
-    hp += 4;
-
-    MAKE_TIME(major_global_gc);
-    major = TUPLE3(hp,
-		   make_small(min),
-		   make_small(sec),
-		   make_small(milli));
-    hp += 4;
-
-    MAKE_MICRO_TIME(max_global_minor);
-    max_min = TUPLE3(hp,
-		     make_small(sec),
-		     make_small(milli),
-		     make_small(micro));
-    hp += 4;
-
-    MAKE_MICRO_TIME(max_global_major);
-    max_maj = TUPLE3(hp,
-		     make_small(sec),
-		     make_small(milli),
-		     make_small(micro));
-    hp += 4;
-
-    BIF_RET(TUPLE4(hp, minor, major, max_min, max_maj));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_gc_timer_clear_0(BIF_ALIST_0)
-{
-#ifdef BM_TIMERS
-    minor_gc_time	  = 0;
-    major_gc_time	  = 0;
-    max_minor_time	  = 0;
-    max_major_time	  = 0;
-    minor_global_gc_time  = 0;
-    major_global_gc_time  = 0;
-    max_global_minor_time = 0;
-    max_global_major_time = 0;
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_misc_timer_0(BIF_ALIST_0)
-{
-#ifdef __BENCHMARK__
-    uint min   = 0;
-    uint sec   = 0;
-    uint milli = 0;
-    Eterm *hp;
-    Eterm misctime1, misctime2, misctime3;
-
-    hp = HAlloc(BIF_P, 4 * 4);
-
-    MAKE_TIME(misc0);
-    misctime1 = TUPLE3(hp,
-		       make_small(min),
-		       make_small(sec),
-		       make_small(milli));
-    hp += 4;
-
-    MAKE_TIME(misc1);
-    misctime2 = TUPLE3(hp,
-		       make_small(min),
-		       make_small(sec),
-		       make_small(milli));
-    hp += 4;
-
-    MAKE_TIME(misc2);
-    misctime3 = TUPLE3(hp,
-		       make_small(min),
-		       make_small(sec),
-		       make_small(milli));
-    hp += 4;
-    BIF_RET(TUPLE3(hp, misctime1, misctime2, misctime3));
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-BIF_RETTYPE hipe_bifs_misc_timer_clear_0(BIF_ALIST_0)
-{
-#ifdef BM_TIMERS
-    misc0_time = 0;
-    misc1_time = 0;
-    misc2_time = 0;
-    BIF_RET(am_true);
-#else
-    BIF_RET(am_false);
-#endif
-}
-
-#undef MAKE_TIME
-#undef MAKE_MICRO_TIME
-
-/*
- * HiPE hrvtime().
- * These implementations are currently available:
- * + The fallback, which is the same as {X,_} = runtime(statistics).
- */
-
-static double fallback_get_hrvtime(void)
-{
-    unsigned long ms_user;
-
-    elapsed_time_both(&ms_user, NULL, NULL, NULL);
-    return (double)ms_user;
-}
-
-/*
- * Fallback, if nothing better exists.
- * This is the same as {X,_} = statistics(runtime), which uses
- * times(2) on Unix systems.
- */
-
-#define hrvtime_is_started()	1
-#define start_hrvtime()		do{}while(0)
-#define stop_hrvtime()		do{}while(0)
-#define get_hrvtime()		fallback_get_hrvtime()
-
-BIF_RETTYPE hipe_bifs_get_hrvtime_0(BIF_ALIST_0)
-{
-    Eterm *hp;
-    Eterm res;
-    FloatDef f;
-
-    if (!hrvtime_is_started())
-	start_hrvtime();
-    f.fd = get_hrvtime();
-    hp = HAlloc(BIF_P, FLOAT_SIZE_OBJECT);
-    res = make_float(hp);
-    PUT_DOUBLE(f, hp);
-    BIF_RET(res);
-}
-
-BIF_RETTYPE hipe_bifs_stop_hrvtime_0(BIF_ALIST_0)
-{
-    stop_hrvtime();
-    BIF_RET(am_true);
-}
diff --git a/erts/emulator/hipe/hipe_bif1.tab b/erts/emulator/hipe/hipe_bif1.tab
index c5b452f199..4be0ad0e9c 100644
--- a/erts/emulator/hipe/hipe_bif1.tab
+++ b/erts/emulator/hipe/hipe_bif1.tab
@@ -27,24 +27,3 @@ bif hipe_bifs:call_count_get/1
 bif hipe_bifs:call_count_clear/1
 bif hipe_bifs:trap_count_get/0
 bif hipe_bifs:trap_count_clear/0
-bif hipe_bifs:process_info/0
-bif hipe_bifs:process_info_clear/0
-bif hipe_bifs:message_info/0
-bif hipe_bifs:message_info_clear/0
-bif hipe_bifs:message_sizes/0
-bif hipe_bifs:gc_info/0
-bif hipe_bifs:shared_gc_info/0
-bif hipe_bifs:incremental_gc_info/0
-bif hipe_bifs:gc_info_clear/0
-bif hipe_bifs:pause_times/0
-bif hipe_bifs:system_timer/0
-bif hipe_bifs:system_timer_clear/0
-bif hipe_bifs:send_timer/0
-bif hipe_bifs:send_timer_clear/0
-bif hipe_bifs:gc_timer/0
-bif hipe_bifs:shared_gc_timer/0
-bif hipe_bifs:gc_timer_clear/0
-bif hipe_bifs:misc_timer/0
-bif hipe_bifs:misc_timer_clear/0
-bif hipe_bifs:get_hrvtime/0
-bif hipe_bifs:stop_hrvtime/0