Franscobec/gpufetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor attributes; introduce AttributeField struct to store the ID, long and short names

Browse Source
This commit is contained in:
Dr-Noob
2025-10-16 19:48:21 +02:00
parent c9e652686a
commit 9f40cafada
1 changed files with 69 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/common/printer.cpp
View File

@@ -32,14 +32,22 @@
#define MAX_ATTRIBUTES 100 #define MAX_ATTRIBUTES 100
#define MAX_TERM_SIZE 1024 #define MAX_TERM_SIZE 1024
typedef struct {
int id;
const char *name;
const char *shortname;
} AttributeField;
// AttributeField IDs
// Used by
enum { enum {
ATTRIBUTE_NAME, ATTRIBUTE_NAME, // ALL
ATTRIBUTE_CHIP, ATTRIBUTE_CHIP, // ALL
ATTRIBUTE_UARCH, ATTRIBUTE_UARCH, // ALL
ATTRIBUTE_TECHNOLOGY, ATTRIBUTE_TECHNOLOGY, // ALL
ATTRIBUTE_GT, // Intel ATTRIBUTE_GT, // Intel
ATTRIBUTE_FREQUENCY, ATTRIBUTE_FREQUENCY, // ALL
ATTRIBUTE_COMPUTE_UNITS,// CUDA ATTRIBUTE_COMPUTE_UNITS, // HSA
ATTRIBUTE_STREAMINGMP, // CUDA ATTRIBUTE_STREAMINGMP, // CUDA
ATTRIBUTE_CORESPERMP, // CUDA ATTRIBUTE_CORESPERMP, // CUDA
ATTRIBUTE_CUDA_CORES, // CUDA ATTRIBUTE_CUDA_CORES, // CUDA
@@ -49,50 +57,29 @@ enum {
ATTRIBUTE_MEMORY, // CUDA ATTRIBUTE_MEMORY, // CUDA
ATTRIBUTE_MEMORY_FREQ, // CUDA ATTRIBUTE_MEMORY_FREQ, // CUDA
ATTRIBUTE_BUS_WIDTH, // CUDA ATTRIBUTE_BUS_WIDTH, // CUDA
ATTRIBUTE_PEAK, ATTRIBUTE_PEAK, // ALL
ATTRIBUTE_PEAK_TENSOR, // CUDA ATTRIBUTE_PEAK_TENSOR // CUDA
}; };
static const char* ATTRIBUTE_FIELDS [] = { static const AttributeField ATTRIBUTE_INFO[] = {
"Name:", { ATTRIBUTE_NAME, "Name:", "Name:" },
"GPU processor:", { ATTRIBUTE_CHIP, "GPU processor:", "Processor:" },
"Microarchitecture:", { ATTRIBUTE_UARCH, "Microarchitecture:", "uArch:" },
"Technology:", { ATTRIBUTE_TECHNOLOGY, "Technology:", "Technology:" },
"Graphics Tier:", { ATTRIBUTE_GT, "Graphics Tier:", "GT:" },
"Max Frequency:", { ATTRIBUTE_FREQUENCY, "Max Frequency:", "Max Freq.:" },
"Compute Units (CUs):", { ATTRIBUTE_COMPUTE_UNITS, "Compute Units (CUs)", "CUs" },
"SMs:", { ATTRIBUTE_STREAMINGMP, "SMs:", "SMs:" },
"Cores/SM:", { ATTRIBUTE_CORESPERMP, "Cores/SM:", "Cores/SM:" },
"CUDA Cores:", { ATTRIBUTE_CUDA_CORES, "CUDA Cores:", "CUDA Cores:" },
"Tensor Cores:", { ATTRIBUTE_TENSOR_CORES, "Tensor Cores:", "Tensor Cores:" },
"Execution Units:", { ATTRIBUTE_EUS, "Execution Units:", "EUs:" },
"L2 Size:", { ATTRIBUTE_L2, "L2 Size:", "L2 Size:" },
"Memory:", { ATTRIBUTE_MEMORY, "Memory:", "Memory:" },
"Memory frequency:", { ATTRIBUTE_MEMORY_FREQ, "Memory frequency:", "Memory freq.:" },
"Bus width:", { ATTRIBUTE_BUS_WIDTH, "Bus width:", "Bus width:" },
"Peak Performance:", { ATTRIBUTE_PEAK, "Peak Performance:", "Peak Perf.:" },
"Peak Performance (MMA):", { ATTRIBUTE_PEAK_TENSOR, "Peak Performance (MMA):", "Peak Perf.(MMA):" },
};
static const char* ATTRIBUTE_FIELDS_SHORT [] = {
"Name:",
"Processor:",
"uArch:",
"Technology:",
"GT:",
"Max Freq.:",
"CUs:",
"SMs:",
"Cores/SM:",
"CUDA Cores:",
"Tensor Cores:",
"EUs:",
"L2 Size:",
"Memory:",
"Memory freq.:",
"Bus width:",
"Peak Perf.:",
"Peak Perf.(MMA):",
}; };
struct terminal { struct terminal {
@@ -279,13 +266,14 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter
} }
} }
uint32_t longest_attribute_length(struct ascii* art, const char** attribute_fields) { uint32_t longest_attribute_length(struct ascii* art, bool use_short) {
uint32_t max = 0; uint32_t max = 0;
uint64_t len = 0; uint64_t len = 0;
for(uint32_t i=0; i < art->n_attributes_set; i++) { for(uint32_t i=0; i < art->n_attributes_set; i++) {
if(art->attributes[i]->value != NULL) { if(art->attributes[i]->value != NULL) {
len = strlen(attribute_fields[art->attributes[i]->type]); const char* str = use_short ? ATTRIBUTE_INFO[art->attributes[i]->type].shortname : ATTRIBUTE_INFO[art->attributes[i]->type].name;
len = strlen(str);
if(len > max) max = len; if(len > max) max = len;
} }
} }
@@ -309,7 +297,7 @@ uint32_t longest_field_length(struct ascii* art, int la) {
return max; return max;
} }
void print_ascii_generic(struct ascii* art, uint32_t la, int32_t text_space, const char** attribute_fields) { void print_ascii_generic(struct ascii* art, uint32_t la, int32_t text_space, bool use_short) {
struct ascii_logo* logo = art->art; struct ascii_logo* logo = art->art;
int attr_to_print = 0; int attr_to_print = 0;
int attr_type; int attr_type;
@@ -353,11 +341,13 @@ void print_ascii_generic(struct ascii* art, uint32_t la, int32_t text_space, con
attr_value = art->attributes[attr_to_print]->value; attr_value = art->attributes[attr_to_print]->value;
attr_to_print++; attr_to_print++;
space_right = 1 + (la - strlen(attribute_fields[attr_type])); const char* attr_str = use_short ? ATTRIBUTE_INFO[attr_type].shortname : ATTRIBUTE_INFO[attr_type].name;
space_right = 1 + (la - strlen(attr_str));
current_space = max(0, text_space); current_space = max(0, text_space);
printf("%s%.*s%s", logo->color_text[0], current_space, attribute_fields[attr_type], art->reset); printf("%s%.*s%s", logo->color_text[0], current_space, attr_str, art->reset);
current_space = max(0, current_space - (int) strlen(attribute_fields[attr_type])); current_space = max(0, current_space - (int) strlen(attr_str));
printf("%*s", min(current_space, space_right), ""); printf("%*s", min(current_space, space_right), "");
current_space = max(0, current_space - min(current_space, space_right)); current_space = max(0, current_space - min(current_space, space_right));
printf("%s%.*s%s", logo->color_text[1], current_space, attr_value, art->reset); printf("%s%.*s%s", logo->color_text[1], current_space, attr_value, art->reset);
@@ -391,19 +381,19 @@ bool print_gpufetch_intel(struct gpu_info* gpu, STYLE s, struct color** cs, stru
setAttribute(art, ATTRIBUTE_EUS, eus); setAttribute(art, ATTRIBUTE_EUS, eus);
setAttribute(art, ATTRIBUTE_PEAK, pp); setAttribute(art, ATTRIBUTE_PEAK, pp);
const char** attribute_fields = ATTRIBUTE_FIELDS; bool use_short = false;
uint32_t longest_attribute = longest_attribute_length(art, attribute_fields); uint32_t longest_attribute = longest_attribute_length(art, use_short);
uint32_t longest_field = longest_field_length(art, longest_attribute); uint32_t longest_field = longest_field_length(art, longest_attribute);
choose_ascii_art(art, cs, term, longest_field); choose_ascii_art(art, cs, term, longest_field);
if(!ascii_fits_screen(term->w, *art->art, longest_field)) { if(!ascii_fits_screen(term->w, *art->art, longest_field)) {
// Despite of choosing the smallest logo, the output does not fit // Despite of choosing the smallest logo, the output does not fit
// Choose the shorter field names and recalculate the longest attr // Choose the shorter field names and recalculate the longest attr
attribute_fields = ATTRIBUTE_FIELDS_SHORT; use_short = true;
longest_attribute = longest_attribute_length(art, attribute_fields); longest_attribute = longest_attribute_length(art, use_short);
} }
print_ascii_generic(art, longest_attribute, term->w - art->art->width, attribute_fields); print_ascii_generic(art, longest_attribute, term->w - art->art->width, use_short);
return true; return true;
} }
@@ -460,19 +450,19 @@ bool print_gpufetch_cuda(struct gpu_info* gpu, STYLE s, struct color** cs, struc
setAttribute(art, ATTRIBUTE_PEAK_TENSOR, pp_tensor); setAttribute(art, ATTRIBUTE_PEAK_TENSOR, pp_tensor);
} }
const char** attribute_fields = ATTRIBUTE_FIELDS; bool use_short = false;
uint32_t longest_attribute = longest_attribute_length(art, attribute_fields); uint32_t longest_attribute = longest_attribute_length(art, use_short);
uint32_t longest_field = longest_field_length(art, longest_attribute); uint32_t longest_field = longest_field_length(art, longest_attribute);
choose_ascii_art(art, cs, term, longest_field); choose_ascii_art(art, cs, term, longest_field);
if(!ascii_fits_screen(term->w, *art->art, longest_field)) { if(!ascii_fits_screen(term->w, *art->art, longest_field)) {
// Despite of choosing the smallest logo, the output does not fit // Despite of choosing the smallest logo, the output does not fit
// Choose the shorter field names and recalculate the longest attr // Choose the shorter field names and recalculate the longest attr
attribute_fields = ATTRIBUTE_FIELDS_SHORT; use_short = true;
longest_attribute = longest_attribute_length(art, attribute_fields); longest_attribute = longest_attribute_length(art, use_short);
} }
print_ascii_generic(art, longest_attribute, term->w - art->art->width, attribute_fields); print_ascii_generic(art, longest_attribute, term->w - art->art->width, use_short);
free(manufacturing_process); free(manufacturing_process);
free(max_frequency); free(max_frequency);
@@ -509,19 +499,19 @@ bool print_gpufetch_amd(struct gpu_info* gpu, STYLE s, struct color** cs, struct
setAttribute(art, ATTRIBUTE_FREQUENCY, max_frequency); setAttribute(art, ATTRIBUTE_FREQUENCY, max_frequency);
setAttribute(art, ATTRIBUTE_COMPUTE_UNITS, cus); setAttribute(art, ATTRIBUTE_COMPUTE_UNITS, cus);
const char** attribute_fields = ATTRIBUTE_FIELDS; bool use_short = false;
uint32_t longest_attribute = longest_attribute_length(art, attribute_fields); uint32_t longest_attribute = longest_attribute_length(art, use_short);
uint32_t longest_field = longest_field_length(art, longest_attribute); uint32_t longest_field = longest_field_length(art, longest_attribute);
choose_ascii_art(art, cs, term, longest_field); choose_ascii_art(art, cs, term, longest_field);
if(!ascii_fits_screen(term->w, *art->art, longest_field)) { if(!ascii_fits_screen(term->w, *art->art, longest_field)) {
// Despite of choosing the smallest logo, the output does not fit // Despite of choosing the smallest logo, the output does not fit
// Choose the shorter field names and recalculate the longest attr // Choose the shorter field names and recalculate the longest attr
attribute_fields = ATTRIBUTE_FIELDS_SHORT; use_short = true;
longest_attribute = longest_attribute_length(art, attribute_fields); longest_attribute = longest_attribute_length(art, use_short);
} }
print_ascii_generic(art, longest_attribute, term->w - art->art->width, attribute_fields); print_ascii_generic(art, longest_attribute, term->w - art->art->width, use_short);
free(art->attributes); free(art->attributes);
free(art); free(art);