flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-13 02:46:23 +00:00
Code Issues Releases Wiki Activity

lib: Print memory requirements as MiB

Browse Source 
Since we need a lot of memory, trim off the less significant digits for
easier human consumption.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-01-13 14:02:50 +00:00
parent e180bec7bc
commit 4a3a826342
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/igt_aux.h
View File

@ -86,9 +86,9 @@ uint64_t intel_get_avail_ram_mb(void);
uint64_t intel_get_total_ram_mb(void); uint64_t intel_get_total_ram_mb(void);
uint64_t intel_get_total_swap_mb(void); uint64_t intel_get_total_swap_mb(void);
int __intel_check_memory(uint32_t count, uint64_t size, unsigned mode, int __intel_check_memory(uint64_t count, uint64_t size, unsigned mode,
uint64_t *out_required, uint64_t *out_total); uint64_t *out_required, uint64_t *out_total);
void intel_require_memory(uint32_t count, uint64_t size, unsigned mode); void intel_require_memory(uint64_t count, uint64_t size, unsigned mode);
#define CHECK_RAM 0x1 #define CHECK_RAM 0x1
#define CHECK_SWAP 0x2 #define CHECK_SWAP 0x2

13
lib/intel_os.c
View File

@ -192,7 +192,7 @@ intel_get_total_swap_mb(void)
return retval / (1024*1024); return retval / (1024*1024);
} }
int __intel_check_memory(uint32_t count, uint64_t size, unsigned mode, int __intel_check_memory(uint64_t count, uint64_t size, unsigned mode,
uint64_t *out_required, uint64_t *out_total) uint64_t *out_required, uint64_t *out_total)
{ {
/* rough estimate of how many bytes the kernel requires to track each object */ /* rough estimate of how many bytes the kernel requires to track each object */
@ -203,8 +203,8 @@ int __intel_check_memory(uint32_t count, uint64_t size, unsigned mode,
required *= size + KERNEL_BO_OVERHEAD; required *= size + KERNEL_BO_OVERHEAD;
required = ALIGN(required, 4096); required = ALIGN(required, 4096);
igt_debug("Checking %'u surfaces of size %'llu bytes (total %'llu) against %s%s\n", igt_debug("Checking %'llu surfaces of size %'llu bytes (total %'llu) against %s%s\n",
count, (long long)size, (long long)required, (long long)count, (long long)size, (long long)required,
mode & (CHECK_RAM | CHECK_SWAP) ? "RAM" : "", mode & (CHECK_RAM | CHECK_SWAP) ? "RAM" : "",
mode & CHECK_SWAP ? " + swap": ""); mode & CHECK_SWAP ? " + swap": "");
@ -247,14 +247,15 @@ int __intel_check_memory(uint32_t count, uint64_t size, unsigned mode,
* assumption that any test that needs to check for memory requirements is a * assumption that any test that needs to check for memory requirements is a
* thrashing test unsuitable for slow simulated systems. * thrashing test unsuitable for slow simulated systems.
*/ */
void intel_require_memory(uint32_t count, uint64_t size, unsigned mode) void intel_require_memory(uint64_t count, uint64_t size, unsigned mode)
{ {
uint64_t required, total; uint64_t required, total;
igt_skip_on_f(!__intel_check_memory(count, size, mode, igt_skip_on_f(!__intel_check_memory(count, size, mode,
&required, &total), &required, &total),
"Estimated that we need %'llu bytes for the test, but only have %'llu bytes available (%s%s)\n", "Estimated that we need %'llu MiB for the test, but only have %'llu MiB available (%s%s)\n",
(long long)required, (long long)total, (long long)((required + ((1<<20) - 1)) >> 20),
(long long)(total >> 20),
mode & (CHECK_RAM | CHECK_SWAP) ? "RAM" : "", mode & (CHECK_RAM | CHECK_SWAP) ? "RAM" : "",
mode & CHECK_SWAP ? " + swap": ""); mode & CHECK_SWAP ? " + swap": "");