OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: move si_get_wave_info() to AMD common code

Browse Source 
This will allow us to use it from radv.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset
2017-09-07 11:05:29 +02:00
parent 8181427b14
commit f0d09d9012
3 changed files with 97 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/amd/common/ac_debug.c
View File

@@ -43,6 +43,8 @@
#include "util/u_memory.h"
#include "util/u_string.h"
#include <assert.h>
/* Parsed IBs are difficult to read without colors. Use "less -R file" to
* read them, or use "aha -b -f file" to convert them to html.
*/
@@ -721,3 +723,77 @@ bool ac_vm_fault_occured(enum chip_class chip_class,
return fault;
}
static int compare_wave(const void *p1, const void *p2)
{
struct ac_wave_info *w1 = (struct ac_wave_info *)p1;
struct ac_wave_info *w2 = (struct ac_wave_info *)p2;
/* Sort waves according to PC and then SE, SH, CU, etc. */
if (w1->pc < w2->pc)
return -1;
if (w1->pc > w2->pc)
return 1;
if (w1->se < w2->se)
return -1;
if (w1->se > w2->se)
return 1;
if (w1->sh < w2->sh)
return -1;
if (w1->sh > w2->sh)
return 1;
if (w1->cu < w2->cu)
return -1;
if (w1->cu > w2->cu)
return 1;
if (w1->simd < w2->simd)
return -1;
if (w1->simd > w2->simd)
return 1;
if (w1->wave < w2->wave)
return -1;
if (w1->wave > w2->wave)
return 1;
return 0;
}
/* Return wave information. "waves" should be a large enough array. */
unsigned ac_get_wave_info(struct ac_wave_info waves[AC_MAX_WAVES_PER_CHIP])
{
char line[2000];
unsigned num_waves = 0;
FILE *p = popen("umr -wa", "r");
if (!p)
return 0;
if (!fgets(line, sizeof(line), p) ||
strncmp(line, "SE", 2) != 0) {
pclose(p);
return 0;
}
while (fgets(line, sizeof(line), p)) {
struct ac_wave_info *w;
uint32_t pc_hi, pc_lo, exec_hi, exec_lo;
assert(num_waves < AC_MAX_WAVES_PER_CHIP);
w = &waves[num_waves];
if (sscanf(line, "%u %u %u %u %u %x %x %x %x %x %x %x",
&w->se, &w->sh, &w->cu, &w->simd, &w->wave,
&w->status, &pc_hi, &pc_lo, &w->inst_dw0,
&w->inst_dw1, &exec_hi, &exec_lo) == 12) {
w->pc = ((uint64_t)pc_hi << 32) | pc_lo;
w->exec = ((uint64_t)exec_hi << 32) | exec_lo;
w->matched = false;
num_waves++;
}
}
qsort(waves, num_waves, sizeof(struct ac_wave_info), compare_wave);
pclose(p);
return num_waves;
}

18
src/amd/common/ac_debug.h
View File

@@ -36,6 +36,22 @@
#define AC_IS_TRACE_POINT(x) (((x) & 0xcafe0000) == 0xcafe0000)
#define AC_GET_TRACE_POINT_ID(x) ((x) & 0xffff)
#define AC_MAX_WAVES_PER_CHIP (64 * 40)
struct ac_wave_info {
unsigned se; /* shader engine */
unsigned sh; /* shader array */
unsigned cu; /* compute unit */
unsigned simd;
unsigned wave;
uint32_t status;
uint64_t pc; /* program counter */
uint32_t inst_dw0;
uint32_t inst_dw1;
uint64_t exec;
bool matched; /* whether the wave is used by a currently-bound shader */
};
typedef void *(*ac_debug_addr_callback)(void *data, uint64_t addr);
void ac_dump_reg(FILE *file, enum chip_class chip_class, unsigned offset,
@@ -50,4 +66,6 @@ void ac_parse_ib(FILE *f, uint32_t *ib, int num_dw, const int *trace_ids,
bool ac_vm_fault_occured(enum chip_class chip_class,
uint64_t *old_dmesg_timestamp, uint64_t *out_addr);
unsigned ac_get_wave_info(struct ac_wave_info waves[AC_MAX_WAVES_PER_CHIP]);
#endif

96
src/gallium/drivers/radeonsi/si_debug.c
View File

@@ -829,102 +829,12 @@ static void si_add_split_disasm(const char *disasm,
}
}
#define MAX_WAVES_PER_CHIP (64 * 40)
struct si_wave_info {
unsigned se; /* shader engine */
unsigned sh; /* shader array */
unsigned cu; /* compute unit */
unsigned simd;
unsigned wave;
uint32_t status;
uint64_t pc; /* program counter */
uint32_t inst_dw0;
uint32_t inst_dw1;
uint64_t exec;
bool matched; /* whether the wave is used by a currently-bound shader */
};
static int compare_wave(const void *p1, const void *p2)
{
struct si_wave_info *w1 = (struct si_wave_info *)p1;
struct si_wave_info *w2 = (struct si_wave_info *)p2;
/* Sort waves according to PC and then SE, SH, CU, etc. */
if (w1->pc < w2->pc)
return -1;
if (w1->pc > w2->pc)
return 1;
if (w1->se < w2->se)
return -1;
if (w1->se > w2->se)
return 1;
if (w1->sh < w2->sh)
return -1;
if (w1->sh > w2->sh)
return 1;
if (w1->cu < w2->cu)
return -1;
if (w1->cu > w2->cu)
return 1;
if (w1->simd < w2->simd)
return -1;
if (w1->simd > w2->simd)
return 1;
if (w1->wave < w2->wave)
return -1;
if (w1->wave > w2->wave)
return 1;
return 0;
}
/* Return wave information. "waves" should be a large enough array. */
static unsigned si_get_wave_info(struct si_wave_info waves[MAX_WAVES_PER_CHIP])
{
char line[2000];
unsigned num_waves = 0;
FILE *p = popen("umr -wa", "r");
if (!p)
return 0;
if (!fgets(line, sizeof(line), p) ||
strncmp(line, "SE", 2) != 0) {
pclose(p);
return 0;
}
while (fgets(line, sizeof(line), p)) {
struct si_wave_info *w;
uint32_t pc_hi, pc_lo, exec_hi, exec_lo;
assert(num_waves < MAX_WAVES_PER_CHIP);
w = &waves[num_waves];
if (sscanf(line, "%u %u %u %u %u %x %x %x %x %x %x %x",
&w->se, &w->sh, &w->cu, &w->simd, &w->wave,
&w->status, &pc_hi, &pc_lo, &w->inst_dw0,
&w->inst_dw1, &exec_hi, &exec_lo) == 12) {
w->pc = ((uint64_t)pc_hi << 32) | pc_lo;
w->exec = ((uint64_t)exec_hi << 32) | exec_lo;
w->matched = false;
num_waves++;
}
}
qsort(waves, num_waves, sizeof(struct si_wave_info), compare_wave);
pclose(p);
return num_waves;
}
/* If the shader is being executed, print its asm instructions, and annotate
* those that are being executed right now with information about waves that
* execute them. This is most useful during a GPU hang.
*/
static void si_print_annotated_shader(struct si_shader *shader,
struct si_wave_info *waves,
struct ac_wave_info *waves,
unsigned num_waves,
FILE *f)
{
@@ -1010,8 +920,8 @@ static void si_print_annotated_shader(struct si_shader *shader,
static void si_dump_annotated_shaders(struct si_context *sctx, FILE *f)
{
struct si_wave_info waves[MAX_WAVES_PER_CHIP];
unsigned num_waves = si_get_wave_info(waves);
struct ac_wave_info waves[AC_MAX_WAVES_PER_CHIP];
unsigned num_waves = ac_get_wave_info(waves);
fprintf(f, COLOR_CYAN "The number of active waves = %u" COLOR_RESET
"\n\n", num_waves);