From c2d51e4c8c858c8c9b759f70d5ab9c94b4e89bc7 Mon Sep 17 00:00:00 2001
From: Adel Ejjeh <aejjeh@tyler.cs.illinois.edu>
Date: Wed, 22 Jan 2020 23:38:21 -0600
Subject: [PATCH] fixed parboil header file order
---
hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp | 2 +-
hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp | 2 +-
.../spmv/common_src/convert-dataset/convert_dataset.c | 5 +++--
hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp b/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
index cf00ad76a2..323cab871b 100644
--- a/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
+++ b/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
@@ -16,9 +16,9 @@
#include <string.h>
// includes, project
+#include "lbm_macros.h"
#include "layout_config.h"
#include "lbm.h"
-#include "lbm_macros.h"
/******************************************************************************/
diff --git a/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
index b51864366b..bb9f6ed1f0 100644
--- a/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
+++ b/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
@@ -14,9 +14,9 @@
#include <sys/stat.h>
#include <visc.h>
+#include "lbm_macros.h"
#include "layout_config.h"
#include "lbm.h"
-#include "lbm_macros.h"
#include "main.h"
#define AS_UINT(x) (*((unsigned *)&(x)))
diff --git a/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
index bf4c1fe955..a962e23b8f 100644
--- a/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
+++ b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
@@ -12,12 +12,13 @@
* when reading doubles, otherwise errors will occur.
*/
-#include "convert_dataset.h"
-#include "mmio.h"
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include "mmio.h"
+#include "convert_dataset.h"
+
typedef struct _mat_entry {
int row, col; /* i,j */
float val;
diff --git a/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
index f6ce5ccfb2..4f72d2000a 100644
--- a/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
+++ b/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
@@ -14,9 +14,9 @@
#include <string.h>
#include <visc.h>
-#include "convert_dataset.h"
#include "file.h"
#include "gpu_info.h"
+#include "convert_dataset.h"
#define WARP_BITS 5
--
GitLab