sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-10-06 00:03:35 -04:00
Code Issues Projects Releases Wiki Activity

automatically activate USE_RASPBERRY_PI define (#1313)

Browse Source 
* automatically activate USE_RASPERRY_PI define

* prefix RASPBERRY_PI define with OQS_
This commit is contained in:
Michael Baentsch 2022-11-18 08:12:19 +01:00 committed by GitHub
parent c520cdb871
commit e9cd9a5c55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.CMake/toolchain_rasppi.cmake
View File

@ -14,3 +14,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
# Unconditionally set for this platform
add_definitions( -DOQS_USE_RASPBERRY_PI )

5
CMakeLists.txt
View File

@ -36,6 +36,11 @@ set(OQS_VERSION_TEXT "0.7.3-dev")
set(OQS_COMPILE_BUILD_TARGET "${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_HOST_SYSTEM}")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# heuristic check to see whether we're running on a RaspberryPi
if(EXISTS "/opt/vc/include/bcm_host.h")
add_definitions( -DOQS_USE_RASPBERRY_PI )
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
set(ARCH "x86_64")
set(ARCH_X86_64 ON)

8
tests/ds_benchmark.h
View File

@ -81,7 +81,7 @@ PRINT_TIMER_FOOTER
* - run when the computer is idle (e.g., shut down all other applications, disable network access if possible, ...)
*/
/* On Raspberry Pi, you need to additionally define the macro _RASPBERRY_PI since
/* On Raspberry Pi, you need to additionally define the macro _OQS_RASPBERRY_PI since
* the high-precision cycle count register is not available to user-space programs.
*/
@ -128,7 +128,7 @@ static uint64_t _bench_rdtsc(void) {
__asm__ volatile(".byte 0x0f, 0x31"
: "=A"(x));
return x;
#elif defined(__arm__) && !defined(_RASPBERRY_PI)
#elif defined(__arm__) && !defined(_OQS_RASPBERRY_PI)
/* Use the ARM performance counters. */
unsigned int value;
/* Read CCNT Register */
@ -154,7 +154,7 @@ static uint64_t _bench_rdtsc(void) {
#endif
}
#if defined(__arm__) && !defined(_RASPBERRY_PI)
#if defined(__arm__) && !defined(_OQS_RASPBERRY_PI)
static void _bench_init_perfcounters(int32_t do_reset, int32_t enable_divider) {
/* In general enable all counters (including cycle counter) */
int32_t value = 1;
@ -205,7 +205,7 @@ static void _bench_init_perfcounters(void) {
double _bench_cycles_x, _bench_cycles_mean, _bench_cycles_delta, _bench_cycles_M2, _bench_cycles_stdev; \
double _bench_time_x, _bench_time_mean, _bench_time_delta, _bench_time_M2, _bench_time_stdev;
#if defined(__arm__) && !defined(_RASPBERRY_PI)
#if defined(__arm__) && !defined(_OQS_RASPBERRY_PI)
#define INITIALIZE_TIMER \
_bench_init_perfcounters(1, 0); \
_bench_iterations = 0; \

4
tests/speed_common.c
View File

@ -7,8 +7,8 @@
#include <oqs/oqs.h>
#if defined(USE_RASPBERRY_PI)
#define _RASPBERRY_PI
#if defined(OQS_USE_RASPBERRY_PI)
#define _OQS_RASPBERRY_PI
#endif
#if defined(OQS_SPEED_USE_ARM_PMU)
#define SPEED_USE_ARM_PMU

4
tests/speed_kem.c
View File

@ -8,8 +8,8 @@
#include <oqs/oqs.h>
#if defined(USE_RASPBERRY_PI)
#define _RASPBERRY_PI
#if defined(OQS_USE_RASPBERRY_PI)
#define _OQS_RASPBERRY_PI
#endif
#if defined(OQS_SPEED_USE_ARM_PMU)
#define SPEED_USE_ARM_PMU

4
tests/speed_sig.c
View File

@ -8,8 +8,8 @@
#include <oqs/oqs.h>
#if defined(USE_RASPBERRY_PI)
#define _RASPBERRY_PI
#if defined(OQS_USE_RASPBERRY_PI)
#define _OQS_RASPBERRY_PI
#endif
#if defined(OQS_SPEED_USE_ARM_PMU)
#define SPEED_USE_ARM_PMU

4
tests/test_aes.c
View File

@ -7,8 +7,8 @@
#include <oqs/oqs.h>
#if defined(USE_RASPBERRY_PI)
#define _RASPBERRY_PI
#if defined(OQS_USE_RASPBERRY_PI)
#define _OQS_RASPBERRY_PI
#endif
#if defined(OQS_SPEED_USE_ARM_PMU)
#define SPEED_USE_ARM_PMU