Skip to content

Commit

Permalink
updated to version 1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
dmolka authored Nov 28, 2016
1 parent 51e59dc commit b81a022
Show file tree
Hide file tree
Showing 19 changed files with 1,589 additions and 511 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
# Contact: [email protected]
###############################################################################

Version 1.5
- added Knights Landing support (AVX512F)
- added error handling for restricted cpu sets for --bind and --threads options

Version 1.4
- added support for Skylake-H (FMA)
- added support for Broadwell-E/EP (FMA)
Expand Down
Binary file modified FIRESTARTER
Binary file not shown.
Binary file modified FIRESTARTER_CUDA
Binary file not shown.
55 changes: 0 additions & 55 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.

END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

{one line to give the program's name and a brief idea of what it does.}
Copyright (C) {year} {name of author}

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

{project} Copyright (C) {year} {fullname}
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".

You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ cuda: FIRESTARTER_CUDA

all: linux cuda

FIRESTARTER: generic.o x86.o main.o work.o x86.o watchdog.o help.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o
${LINUX_CC} -o FIRESTARTER generic.o main.o work.o x86.o watchdog.o help.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o ${LINUX_L_FLAGS}
FIRESTARTER: generic.o x86.o main.o work.o x86.o watchdog.o help.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o avx512_functions.o
${LINUX_CC} -o FIRESTARTER generic.o main.o work.o x86.o watchdog.o help.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o avx512_functions.o ${LINUX_L_FLAGS}

FIRESTARTER_CUDA: generic.o x86.o work.o x86.o watchdog.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o gpu.o main_cuda.o help_cuda.o
${LINUX_CC} -o FIRESTARTER_CUDA generic.o main_cuda.o work.o x86.o watchdog.o help_cuda.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o gpu.o ${LINUX_CUDA_L_FLAGS}
FIRESTARTER_CUDA: generic.o x86.o work.o x86.o watchdog.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o avx512_functions.o gpu.o main_cuda.o help_cuda.o
${LINUX_CC} -o FIRESTARTER_CUDA generic.o main_cuda.o work.o x86.o watchdog.o help_cuda.o sse2_functions.o avx_functions.o fma_functions.o fma4_functions.o avx512_functions.o gpu.o ${LINUX_CUDA_L_FLAGS}

generic.o: generic.c cpu.h
${LINUX_CC} ${OPT} ${LINUX_C_FLAGS} -c generic.c
Expand Down Expand Up @@ -77,6 +77,9 @@ main_cuda.o: main.c work.h cpu.h
help_cuda.o: help.c help.h
${LINUX_CC} ${OPT} ${LINUX_C_FLAGS} -o help_cuda.o -c help.c -DCUDA

avx512_functions.o: avx512_functions.c
${LINUX_CC} ${OPT} ${LINUX_C_FLAGS} -mavx512f -c avx512_functions.c

fma4_functions.o: fma4_functions.c
${LINUX_CC} ${OPT} ${LINUX_C_FLAGS} -mfma4 -mavx -c fma4_functions.c

Expand Down
10 changes: 8 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Supported CPU microarchitectures
- Intel Ivy Bridge
- Intel Haswell
- Intel Skylake
- Intel Knights Landing
- AMD Bulldozer (experimental)

Since version 1.1 it is also possible to create alternating and repetitive
Expand All @@ -54,8 +55,10 @@ Options:
-c | --copyright display copyright information
-w | --warranty display warranty information
-q | --quiet disable output to stdout
-r | --report display additional information (overridden by -q)
-a | --avail list available functions
-i ID | --function=ID specify ID of the load-function to be used
-i ID | --function=ID specify integer ID of the load-function to be
used (as listed by --avail)
-t TIMEOUT | --timeout=TIMEOUT set timeout (seconds) after which FIRESTARTER
terminates itself, default: no timeout
-l LOAD | --load=LOAD set the percentage of high load to LOAD (%),
Expand All @@ -67,9 +70,12 @@ Options:
load and an idle phase, the percentage of
high load is defined by -l
-n COUNT | --threads=COUNT specify the number of threads
-b CPULIST | --bind=CPULIST select certain CPUs (overrides -n)
cannot be combined with -b | --bind, which
implicitly specifies the number of threads
-b CPULIST | --bind=CPULIST select certain CPUs
CPULIST format: "x,y,z", "x-y", "x-y/step",
and any combination of the above
cannot be combined with -n | --threads

CUDA Options:
-g | --gpus number of gpus to use (default: all)
Expand Down
Loading

0 comments on commit b81a022

Please sign in to comment.