Skip to content

Commit

Permalink
Merge branch 'llvm-5.0' into llvm-4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
spakin committed Mar 2, 2018
2 parents b2bfecf + 31f92be commit 2dd6962
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ A few extra steps are needed to build Byfl on OS X:

3. Use Homebrew to install Byfl:
```bash
brew install https://github.com/losalamos/Byfl/releases/download/v1.5-llvm-3.8.0/byfl15.rb
brew install https://github.com/lanl/Byfl/releases/download/v1.5-llvm-3.8.0/byfl15.rb
```

The preceding procedure installs Byfl 1.5 from the `llvm-3.8` branch of Byfl. If you instead prefer to install a newer, pre-release version of Byfl (still from the `llvm-3.8` branch), you can use Homebrew to install Byfl's dependencies but download Byfl itself from GitHub.
Expand All @@ -62,7 +62,7 @@ brew install llvm38
../configure LLVM_CONFIG=llvm-config-3.8
```

Once you've built and installed Byfl, you'll probably need to set the following environment variables to point Byfl's [compiler wrapper scripts](https://github.com/losalamos/Byfl/wiki) to the version of Clang that Byfl was built against:
Once you've built and installed Byfl, you'll probably need to set the following environment variables to point Byfl's [compiler wrapper scripts](https://github.com/lanl/Byfl/wiki) to the version of Clang that Byfl was built against:
```bash
export BF_CLANGXX=clang++-3.8
export BF_CLANG=clang-3.8
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ Be sure to download the Byfl branch that corresponds to your installed LLVM vers
make
make install
```
procedure should work. See [INSTALL.md](https://github.com/losalamos/Byfl/blob/master/INSTALL.md) for a more complete explanation.
procedure should work. See [INSTALL.md](https://github.com/lanl/Byfl/blob/master/INSTALL.md) for a more complete explanation.

Documentation
-------------

Byfl documentation is maintained in the [Byfl wiki](https://github.com/losalamos/Byfl/wiki) on GitHub.
Byfl documentation is maintained in the [Byfl wiki](https://github.com/lanl/Byfl/wiki) on GitHub.

Copyright and license
---------------------

Los Alamos National Security, LLC (LANS) owns the copyright to Byfl, which it identifies internally as LA-CC-12-039. The license is BSD-ish with a "modifications must be indicated" clause. See [LICENSE.md](https://github.com/losalamos/Byfl/blob/master/LICENSE.md) for the full text.
Los Alamos National Security, LLC (LANS) owns the copyright to Byfl, which it identifies internally as LA-CC-12-039. The license is BSD-ish with a "modifications must be indicated" clause. See [LICENSE.md](https://github.com/lanl/Byfl/blob/master/LICENSE.md) for the full text.

Contact
-------

Scott Pakin, [_pakin@lanl.gov_](mailto:pakin@lanl.gov)

A list of [all contributors to Byfl](https://github.com/losalamos/Byfl/wiki/contributors) is available online.
A list of [all contributors to Byfl](https://github.com/lanl/Byfl/wiki/contributors) is available online.
2 changes: 1 addition & 1 deletion tools/postproc/bf_process_byfl_file.pod
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ the F<.byfl> file.
bfbin2cgrind(1), bfbin2hdf5(1), bfbin2csv(1), bfbin2sqlite3(1),
bfbin2xmlss(1), bf-clang(1), bf-clang++(1), bf-gcc(1), bf-g++(1),
bf-gfortran(1), bf-gccgo(1), L<the Byfl home
page|https://github.com/losalamos/Byfl>
page|https://github.com/lanl/Byfl>

=head1 AUTHOR

Expand Down
2 changes: 1 addition & 1 deletion tools/postproc/bfbin2cgrind.pod
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ KCachegrind for interactive analysis.
bfbin2csv(1), bfbin2hdf5(1), bfbin2hpctk(1), bfbin2sqlite3(1),
bfbin2xmlss(1), bf-clang(1), bf-clang++(1), bf-gcc(1), bf-g++(1),
bf-gfortran(1), bf-gccgo(1), L<the Byfl home
page|https://github.com/losalamos/Byfl>, L<the KCachegrind home
page|https://github.com/lanl/Byfl>, L<the KCachegrind home
page|http://kcachegrind.sourceforge.net/>

=head1 AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion tools/postproc/bfbin2csv.pod
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,4 @@ Scott Pakin, I<pakin@lanl.gov>
awk(1), perl(1), bfbin2cgrind(1), bfbin2hdf5(1), bfbin2hpctk(1),
bfbin2sqlite3(1), bfbin2xmlss(1), bf-clang(1), bf-clang++(1),
bf-gcc(1), bf-g++(1), bf-gfortran(1), bf-gccgo(1), L<the Byfl home
page|https://github.com/losalamos/Byfl/>
page|https://github.com/lanl/Byfl/>
2 changes: 1 addition & 1 deletion tools/postproc/bfbin2hdf5.pod
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ on that named pipe:
bfbin2cgrind(1), bfbin2csv(1), bfbin2hpctk(1), bfbin2sqlite3(1),
bfbin2xmlss(1), bf-clang(1), bf-clang++(1), bf-gcc(1), bf-g++(1),
bf-gfortran(1), bf-gccgo(1), L<the Byfl home
page|https://github.com/losalamos/Byfl>, L<the HDF5 home
page|https://github.com/lanl/Byfl>, L<the HDF5 home
page|http://www.hdfgroup.org/HDF5/>

=head1 AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion tools/postproc/bfbin2hpctk.pod
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ L<hpcviewer|http://hpctoolkit.org/man/hpcviewer.html>(1),
bfbin2cgrind(1), bfbin2csv(1), bfbin2hdf5(1), bfbin2sqlite3(1),
bfbin2xmlss(1), bf-clang(1), bf-clang++(1), bf-gcc(1), bf-g++(1),
bf-gfortran(1), bf-gccgo(1), L<the Byfl home
page|https://github.com/losalamos/Byfl>, L<the HPCToolkit home
page|https://github.com/lanl/Byfl>, L<the HPCToolkit home
page|http://hpctoolkit.org/>

=head1 AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion tools/postproc/bfbin2sqlite3.pod
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ B<bfbin2sqlite3> on that named pipe:
sqlite3(1), bfbin2cgrind(1), bfbin2csv(1), bfbin2hdf5(1),
bfbin2hpctk(1), bfbin2xmlss(1), bf-clang(1), bf-clang++(1), bf-gcc(1),
bf-g++(1), bf-gfortran(1), bf-gccgo(1), L<the Byfl home
page|https://github.com/losalamos/Byfl/>, L<the SQLite home
page|https://github.com/lanl/Byfl/>, L<the SQLite home
page|http://www.sqlite.org/>

=head1 AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion tools/postproc/bfbin2xmlss.pod
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ on that named pipe:
bfbin2cgrind(1), bfbin2csv(1), bfbin2hdf5(1), bfbin2hpctk(1),
bfbin2sqlite3(1), bf-clang(1), bf-clang++(1), bf-gcc(1), bf-g++(1),
bf-gfortran(1), bf-gccgo(1), L<the Byfl home
page|https://github.com/losalamos/Byfl>, L<the XML Spreadsheet
page|https://github.com/lanl/Byfl>, L<the XML Spreadsheet
Reference|http://msdn.microsoft.com/en-us/library/aa140066%28office.10%29.aspx>

=head1 AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion tools/wrappers/bf-clang.in
Original file line number Diff line number Diff line change
Expand Up @@ -483,4 +483,4 @@ Scott Pakin, I<pakin@lanl.gov>
=head1 SEE ALSO
clang(1),
L<the Byfl home page|https://github.com/losalamos/Byfl>
L<the Byfl home page|https://github.com/lanl/Byfl>
2 changes: 1 addition & 1 deletion tools/wrappers/bf-gcc.in
Original file line number Diff line number Diff line change
Expand Up @@ -947,4 +947,4 @@ Scott Pakin, I<pakin@lanl.gov>
=head1 SEE ALSO
gcc(1), clang(1),
L<the Byfl home page|https://github.com/losalamos/Byfl>
L<the Byfl home page|https://github.com/lanl/Byfl>
2 changes: 1 addition & 1 deletion tools/wrappers/bf-inst.in
Original file line number Diff line number Diff line change
Expand Up @@ -358,4 +358,4 @@ Scott Pakin, I<pakin@lanl.gov>
=head1 SEE ALSO
ar(1), bf-clang(1), clang(1), opt(1),
L<the Byfl README file|https://github.com/losalamos/Byfl/blob/master/README.md>
L<the Byfl README file|https://github.com/lanl/Byfl/blob/master/README.md>
2 changes: 1 addition & 1 deletion tools/wrappers/byfl-clang.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libs=-lbyfl @LIBS@ -lstdc++

Name: byfl-clang
Description: Instrument Clang-compiled programs with Byfl
URL: https://github.com/losalamos/Byfl
URL: https://github.com/lanl/Byfl
Version: @VERSION@
Cflags: -Xclang -load -Xclang ${plugindir}/bytesflops.so
Libs: -L${libdir} ${ldflags} ${libs}

0 comments on commit 2dd6962

Please sign in to comment.