diff --git a/Makefile b/Makefile index 6fd77c7..af04584 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ ifneq ($(OS),Windows_NT) os := $(shell uname -s) ifeq ($(os), Linux) - SOURCE += $(SRC_DIR)freq/freq.c freq_nov.o freq_sse.o freq_avx.o freq_avx512.o + SOURCE += $(SRC_DIR)freq/freq.c freq_nov.o freq_avx.o freq_avx512.o HEADERS += $(SRC_DIR)freq/freq.h CFLAGS += -pthread endif @@ -73,9 +73,6 @@ strict: $(OUTPUT) freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h $(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@ -freq_sse.o: Makefile $(SRC_DIR)freq/freq_sse.c $(SRC_DIR)freq/freq_sse.h - $(CC) $(CFLAGS) $(SANITY_FLAGS) -c -msse -pthread $(SRC_DIR)freq/freq_sse.c -o $@ - freq_avx.o: Makefile $(SRC_DIR)freq/freq_avx.c $(SRC_DIR)freq/freq_avx.h $(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx -mfma -pthread $(SRC_DIR)freq/freq_avx.c -o $@ diff --git a/src/common/main.c b/src/common/main.c index c6706c5..f0ad082 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -33,7 +33,7 @@ static const char* OS_STR = "Unknown OS"; #endif -static const char* VERSION = "1.00"; +static const char* VERSION = "1.01"; void print_help(char *argv[]) { const char **t = args_str; diff --git a/src/x86/freq/freq.c b/src/x86/freq/freq.c index b23233f..def701b 100644 --- a/src/x86/freq/freq.c +++ b/src/x86/freq/freq.c @@ -5,7 +5,6 @@ #include "../uarch.h" #include "freq.h" #include "freq_nov.h" -#include "freq_sse.h" #include "freq_avx.h" #include "freq_avx512.h" @@ -102,11 +101,6 @@ int64_t measure_frequency(struct cpuInfo* cpu) { compute_function = compute_avx; num_spaces = 42; } - else if(cpu->feat->SSE) { - printf("cpufetch is measuring the SSE frequency..."); - compute_function = compute_sse; - num_spaces = 42; - } else { printf("cpufetch is measuring the frequency (no vector instructions)..."); compute_function = compute_nov; diff --git a/src/x86/freq/freq.h b/src/x86/freq/freq.h index 80f99d2..d757e63 100644 --- a/src/x86/freq/freq.h +++ b/src/x86/freq/freq.h @@ -5,7 +5,7 @@ #include "../../common/cpu.h" #define MEASURE_TIME_SECONDS 5 -#define LOOP_ITERS 100000000 +#define LOOP_ITERS 1000000000 int64_t measure_frequency(struct cpuInfo* cpu); diff --git a/src/x86/freq/freq_sse.c b/src/x86/freq/freq_sse.c deleted file mode 100644 index aba3506..0000000 --- a/src/x86/freq/freq_sse.c +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "freq.h" - -void* compute_sse() { - bool end = false; - - struct timeval begin, now; - - __m128 a = _mm_set1_ps(1.5); - __m128 b = _mm_set1_ps(1.2); - __m128 c = _mm_set1_ps(0.0); - - gettimeofday(&begin, NULL); - while(!end) { - for(uint64_t i=0; i < LOOP_ITERS; i++) { - c = _mm_add_ps(a, b); - } - - gettimeofday(&now, NULL); - double elapsed = (now.tv_sec - begin.tv_sec) + ((now.tv_usec - begin.tv_usec)/1000000.0); - end = elapsed >= (double) MEASURE_TIME_SECONDS; - } - - FILE* fp = fopen("/dev/null", "w"); - if(fp == NULL) { - printf("fopen: %s", strerror(errno)); - } - else { - fprintf(fp, "%f", c[0]); - fclose(fp); - } - - return NULL; -} - diff --git a/src/x86/freq/freq_sse.h b/src/x86/freq/freq_sse.h deleted file mode 100644 index 73869ca..0000000 --- a/src/x86/freq/freq_sse.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __FREQ_SSE__ -#define __FREQ_SSE__ - -void* compute_sse(); - -#endif