mirror of
https://github.com/tiagovignatti/intel-gpu-tools.git
synced 2025-06-10 01:16:18 +00:00
fix warn: 'div' shadows a global declaration
Signed-off-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
1a83c0990a
commit
6456e75f0d
@ -541,7 +541,7 @@ void drmtest_permute_array(void *array, unsigned size,
|
||||
|
||||
void drmtest_progress(const char *header, uint64_t i, uint64_t total)
|
||||
{
|
||||
int div = 200;
|
||||
int divider = 200;
|
||||
|
||||
if (i+1 >= total) {
|
||||
fprintf(stderr, "\r%s100%%\n", header);
|
||||
@ -549,10 +549,10 @@ void drmtest_progress(const char *header, uint64_t i, uint64_t total)
|
||||
}
|
||||
|
||||
if (total / 200 == 0)
|
||||
div = 1;
|
||||
divider = 1;
|
||||
|
||||
/* only bother updating about every 0.5% */
|
||||
if (i % (total / div) == 0 || i+1 >= total) {
|
||||
if (i % (total / divider) == 0 || i+1 >= total) {
|
||||
fprintf(stderr, "\r%s%3llu%%", header,
|
||||
(long long unsigned) i * 100 / total);
|
||||
}
|
||||
|
@ -48,13 +48,13 @@ static int has_ppgtt = 0;
|
||||
|
||||
/* Like the store dword test, but we create new command buffers each time */
|
||||
static void
|
||||
store_dword_loop(int div)
|
||||
store_dword_loop(int divider)
|
||||
{
|
||||
int cmd, i, val = 0, ret;
|
||||
uint32_t *buf;
|
||||
drm_intel_bo *cmd_bo;
|
||||
|
||||
printf("running storedw loop with stall every %i batch\n", div);
|
||||
printf("running storedw loop with stall every %i batch\n", divider);
|
||||
|
||||
cmd = MI_STORE_DWORD_IMM;
|
||||
if (!has_ppgtt)
|
||||
@ -106,7 +106,7 @@ store_dword_loop(int div)
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if (i % div != 0)
|
||||
if (i % divider != 0)
|
||||
goto cont;
|
||||
|
||||
drm_intel_bo_wait_rendering(cmd_bo);
|
||||
|
@ -52,12 +52,12 @@ static int has_ppgtt = 0;
|
||||
*/
|
||||
|
||||
static void
|
||||
store_dword_loop(int div)
|
||||
store_dword_loop(int divider)
|
||||
{
|
||||
int cmd, i, val = 0;
|
||||
uint32_t *buf;
|
||||
|
||||
printf("running storedw loop on blt with stall every %i batch\n", div);
|
||||
printf("running storedw loop on blt with stall every %i batch\n", divider);
|
||||
|
||||
cmd = MI_STORE_DWORD_IMM;
|
||||
if (!has_ppgtt)
|
||||
@ -74,7 +74,7 @@ store_dword_loop(int div)
|
||||
|
||||
intel_batchbuffer_flush_on_ring(batch, I915_EXEC_BLT);
|
||||
|
||||
if (i % div != 0)
|
||||
if (i % divider != 0)
|
||||
goto cont;
|
||||
|
||||
drm_intel_bo_map(target_buffer, 0);
|
||||
|
@ -52,12 +52,12 @@ static int has_ppgtt = 0;
|
||||
*/
|
||||
|
||||
static void
|
||||
store_dword_loop(int div)
|
||||
store_dword_loop(int divider)
|
||||
{
|
||||
int cmd, i, val = 0;
|
||||
uint32_t *buf;
|
||||
|
||||
printf("running storedw loop on bsd with stall every %i batch\n", div);
|
||||
printf("running storedw loop on bsd with stall every %i batch\n", divider);
|
||||
|
||||
cmd = MI_STORE_DWORD_IMM;
|
||||
if (!has_ppgtt)
|
||||
@ -74,7 +74,7 @@ store_dword_loop(int div)
|
||||
|
||||
intel_batchbuffer_flush_on_ring(batch, I915_EXEC_BSD);
|
||||
|
||||
if (i % div != 0)
|
||||
if (i % divider != 0)
|
||||
goto cont;
|
||||
|
||||
drm_intel_bo_map(target_buffer, 0);
|
||||
|
@ -52,12 +52,12 @@ static int has_ppgtt = 0;
|
||||
*/
|
||||
|
||||
static void
|
||||
store_dword_loop(int div)
|
||||
store_dword_loop(int divider)
|
||||
{
|
||||
int cmd, i, val = 0;
|
||||
uint32_t *buf;
|
||||
|
||||
printf("running storedw loop on render with stall every %i batch\n", div);
|
||||
printf("running storedw loop on render with stall every %i batch\n", divider);
|
||||
|
||||
cmd = MI_STORE_DWORD_IMM;
|
||||
if (!has_ppgtt)
|
||||
@ -74,7 +74,7 @@ store_dword_loop(int div)
|
||||
|
||||
intel_batchbuffer_flush_on_ring(batch, 0);
|
||||
|
||||
if (i % div != 0)
|
||||
if (i % divider != 0)
|
||||
goto cont;
|
||||
|
||||
drm_intel_bo_map(target_buffer, 0);
|
||||
|
Loading…
x
Reference in New Issue
Block a user