diff options
author | 2016-03-12 12:31:13 +0100 | |
---|---|---|
committer | 2016-03-12 12:31:13 +0100 | |
commit | a026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch) | |
tree | e31573822f2359677de519f9f3b600d98e8764cd /benchmarks | |
parent | 477d2abd43984f076b7e45f5527591fa8fd0d241 (diff) | |
parent | dcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff) |
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'benchmarks')
-rw-r--r-- | benchmarks/LICENSE | 27 | ||||
-rw-r--r-- | benchmarks/README.md | 5 | ||||
-rw-r--r-- | benchmarks/eminline_native.cpp | 4 | ||||
-rw-r--r-- | benchmarks/eminline_noasm.cpp | 3 | ||||
-rw-r--r-- | benchmarks/main.cpp | 3 |
5 files changed, 33 insertions, 9 deletions
diff --git a/benchmarks/LICENSE b/benchmarks/LICENSE new file mode 100644 index 00000000000..4d9210d10e1 --- /dev/null +++ b/benchmarks/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2016, MAME Development Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of bsd3 nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/benchmarks/README.md b/benchmarks/README.md new file mode 100644 index 00000000000..00f5aa9922e --- /dev/null +++ b/benchmarks/README.md @@ -0,0 +1,5 @@ +# **Benchmarks** # + +Cointains code by various developers and it is used to benchmark MAME code + +Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) diff --git a/benchmarks/eminline_native.cpp b/benchmarks/eminline_native.cpp index 07bfa02bb1d..9402532fddb 100644 --- a/benchmarks/eminline_native.cpp +++ b/benchmarks/eminline_native.cpp @@ -1,8 +1,6 @@ -// license:BSD-3-Clause -// copyright-holders:Miodrag Milanovic - #include "benchmark/benchmark_api.h" #include "osdcomm.h" +#include "osdcore.h" #include "eminline.h" static void BM_count_leading_zeros_native(benchmark::State& state) { UINT32 cnt = 0x332533; diff --git a/benchmarks/eminline_noasm.cpp b/benchmarks/eminline_noasm.cpp index 43c9e36b020..0344f074c01 100644 --- a/benchmarks/eminline_noasm.cpp +++ b/benchmarks/eminline_noasm.cpp @@ -1,6 +1,3 @@ -// license:BSD-3-Clause -// copyright-holders:Miodrag Milanovic - #include "benchmark/benchmark_api.h" #include <time.h> #include "osdcore.h" diff --git a/benchmarks/main.cpp b/benchmarks/main.cpp index c859b918976..065222a39ff 100644 --- a/benchmarks/main.cpp +++ b/benchmarks/main.cpp @@ -1,6 +1,3 @@ -// license:BSD-3-Clause -// copyright-holders:Miodrag Milanovic - #include "benchmark/benchmark_api.h" BENCHMARK_MAIN();
\ No newline at end of file |