SHA256
1
0
forked from pool/benchmark

Accepting request 452974 from devel:tools

- Update to version 1.1.0:
  * ArgNames support
  * Fixes for OSX and Cygwin and MSVC builds
  * PauseTiming and ResumeTiming are per thread (#286)
  * Better Range and Arg specifications
  * Complexity reporting

- add support for s390x:
  * benchmark-s390.patch

OBS-URL: https://build.opensuse.org/request/show/452974
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/benchmark?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2017-01-31 11:41:33 +00:00 committed by Git OBS Bridge
commit 069a9ac223
5 changed files with 43 additions and 10 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2206c263fc1a7803d4b10e164e0c225f6bcf0d5e5f20b87929f137dee247b54
size 58944

3
benchmark-1.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7334dd254434c6668e33a54c8f839194c7c61840d52f4b6258eee28e9f3b20e
size 87199

16
benchmark-s390.patch Normal file
View File

@ -0,0 +1,16 @@
Index: src/cycleclock.h
===================================================================
--- src/cycleclock.h.orig
+++ src/cycleclock.h
@@ -132,6 +132,11 @@ inline BENCHMARK_ALWAYS_INLINE int64_t N
struct timeval tv;
gettimeofday(&tv, nullptr);
return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
+#elif defined(__s390__)
+ // found this for papi package
+ unsigned long long ret;
+ __asm__("stck 0(%0)" : : "a" (&(ret)) : "memory", "cc");
+ return (long long)ret;
#else
// The soft failover to a generic implementation is automatic only for ARM.
// For other platforms the developer is expected to make an attempt to create

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jan 27 14:46:11 UTC 2017 - mpluskal@suse.com
- Update to version 1.1.0:
* ArgNames support
* Fixes for OSX and Cygwin and MSVC builds
* PauseTiming and ResumeTiming are per thread (#286)
* Better Range and Arg specifications
* Complexity reporting
-------------------------------------------------------------------
Fri Jan 27 14:28:26 UTC 2017 - bg@suse.com
- add support for s390x:
* benchmark-s390.patch
-------------------------------------------------------------------
Sat Nov 12 13:43:21 CET 2016 - ro@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package benchmark
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,18 +19,19 @@
%define soname lib%{name}
%define sover 0
Name: benchmark
Version: 1.0.0
Version: 1.1.0
Release: 0
Summary: A microbenchmark support library
License: Apache-2.0
Group: Development/Libraries/C and C++
Url: https://github.com/google/benchmark
Source: https://github.com/google/benchmark/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FEATURE-UPSTREAM benchmark-s390.patch
Patch: benchmark-s390.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: git-core
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
ExclusiveArch: %ix86 x86_64 s390x
%description
A library to support the benchmarking of functions, similar to unit-tests.
@ -52,6 +53,7 @@ Development files for google benchmark library
%prep
%setup -q
%patch
%build
%if %{__isa_bits} == 64
@ -59,9 +61,8 @@ sed -i "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION lib64|g" src/CMakeLists.tx
%endif
%cmake \
-DBENCHMARK_ENABLE_LTO=off \
-DBENCHMARK_ENABLE_TESTING=true \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
make %{?_smp_mflags}
-DBENCHMARK_ENABLE_TESTING=true
%make_jobs
%install
%cmake_install