From 122ef3799d5612748afd8b15392c4a819a1b1847 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 18 Sep 2017 14:07:20 -0700 Subject: [PATCH] i965: Only insert error message if not already present Some restrictions require something like strides to match between src and dest. For multi-source instructions, I'd rather encapsulate the logic for not inserting already present errors in ERROR_IF than open-coding it multiple places. --- src/intel/compiler/brw_eu_validate.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/intel/compiler/brw_eu_validate.c b/src/intel/compiler/brw_eu_validate.c index 99abc6b4f9e..8fcc5293666 100644 --- a/src/intel/compiler/brw_eu_validate.c +++ b/src/intel/compiler/brw_eu_validate.c @@ -44,15 +44,23 @@ cat(struct string *dest, const struct string src) } #define CAT(dest, src) cat(&dest, (struct string){src, strlen(src)}) +static bool +contains(const struct string haystack, const struct string needle) +{ + return memmem(haystack.str, haystack.len, needle.str, needle.len) != NULL; +} +#define CONTAINS(haystack, needle) \ + contains(haystack, (struct string){needle, strlen(needle)}) + #define error(str) "\tERROR: " str "\n" #define ERROR_INDENT "\t " #define ERROR(msg) ERROR_IF(true, msg) -#define ERROR_IF(cond, msg) \ - do { \ - if (cond) { \ - CAT(error_msg, error(msg)); \ - } \ +#define ERROR_IF(cond, msg) \ + do { \ + if ((cond) && !CONTAINS(error_msg, error(msg))) { \ + CAT(error_msg, error(msg)); \ + } \ } while(0) #define CHECK(func, args...) \ -- 2.30.2