Merge branch 'llvm-6.0' into llvm-4.0

README.md

@@ -36,9 +36,10 @@ The name "Byfl" comes from "bytes/flops".  The very first version of the code co
 Installation
 ------------
 
-There are four "release" branches of Byfl on GitHub:
+There are five "release" branches of Byfl on GitHub:
 
   * [`master`](https://github.com/lanl/Byfl), corresponding to LLVM trunk (usually not up to date; best to avoid)
+  * [`llvm-6.0`](https://github.com/lanl/Byfl/tree/llvm-6.0), corresponding to LLVM 6.0._x_ releases
   * [`llvm-5.0`](https://github.com/lanl/Byfl/tree/llvm-5.0), corresponding to LLVM 5.0._x_ releases
   * [`llvm-4.0`](https://github.com/lanl/Byfl/tree/llvm-4.0), corresponding to LLVM 4.0._x_ releases
   * [`llvm-3.9`](https://github.com/lanl/Byfl/tree/llvm-3.9), corresponding to LLVM 3.9._x_ releases

configure.ac

@@ -4,7 +4,7 @@ dnl ### By Scott Pakin <pakin@lanl.gov> ###
 dnl #######################################
 
 dnl Initialize Autoconf and friends.
-AC_INIT([byfl], [1.5], [pakin@lanl.gov])
+AC_INIT([byfl], [1.6], [pakin@lanl.gov])
 AC_CONFIG_SRCDIR([lib/byfl/byfl.h])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])

lib/byfl/byfl.cpp

@@ -1036,8 +1036,8 @@ static class RunAtEndOfProgram {
       // Output every mth quantile in binary format.
       const double pct_change_bin = 0.001;    // Minimum percentage-point change to output in binary format
       *bfbin << uint8_t(BINOUT_TABLE_BASIC) << "Memory locality";
-      *bfbin << uint8_t(BINOUT_COL_UINT64) << "Cache size"
-             << uint8_t(BINOUT_COL_UINT64) << "Upper-bound of hit count"
+      *bfbin << uint8_t(BINOUT_COL_UINT64) << "Capacity in bytes"
+             << uint8_t(BINOUT_COL_UINT64) << "Maximum possible hit count"
              << uint8_t(BINOUT_COL_NONE);
       running_total_bytes = 0;
       running_total_accesses = 0;