diff --git a/main.c b/main.c index 445f478..e3f6764 100644 --- a/main.c +++ b/main.c @@ -31,7 +31,7 @@ int main() { struct cache* cach = new_cache(); struct frequency* freq = new_frequency(); - struct ascii* ascii = set_ascii(getCPUVendorInternal(cpu)); + struct ascii* art = set_ascii(getCPUVendorInternal(cpu)); char* cpuName = getString_CPUName(); char* maxFrequency = getString_MaxFrequency(freq); @@ -46,65 +46,21 @@ int main() { char* l3 = getString_L3(cach); char* pp = getPeakPerformance(cpu,getFrequency(freq)); - print_ascii(ascii,__COUNTER__); - printf("\n"); + setAttribute(art,ATTRIBUTE_NAME,cpuName); + setAttribute(art,ATTRIBUTE_ARCH,"x86_64"); + setAttribute(art,ATTRIBUTE_FREQUENCY,maxFrequency); + setAttribute(art,ATTRIBUTE_NCORES,nCores); + setAttribute(art,ATTRIBUTE_AVX,avx); + setAttribute(art,ATTRIBUTE_SSE,sse); + setAttribute(art,ATTRIBUTE_FMA,fma); + setAttribute(art,ATTRIBUTE_AES,aes); + setAttribute(art,ATTRIBUTE_SHA,sha); + setAttribute(art,ATTRIBUTE_L1,l1); + setAttribute(art,ATTRIBUTE_L2,l2); + setAttribute(art,ATTRIBUTE_L3,l3); + setAttribute(art,ATTRIBUTE_PEAK,pp); - print_ascii(ascii,__COUNTER__); - printf("\n"); - - print_ascii(ascii,__COUNTER__); - printf("\n"); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_NAME,cpuName); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_ARCH,"x86_64"); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_FREQUENCY,maxFrequency); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_NCORES,nCores); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_AVX,avx); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_SSE,sse); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_FMA,fma); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_AES,aes); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_SHA,sha); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_L1,l1); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_L2,l2); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_L3,l3); - - print_ascii(ascii,__COUNTER__); - print_text(ascii,TITLE_PEAK,pp); - - print_ascii(ascii,__COUNTER__); - printf("\n"); - - print_ascii(ascii,__COUNTER__); - printf("\n"); - - print_ascii(ascii,__COUNTER__); - printf("\n"); - - print_ascii(ascii,__COUNTER__); - printf("\n"); + print_ascii(art); free(cpuName); free(maxFrequency); @@ -120,7 +76,7 @@ int main() { free(pp); free(cpu); - free(ascii); + free(art); freeCache(cach); freeFrequency(freq); diff --git a/printer.c b/printer.c index 7dbd727..3524c38 100644 --- a/printer.c +++ b/printer.c @@ -11,13 +11,50 @@ #define COL_AMD_2 "\x1b[32;1m" #define RESET "\x1b[0m" +#define TITLE_NAME "Name: " +#define TITLE_ARCH "Arch: " +#define TITLE_FREQUENCY "Frequency: " +#define TITLE_NCORES "N.Cores: " +#define TITLE_AVX "AVX: " +#define TITLE_SSE "SSE: " +#define TITLE_FMA "FMA: " +#define TITLE_AES "AES: " +#define TITLE_SHA "SHA: " +#define TITLE_L1 "L1 Size: " +#define TITLE_L2 "L2 Size: " +#define TITLE_L3 "L3 Size: " +#define TITLE_PEAK "Peak FLOPS: " + +static const char* ATTRIBUTE_FIELDS [ATTRIBUTE_COUNT] = { TITLE_NAME, TITLE_ARCH, TITLE_FREQUENCY, + TITLE_NCORES, TITLE_AVX, TITLE_SSE, + TITLE_FMA, TITLE_AES, TITLE_SHA, + TITLE_L1, TITLE_L2, TITLE_L3, + TITLE_PEAK }; + +static const int ATTRIBUTE_LIST[ATTRIBUTE_COUNT] = { ATTRIBUTE_NAME, ATTRIBUTE_ARCH, ATTRIBUTE_FREQUENCY, + ATTRIBUTE_NCORES, ATTRIBUTE_AVX, ATTRIBUTE_SSE, + ATTRIBUTE_FMA, ATTRIBUTE_AES, ATTRIBUTE_SHA, + ATTRIBUTE_L1, ATTRIBUTE_L2, ATTRIBUTE_L3, + ATTRIBUTE_PEAK }; + struct ascii { char art[NUMBER_OF_LINES][LINE_SIZE]; char color1[10]; char color2[10]; + char* atributes[ATTRIBUTE_COUNT]; VENDOR vendor; }; +int setAttribute(struct ascii* art, int type, char* value) { + int i = 0; + while(i < ATTRIBUTE_COUNT && type != ATTRIBUTE_LIST[i]) + i++; + if(i == ATTRIBUTE_COUNT) + return BOOLEAN_FALSE; + art->atributes[i] = value; + return BOOLEAN_TRUE; +} + struct ascii* set_ascii(VENDOR cpuVendor) { struct ascii* art = malloc(sizeof(struct ascii)); art->vendor = cpuVendor; @@ -74,15 +111,12 @@ struct ascii* set_ascii(VENDOR cpuVendor) { return art; } -void print_text(struct ascii* art,char* title, char* text) { - printf("%s%s%s%s"RESET"\n",art->color1,title,art->color2,text); -} - -void print_ascii(struct ascii* art, int n) { +void print_ascii_intel(struct ascii* art) { int flag = BOOLEAN_FALSE; - if(art->vendor == VENDOR_INTEL) { - /*** PRINT ASCII WITH SHADOW ***/ + for(int n=0;nart[n][i] == ' ') { @@ -101,9 +135,18 @@ void print_ascii(struct ascii* art, int n) { printf("%c",art->art[n][i]); } } + + /*** PRINT ATTRIBUTE ***/ + if(n>2 && ncolor1,ATTRIBUTE_FIELDS[n-3],art->color2,art->atributes[n-3]); + else printf("\n"); } - else { - /*** PRINT TEXT AND LOGO IN DIFFERENT COLOR ***/ +} + +void print_ascii_amd(struct ascii* art) { + int flag = BOOLEAN_FALSE; + + for(int n=0;nart[n][i] == '@') printf("%s%c" RESET,art->color1,art->art[n][i]); @@ -112,21 +155,17 @@ void print_ascii(struct ascii* art, int n) { else printf("%c",art->art[n][i]); } + + /*** PRINT ATTRIBUTE ***/ + if(n>2 && ncolor1,ATTRIBUTE_FIELDS[n-3],art->color2,art->atributes[n-3]); + else printf("\n"); } } -/*** PRINT ASCII SIMPLE ***/ -/* -void print_ascii(struct ascii* art, int n) { - int flag = BOOLEAN_FALSE; - - for(int i=0;iart[n][i] != ' ') - printf(BLUE "%c" RESET,art->art[n][i]); - else - printf("%c",art->art[n][i]); - } - +void print_ascii(struct ascii* art) { + if(art->vendor == VENDOR_INTEL) + print_ascii_intel(art); + else + print_ascii_amd(art); } -*/ diff --git a/printer.h b/printer.h index baa2cd9..0e48630 100644 --- a/printer.h +++ b/printer.h @@ -7,24 +7,25 @@ struct ascii; struct ascii* set_ascii(VENDOR cpuVendor); -void print_ascii(struct ascii* art, int n); -void print_text(struct ascii* art,char* title, char* text); +void print_ascii(struct ascii* art); +int setAttribute(struct ascii* art, int type, char* value); #define BOOLEAN_TRUE 1 #define BOOLEAN_FALSE 0 -#define TITLE_NAME "Name: " -#define TITLE_ARCH "Arch: " -#define TITLE_FREQUENCY "Frequency: " -#define TITLE_NCORES "N.Cores: " -#define TITLE_AVX "AVX: " -#define TITLE_SSE "SSE: " -#define TITLE_FMA "FMA: " -#define TITLE_AES "AES: " -#define TITLE_SHA "SHA: " -#define TITLE_L1 "L1 Size: " -#define TITLE_L2 "L2 Size: " -#define TITLE_L3 "L3 Size: " -#define TITLE_PEAK "Peak FLOPS: " +#define ATTRIBUTE_COUNT 13 +#define ATTRIBUTE_NAME 0 +#define ATTRIBUTE_ARCH 1 +#define ATTRIBUTE_FREQUENCY 2 +#define ATTRIBUTE_NCORES 3 +#define ATTRIBUTE_AVX 4 +#define ATTRIBUTE_SSE 5 +#define ATTRIBUTE_FMA 6 +#define ATTRIBUTE_AES 7 +#define ATTRIBUTE_SHA 8 +#define ATTRIBUTE_L1 9 +#define ATTRIBUTE_L2 10 +#define ATTRIBUTE_L3 11 +#define ATTRIBUTE_PEAK 12 #endif