KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/perfcntrs: Re-indent 

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10293>
This commit is contained in:
Rob Clark 2021-04-16 11:59:30 -07:00 committed by Marge Bot
parent d26a224ca9
commit 6050976232
8 changed files with 2850 additions and 2859 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/freedreno/perfcntrs/fdperf.c
View File

@ -23,16 +23,16 @@
*/
#include <assert.h>
#include <curses.h>
#include <err.h>
#include <inttypes.h>
#include <libconfig.h>
#include <locale.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <time.h>
#include <curses.h>
#include <libconfig.h>
#include <inttypes.h>
#include <xf86drm.h>
#include "drm/freedreno_drmif.h"
@ -136,9 +136,7 @@ find_device(void)
#define CHIP_FMT "d%d%d.%d"
#define CHIP_ARGS(chipid) \
((chipid) >> 24) & 0xff, \
((chipid) >> 16) & 0xff, \
((chipid) >> 8) & 0xff, \
((chipid) >> 24) & 0xff, ((chipid) >> 16) & 0xff, ((chipid) >> 8) & 0xff, \
((chipid) >> 0) & 0xff
printf("device: a%" CHIP_FMT "\n", CHIP_ARGS(dev.chipid));
@ -196,8 +194,8 @@ select_counter(struct counter_group *group, int ctr, int n)
if (!dev.submit) {
dev.submit = fd_submit_new(dev.pipe);
dev.ring = fd_submit_new_ringbuffer(dev.submit, 0x1000,
FD_RINGBUFFER_PRIMARY | FD_RINGBUFFER_GROWABLE);
dev.ring = fd_submit_new_ringbuffer(
dev.submit, 0x1000, FD_RINGBUFFER_PRIMARY | FD_RINGBUFFER_GROWABLE);
}
/* bashing select register directly while gpu is active will end
@ -322,8 +320,7 @@ redraw_footer(WINDOW *win)
int n;
n = asprintf(&footer, " fdperf: a%" CHIP_FMT " (%.2fMHz..%.2fMHz)",
CHIP_ARGS(dev.chipid),
((float)dev.min_freq) / 1000000.0,
CHIP_ARGS(dev.chipid), ((float)dev.min_freq) / 1000000.0,
((float)dev.max_freq) / 1000000.0);
wmove(win, h - 1, 0);
@ -409,8 +406,8 @@ redraw_counter_value_raw(WINDOW *win, float val)
}
static void
redraw_counter(WINDOW *win, int row, struct counter_group *group,
int ctr, bool selected)
redraw_counter(WINDOW *win, int row, struct counter_group *group, int ctr,
bool selected)
{
redraw_counter_label(win, row, group->label[ctr], selected);
@ -428,8 +425,7 @@ redraw_counter(WINDOW *win, int row, struct counter_group *group,
* shader as a306 we might need to scale the result..
*/
if (strstr(group->label[ctr], "CYCLE") ||
strstr(group->label[ctr], "BUSY") ||
strstr(group->label[ctr], "IDLE"))
strstr(group->label[ctr], "BUSY") || strstr(group->label[ctr], "IDLE"))
redraw_counter_value_cycles(win, group->current[ctr]);
else
redraw_counter_value_raw(win, group->current[ctr]);
@ -512,7 +508,6 @@ current_counter(int *ctr)
n++;
}
for (; j < group->group->num_counters; j++) {
if (n == current_cntr) {
if (ctr)
@ -735,14 +730,17 @@ setup_counter_groups(const struct fd_perfcntr_group *groups)
for (unsigned j = 0; j < group->group->num_counters; j++) {
group->counter[j].counter = &group->group->counters[j];
group->counter[j].val_hi = dev.io + (group->counter[j].counter->counter_reg_hi * 4);
group->counter[j].val_lo = dev.io + (group->counter[j].counter->counter_reg_lo * 4);
group->counter[j].val_hi =
dev.io + (group->counter[j].counter->counter_reg_hi * 4);
group->counter[j].val_lo =
dev.io + (group->counter[j].counter->counter_reg_lo * 4);
group->counter[j].select_val = j;
}
for (unsigned j = 0; j < group->group->num_countables; j++) {
ctr_width = MAX2(ctr_width, strlen(group->group->countables[j].name) + 1);
ctr_width =
MAX2(ctr_width, strlen(group->group->countables[j].name) + 1);
}
}
}
@ -771,8 +769,7 @@ config_save(void)
for (; j < group->group->num_counters; j++) {
char name[] = "counter0000";
sprintf(name, "counter%d", j);
config_setting_t *s =
config_setting_lookup(sect, name);
config_setting_t *s = config_setting_lookup(sect, name);
config_setting_set_int(s, group->counter[j].select_val);
}
}
@ -813,8 +810,8 @@ config_restore(void)
config_setting_get_member(setting, group->group->name);
if (!sect) {
sect = config_setting_add(setting, group->group->name,
CONFIG_TYPE_GROUP);
sect =
config_setting_add(setting, group->group->name, CONFIG_TYPE_GROUP);
}
for (; j < group->group->num_counters; j++) {

29
src/freedreno/perfcntrs/freedreno_dt.c
View File

@ -22,18 +22,18 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include <arpa/inet.h>
#include <fcntl.h>
#include <ftw.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <unistd.h>
#include <inttypes.h>
#include <arpa/inet.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "util/macros.h"
#include "util/os_file.h"
@ -49,7 +49,6 @@ static struct {
uint32_t max_freq;
} dev;
/*
* code to find stuff in /proc/device-tree:
*
@ -73,7 +72,8 @@ readdt(const char *node)
}
static int
find_freqs_fn(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
find_freqs_fn(const char *fpath, const struct stat *sb, int typeflag,
struct FTW *ftwbuf)
{
const char *fname = fpath + ftwbuf->base;
size_t sz;
@ -118,7 +118,8 @@ static const char * compatibles[] = {
*
* would result in "qcom,adreno-630.2\0qcom,adreno\0"
*/
static bool match_compatible(char *compatstrs, int sz)
static bool
match_compatible(char *compatstrs, int sz)
{
while (sz > 0) {
char *compatible = compatstrs;
@ -136,7 +137,8 @@ static bool match_compatible(char *compatstrs, int sz)
}
static int
find_device_fn(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
find_device_fn(const char *fpath, const struct stat *sb, int typeflag,
struct FTW *ftwbuf)
{
const char *fname = fpath + ftwbuf->base;
size_t sz;
@ -164,8 +166,8 @@ find_device_fn(const char *fpath, const struct stat *sb, int typeflag, struct FT
dev.size_cells = ntohl(*val);
free(val);
printf("#address-cells=%d, #size-cells=%d\n",
dev.address_cells, dev.size_cells);
printf("#address-cells=%d, #size-cells=%d\n", dev.address_cells,
dev.size_cells);
}
free(str);
}
@ -245,7 +247,8 @@ fd_dt_find_io(void)
if (fd < 0)
return NULL;
void *io = mmap(0, dev.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, dev.base);
void *io =
mmap(0, dev.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, dev.base);
close(fd);
if (io == MAP_FAILED)
return NULL;

21
src/freedreno/perfcntrs/freedreno_perfcntr.h
View File

@ -52,7 +52,6 @@ struct fd_perfcntr_counter {
unsigned clear;
};
enum fd_perfcntr_type {
FD_PERFCNTR_TYPE_UINT64,
FD_PERFCNTR_TYPE_UINT,
@ -76,7 +75,6 @@ enum fd_perfcntr_result_type {
FD_PERFCNTR_RESULT_TYPE_CUMULATIVE,
};
/* Describes a single countable: */
struct fd_perfcntr_countable {
const char *name;
@ -100,31 +98,24 @@ struct fd_perfcntr_group {
const struct fd_perfcntr_group *fd_perfcntrs(unsigned gpu_id, unsigned *count);
#define COUNTER(_sel, _lo, _hi) { \
.select_reg = REG(_sel), \
.counter_reg_lo = REG(_lo), \
.select_reg = REG(_sel), .counter_reg_lo = REG(_lo), \
.counter_reg_hi = REG(_hi), \
}
#define COUNTER2(_sel, _lo, _hi, _en, _clr) { \
.select_reg = REG(_sel), \
.counter_reg_lo = REG(_lo), \
.counter_reg_hi = REG(_hi), \
.enable = REG(_en), \
.clear = REG(_clr), \
.select_reg = REG(_sel), .counter_reg_lo = REG(_lo), \
.counter_reg_hi = REG(_hi), .enable = REG(_en), .clear = REG(_clr), \
}
#define COUNTABLE(_selector, _query_type, _result_type) { \
.name = #_selector, \
.selector = _selector, \
.name = #_selector, .selector = _selector, \
.query_type = FD_PERFCNTR_TYPE_##_query_type, \
.result_type = FD_PERFCNTR_RESULT_TYPE_##_result_type, \
}
#define GROUP(_name, _counters, _countables) { \
.name = _name, \
.num_counters = ARRAY_SIZE(_counters), \
.counters = _counters, \
.num_countables = ARRAY_SIZE(_countables), \
.name = _name, .num_counters = ARRAY_SIZE(_counters), \
.counters = _counters, .num_countables = ARRAY_SIZE(_countables), \
.countables = _countables, \
}