diff mbox

tests: Extract ALIGN macro into a common header

Message ID 1398265675-914-1-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tvrtko Ursulin April 23, 2014, 3:07 p.m. UTC 
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Makes for a little bit less code duplication, especially since
it will be used from more callers in the future.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 lib/drmtest.h         | 9 +++++++++
 lib/media_fill_gen7.c | 2 +-
 lib/media_fill_gen8.c | 2 +-
 lib/rendercopy_gen6.c | 1 -
 lib/rendercopy_gen7.c | 1 -
 lib/rendercopy_gen8.c | 1 -
 6 files changed, 11 insertions(+), 5 deletions(-)

Comments

bradley.d.volkin@intel.com April 23, 2014, 5 p.m. UTC | #1 
Reviewed-by: Brad Volkin <bradley.d.volkin@intel.com>

On Wed, Apr 23, 2014 at 08:07:55AM -0700, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> Makes for a little bit less code duplication, especially since
> it will be used from more callers in the future.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
>  lib/drmtest.h         | 9 +++++++++
>  lib/media_fill_gen7.c | 2 +-
>  lib/media_fill_gen8.c | 2 +-
>  lib/rendercopy_gen6.c | 1 -
>  lib/rendercopy_gen7.c | 1 -
>  lib/rendercopy_gen8.c | 1 -
>  6 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/drmtest.h b/lib/drmtest.h
> index f3afbaa..84f80dc 100644
> --- a/lib/drmtest.h
> +++ b/lib/drmtest.h
> @@ -60,6 +60,15 @@ static inline void *igt_mmap64(void *addr, size_t length, int prot, int flags,
>   */
>  #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
>  
> +/**
> + * ALIGN:
> + * @v: value to be aligned
> + * @a: alignment unit in bytes
> + *
> + * Macro to align a value @v to a specified unit @a.
> + */
> +#define ALIGN(v, a) (((v) + (a)-1) & ~((a)-1))
> +
>  int drm_get_card(void);
>  int drm_open_any(void);
>  int drm_open_any_render(void);
> diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c
> index cdf4b60..82c3469 100644
> --- a/lib/media_fill_gen7.c
> +++ b/lib/media_fill_gen7.c
> @@ -4,10 +4,10 @@
>  #include "media_fill.h"
>  #include "gen7_media.h"
>  #include "intel_reg.h"
> +#include "drmtest.h"
>  
>  #include <assert.h>
>  
> -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
>  
>  static const uint32_t media_kernel[][4] = {
>  	{ 0x00400001, 0x20200231, 0x00000020, 0x00000000 },
> diff --git a/lib/media_fill_gen8.c b/lib/media_fill_gen8.c
> index 996d4d0..54309d5 100644
> --- a/lib/media_fill_gen8.c
> +++ b/lib/media_fill_gen8.c
> @@ -4,10 +4,10 @@
>  #include "media_fill.h"
>  #include "gen8_media.h"
>  #include "intel_reg.h"
> +#include "drmtest.h"
>  
>  #include <assert.h>
>  
> -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
>  
>  static const uint32_t media_kernel[][4] = {
>  	{ 0x00400001, 0x20202288, 0x00000020, 0x00000000 },
> diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
> index d806cef..7b3104c 100644
> --- a/lib/rendercopy_gen6.c
> +++ b/lib/rendercopy_gen6.c
> @@ -20,7 +20,6 @@
>  #include "gen6_render.h"
>  #include "intel_reg.h"
>  
> -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
>  #define VERTEX_SIZE (3*4)
>  
>  static const uint32_t ps_kernel_nomask_affine[][4] = {
> diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
> index cdbc70c..5131d8f 100644
> --- a/lib/rendercopy_gen7.c
> +++ b/lib/rendercopy_gen7.c
> @@ -21,7 +21,6 @@
>  #include "gen7_render.h"
>  #include "intel_reg.h"
>  
> -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
>  
>  static const uint32_t ps_kernel[][4] = {
>  	{ 0x0080005a, 0x2e2077bd, 0x000000c0, 0x008d0040 },
> diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
> index e846376..6f5a698 100644
> --- a/lib/rendercopy_gen8.c
> +++ b/lib/rendercopy_gen8.c
> @@ -25,7 +25,6 @@
>  
>  #include <intel_aub.h>
>  
> -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
>  #define VERTEX_SIZE (3*4)
>  
>  #if DEBUG_RENDERCPY
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/lib/drmtest.h b/lib/drmtest.h
index f3afbaa..84f80dc 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -60,6 +60,15 @@  static inline void *igt_mmap64(void *addr, size_t length, int prot, int flags,
  */
 #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
+/**
+ * ALIGN:
+ * @v: value to be aligned
+ * @a: alignment unit in bytes
+ *
+ * Macro to align a value @v to a specified unit @a.
+ */
+#define ALIGN(v, a) (((v) + (a)-1) & ~((a)-1))
+
 int drm_get_card(void);
 int drm_open_any(void);
 int drm_open_any_render(void);
diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c
index cdf4b60..82c3469 100644
--- a/lib/media_fill_gen7.c
+++ b/lib/media_fill_gen7.c
@@ -4,10 +4,10 @@ 
 #include "media_fill.h"
 #include "gen7_media.h"
 #include "intel_reg.h"
+#include "drmtest.h"
 
 #include <assert.h>
 
-#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
 
 static const uint32_t media_kernel[][4] = {
 	{ 0x00400001, 0x20200231, 0x00000020, 0x00000000 },
diff --git a/lib/media_fill_gen8.c b/lib/media_fill_gen8.c
index 996d4d0..54309d5 100644
--- a/lib/media_fill_gen8.c
+++ b/lib/media_fill_gen8.c
@@ -4,10 +4,10 @@ 
 #include "media_fill.h"
 #include "gen8_media.h"
 #include "intel_reg.h"
+#include "drmtest.h"
 
 #include <assert.h>
 
-#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
 
 static const uint32_t media_kernel[][4] = {
 	{ 0x00400001, 0x20202288, 0x00000020, 0x00000000 },
diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
index d806cef..7b3104c 100644
--- a/lib/rendercopy_gen6.c
+++ b/lib/rendercopy_gen6.c
@@ -20,7 +20,6 @@ 
 #include "gen6_render.h"
 #include "intel_reg.h"
 
-#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
 #define VERTEX_SIZE (3*4)
 
 static const uint32_t ps_kernel_nomask_affine[][4] = {
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
index cdbc70c..5131d8f 100644
--- a/lib/rendercopy_gen7.c
+++ b/lib/rendercopy_gen7.c
@@ -21,7 +21,6 @@ 
 #include "gen7_render.h"
 #include "intel_reg.h"
 
-#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
 
 static const uint32_t ps_kernel[][4] = {
 	{ 0x0080005a, 0x2e2077bd, 0x000000c0, 0x008d0040 },
diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index e846376..6f5a698 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -25,7 +25,6 @@ 
 
 #include <intel_aub.h>
 
-#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1))
 #define VERTEX_SIZE (3*4)
 
 #if DEBUG_RENDERCPY