Skip to contentSkip to conversation

Use uint64_t in eviction memory subtest parameters

PATCH In review Mika Kuoppala 2 participants 3 messages Feb 8, 2016 – Feb 11, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use uint64_t in eviction memory subtest parameters

With large apertures we need to use uint64_t for
counts and sizes. commit 0e2071411a4d4e1488a821daf522dffde2809e03 paved way for this but forgot to change the subtest parameters.

References: https://bugs.freedesktop.org/show_bug.cgi?id=93849

---
 tests/gem_evict_alignment.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
tests/gem_evict_alignment.c +6 -4
index 6fa70f0cd0f9..d7d0ed0aec73 100644
@@ -129,10 +129,11 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignme
 	free(obj);
 }
 
-static void minor_evictions(int fd, int size, int count)
+static void minor_evictions(int fd, uint64_t size, uint64_t count)
 {
 	uint32_t *bo, *sel;
-	int n, m, alignment, pass, fail;
+	uint64_t n, m, alignment;
+	int pass, fail;
 
 	intel_require_memory(2 * count, size, CHECK_RAM);
 
@@ -159,9 +160,10 @@ static void minor_evictions(int fd, int size, int count)
 	free(bo);
 }
 
-static void major_evictions(int fd, int size, int count)
+static void major_evictions(int fd, uint64_t size, uint64_t count)
 {
-	int n, m, loop, alignment, max;
+	uint64_t n, m, alignment, max;
+	int loop;
 	uint32_t *bo;
 
 	intel_require_memory(count, size, CHECK_RAM);
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

tests/gem_evict_alignment.c copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignme

Quoted 16 lines · Mika Kuoppala

With large apertures we need to use uint64_t for
counts and sizes. commit 0e2071411a4d4e1488a821daf522dffde2809e03 paved way for this but forgot to change the subtest parameters.

References: https://bugs.freedesktop.org/show_bug.cgi?id=93849

---
 tests/gem_evict_alignment.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
tests/gem_evict_alignment.c +0 -0
index 6fa70f0cd0f9..d7d0ed0aec73 100644
@@ -129,10 +129,11 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignme

int n_bo.
int alignment
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 1/1 Use uint64_t in eviction memory subtest parameters

With large apertures we need to use uint64_t for
counts and sizes. commit 0e2071411a4d4e1488a821daf522dffde2809e03 paved way for this but forgot to change the subtest parameters.

v2: Pass correctly to the copy() also (Chris)

References: https://bugs.freedesktop.org/show_bug.cgi?id=93849

---
 tests/gem_evict_alignment.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
tests/gem_evict_alignment.c +8 -5
index 6fa70f0cd0f9..3ce1bea9dec3 100644
@@ -53,7 +53,8 @@ IGT_TEST_DESCRIPTION("Run a couple of big batches to force the unbind on"
 #define WIDTH 1024
 
 static void
-copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignment, int error)
+copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo,
+     uint64_t n_bo, uint64_t alignment, int error)
 {
 	uint32_t batch[12];
 	struct drm_i915_gem_relocation_entry reloc[2];
@@ -129,10 +130,11 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int alignme
 	free(obj);
 }
 
-static void minor_evictions(int fd, int size, int count)
+static void minor_evictions(int fd, uint64_t size, uint64_t count)
 {
 	uint32_t *bo, *sel;
-	int n, m, alignment, pass, fail;
+	uint64_t n, m, alignment;
+	int pass, fail;
 
 	intel_require_memory(2 * count, size, CHECK_RAM);
 
@@ -159,9 +161,10 @@ static void minor_evictions(int fd, int size, int count)
 	free(bo);
 }
 
-static void major_evictions(int fd, int size, int count)
+static void major_evictions(int fd, uint64_t size, uint64_t count)
 {
-	int n, m, loop, alignment, max;
+	uint64_t n, m, alignment, max;
+	int loop;
 	uint32_t *bo;
 
 	intel_require_memory(count, size, CHECK_RAM);
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx