Message ID | 1550600059-5789-3-git-send-email-aleksandar.markovic@rt-rk.com |
---|---|
State | New |
Headers | show |
Series | Misc target/mips fixes and improvements | expand |
On Tue, Feb 19, 2019 at 10:20 AM Aleksandar Markovic <aleksandar.markovic@rt-rk.com> wrote: > From: Aleksandar Markovic <amarkovic@wavecomp.com> > > Correct path to headers in tests/tcg/mips/user/ase/msa/bit-counting/* > source files. > > Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com> > Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com> > --- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_d.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_h.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_w.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_b.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_d.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_h.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_w.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_b.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_d.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_h.c | 6 +++--- > tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_w.c | 6 +++--- > 12 files changed, 36 insertions(+), 36 deletions(-) > > diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c > index eb46290..d629431 100644 > --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c > +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c > @@ -22,9 +22,9 @@ > #include <sys/time.h> > #include <stdint.h> > > -#include "../../../include/wrappers_msa.h" > -#include "../../../include/test_inputs.h" > -#include "../../../include/test_utils.h" > +#include "../../../../include/wrappers_msa.h" > +#include "../../../../include/test_inputs.h" > +#include "../../../../include/test_utils.h" Wouldn't it be better to have path to include directory somewhere in the CPPFLAGS, outside the test source code?
Hello, Max! > From: Max Filippov <jcmvbkbc@gmail.com> > Subject: Re: [Qemu-devel] [PATCH v2 2/9] tests/tcg: target/mips: Correct path to headers in some test source files > > -#include "../../../include/wrappers_msa.h" > > -#include "../../../include/test_inputs.h" > > -#include "../../../include/test_utils.h" > > +#include "../../../../include/wrappers_msa.h" > > +#include "../../../../include/test_inputs.h" > > +#include "../../../../include/test_utils.h" > Wouldn't it be better to have path to include directory > somewhere in the CPPFLAGS, outside the test source code? Eventually these paths will be covered by CPPFLAGS, or similar. However, the whole directory tests/tcg/mips is undergoing a serious reorganization, and I have a strong impression that build/makefile infrastructure would be better off added at the end of that process. The additional challenge is that all these tests (like any other ones in tests/tcg) are supposed to be cross-compiled. That said, all added files are tested via manual build and execution both on hardware and within QEMU (but the mistake that this patch fixes slipped thorough the cracks). Large number of tests cases (in the range of thousands so far) are executed in fairly short amount of time (matter of seconds). In any case, thanks! Aleksandar
diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c index eb46290..d629431 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_b.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_d.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_d.c index bb1c0cf..fad220c 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_d.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_h.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_h.c index da1cd83..84cf974 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_h.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_w.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_w.c index a059763..a0ed202 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nloc_w.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_b.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_b.c index 9616d6e..9906eae 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_b.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_d.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_d.c index 801c4bc..21222e3 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_d.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_h.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_h.c index 03cb4cd..fbab9c3 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_h.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_w.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_w.c index 2ca93de..dc33366 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_nlzc_w.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_b.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_b.c index b4cad43..f9033c7 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_b.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_d.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_d.c index d6a8b0d..132b4d0 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_d.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_h.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_h.c index 1cdcabd..f469c09 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_h.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT) diff --git a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_w.c b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_w.c index 38ddc14..d73eff7 100644 --- a/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-counting/test_msa_pcnt_w.c @@ -22,9 +22,9 @@ #include <sys/time.h> #include <stdint.h> -#include "../../../include/wrappers_msa.h" -#include "../../../include/test_inputs.h" -#include "../../../include/test_utils.h" +#include "../../../../include/wrappers_msa.h" +#include "../../../../include/test_inputs.h" +#include "../../../../include/test_utils.h" #define TEST_COUNT_TOTAL (PATTERN_INPUTS_COUNT + RANDOM_INPUTS_COUNT)