convert hwtest to C++

envytools · Aug 9, 2016 · 87a1562 · 87a1562
1 parent b3fcb08
commit 87a1562
Show file tree

Hide file tree

Showing 27 changed files with 411 additions and 308 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,9 @@
-project(ENVYTOOLS C)
+project(ENVYTOOLS C CXX)
 cmake_minimum_required(VERSION 2.6)
 enable_testing()
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE "Debug")
 endif (NOT CMAKE_BUILD_TYPE)
@@ -44,6 +45,7 @@ message("-- Summary --")
 message("")
 message("General:")
 message("	C-flags:	'${CMAKE_C_FLAGS}' (-DCMAKE_C_FLAGS=\"...\")")
+message("	CXX-flags:	'${CMAKE_CXX_FLAGS}' (-DCMAKE_CXX_FLAGS=\"...\")")
 message("	Build type:	${CMAKE_BUILD_TYPE} (-DCMAKE_BUILD_TYPE=\"...\")")
 message("")
 message("Install:")

diff --git a/hwtest/CMakeLists.txt b/hwtest/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(ENVYTOOLS C)
+project(ENVYTOOLS C CXX)
 cmake_minimum_required(VERSION 2.6)
 
 option(DISABLE_HWTEST "Disable building hwtest" OFF)
@@ -11,7 +11,13 @@ if (NOT DISABLE_HWTEST)
 		include_directories(${PC_PCIACCESS_INCLUDE_DIRS})
 		link_directories(${PC_PCIACCESS_LIBRARY_DIRS})
 
-		add_executable(hwtest hwtest.c common.c vram.c nv01_pgraph.c nv10_tile.c nv50_ptherm.c nv84_ptherm.c pvcomp_isa.c vp2_macro.c mpeg_crypt.c vp1.c g80_gr.c g80_sfu.c g80_int.c g80_fp.c g80_fp64.c g80_atom32.c g80_atom64.c)
+		add_executable(hwtest hwtest.cc common.cc
+			nv01_pgraph.cc
+			vram.cc nv10_tile.cc
+			nv50_ptherm.cc nv84_ptherm.cc
+			mpeg_crypt.cc vp1.cc vp2_macro.cc pvcomp_isa.cc
+			g80_gr.cc g80_sfu.cc g80_int.cc g80_fp.cc g80_fp64.cc g80_atom32.cc g80_atom64.cc
+		)
 		target_link_libraries(hwtest nva nvhw m)
 
 		install(TARGETS hwtest

diff --git a/hwtest/common.c → hwtest/common.cc b/hwtest/common.c → hwtest/common.cc
@@ -34,7 +34,7 @@ int hwtest_run_group(struct hwtest_ctx *ctx, const struct hwtest_group *group, c
 	if (pres != HWTEST_RES_PASS) {
 		return pres;
 	}
-	int flen = 0;
+	size_t flen = 0;
 	const char *fnext = 0;
 	if (filter) {
 		fnext = strchr(filter, '/');

diff --git a/hwtest/g80_atom32.c → hwtest/g80_atom32.cc b/hwtest/g80_atom32.c → hwtest/g80_atom32.cc
@@ -73,7 +73,7 @@ static int atom32_prep_code(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2)
 		0xf0000001,
 		0xe0000781,
 	};
-	int i;
+	unsigned i;
 	/* Poke code and flush it. */
 	nva_wr32(ctx->cnum, 0x1700, 0x100);
 	for (i = 0; i < ARRAY_SIZE(code); i++)

diff --git a/hwtest/g80_atom64.c → hwtest/g80_atom64.cc b/hwtest/g80_atom64.c → hwtest/g80_atom64.cc
@@ -73,7 +73,7 @@ op2,
 0xf0000001,
 0xe0000781,
 	};
-	int i;
+	unsigned i;
 	/* Poke code and flush it. */
 	nva_wr32(ctx->cnum, 0x1700, 0x100);
 	for (i = 0; i < ARRAY_SIZE(code); i++)
@@ -170,7 +170,7 @@ static int atom64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2,
 				break;
 		}
 		if (real != exp || cc != ecc || (is_atom && realold != expold)) {
-			printf("atom64 %08x %08x (%016"PRIx64" %016"PRIx64" %016"PRIx64" %016"PRIx64")[%d]: got %016"PRIx64".%x %016"PRIx64" expected %016"PRIx64".%x %016"PRIx64"\n", op1, op2, src1[i], src2[i], src3[i], s1, i&3, real, cc, realold, exp, ecc, expold);
+			printf("atom64 %08x %08x (%016" PRIx64 " %016" PRIx64 " %016" PRIx64 " %016" PRIx64 ")[%d]: got %016" PRIx64 ".%x %016" PRIx64 " expected %016" PRIx64 ".%x %016" PRIx64 "\n", op1, op2, src1[i], src2[i], src3[i], s1, i&3, real, cc, realold, exp, ecc, expold);
 			return 1;
 		}
 	}

diff --git a/hwtest/g80_fp.c → hwtest/g80_fp.cc b/hwtest/g80_fp.c → hwtest/g80_fp.cc
@@ -112,7 +112,7 @@ static int fp_prep_code(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2) {
 		0xf0000001,
 		0xe0000781,
 	};
-	int i;
+	unsigned i;
 	/* Poke code and flush it. */
 	nva_wr32(ctx->cnum, 0x1700, 0x100);
 	for (i = 0; i < ARRAY_SIZE(code); i++)
@@ -194,7 +194,7 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 		static const int cmpbit[4] = { 16, 15, 14, 17 };
 		int swz;
 		int sop;
-		int rm;
+		enum fp_rm rm;
 		bool neg = false;
 		uint64_t t64;
 		bool fnz = (ctx->chipset >= 0xa0 && ctx->chipset != 0xaa && ctx->chipset != 0xac) && (xtra & 0x80000);
@@ -266,7 +266,7 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 				{
 					bool crap_i2f64 = ctx->chipset == 0xa0 && (op2 & 0x00400000);
 					bool i16 = !(op2 & 0x00004000) && !crap_i2f64;
-					rm = op2 >> 17 & 3;
+					rm = (enum fp_rm)(op2 >> 17 & 3);
 					if (!(op2 & 0x00010000)) {
 						/* zero-extend */
 						if (i16)
@@ -310,7 +310,7 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 					if (op2 & 0x00080000)
 						exp = fp32_sat(exp, fnz);
 					if (!(op2 & 0x04000000)) {
-						exp = fp32_to_fp16(exp, op2 >> 17 & 3, false);
+						exp = fp32_to_fp16(exp, (enum fp_rm)(op2 >> 17 & 3), false);
 						real &= 0xffff;
 						ecc = fp32_cmp(fp16_to_fp32(exp), 0, true);
 					} else {
@@ -328,7 +328,7 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 						s1 &= ~0x80000000;
 					if (op2 & 0x20000000)
 						s1 ^= 0x80000000;
-					rm = op2 >> 17 & 3;
+					rm = (enum fp_rm)(op2 >> 17 & 3);
 					if (s1 & 0x80000000) {
 						neg = true;
 						s1 ^= 0x80000000;
@@ -386,9 +386,9 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 					if (op2 & 0x00080000)
 						exp = fp32_sat(exp, fnz);
 					if (op2 & 0x08000000)
-						exp = fp32_rint(exp, op2 >> 17 & 3);
+						exp = fp32_rint(exp, (enum fp_rm)(op2 >> 17 & 3));
 					if (!(op2 & 0x04000000)) {
-						exp = fp32_to_fp16(exp, op2 >> 17 & 3, op2 >> 27 & 1);
+						exp = fp32_to_fp16(exp, (enum fp_rm)(op2 >> 17 & 3), op2 >> 27 & 1);
 						real &= 0xffff;
 						ecc = fp32_cmp(fp16_to_fp32(exp), 0, true);
 					} else {
@@ -402,7 +402,7 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 					s1 ^= 0x80000000;
 				if (op2 & 0x08000000)
 					s3 ^= 0x80000000;
-				exp = fp32_add(s1, s3, op1 >> 16 & 3);
+				exp = fp32_add(s1, s3, (enum fp_rm)(op1 >> 16 & 3));
 				if (op2 & 0x20000000) {
 					if (ctx->chipset == 0xa0 && !FP32_ISNAN(s1) && !FP32_ISNAN(s3)) {
 						/* hw bugs are fun! */
@@ -444,7 +444,7 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 					s1 ^= 0x80000000;
 				if (op2 & 0x08000000)
 					s2 ^= 0x80000000;
-				exp = fp32_mul(s1, s2, op2 >> 14 & 3, xtra >> 1 & 1);
+				exp = fp32_mul(s1, s2, (enum fp_rm)(op2 >> 14 & 3), xtra >> 1 & 1);
 				if (ctx->chipset == 0xa0 && !FP32_ISNAN(s1) && !FP32_ISNAN(s2)) {
 					/* hw bugs are fun! */
 					fnz = false;

diff --git a/hwtest/g80_fp64.c → hwtest/g80_fp64.cc b/hwtest/g80_fp64.c → hwtest/g80_fp64.cc
@@ -113,7 +113,7 @@ op2,
 0xf0000001,
 0xe0000781,
 	};
-	int i;
+	unsigned i;
 	/* Poke code and flush it. */
 	nva_wr32(ctx->cnum, 0x1700, 0x100);
 	for (i = 0; i < ARRAY_SIZE(code); i++)
@@ -197,7 +197,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 			case 0xa2: /* i2f */
 			case 0xa3: /* i2f */
 				{
-					rm = op2 >> 17 & 3;
+					rm = (enum fp_rm)(op2 >> 17 & 3);
 					if (op2 >> 16 & 1) {
 						if (!(op2 >> 14 & 1))
 							s1 = (int32_t)s1;
@@ -231,7 +231,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 			case 0xa4: /* f2i */
 			case 0xa5: /* f2i */
 				{
-					rm = op2 >> 17 & 3;
+					rm = (enum fp_rm)(op2 >> 17 & 3);
 					int sbit = op2 >> 14 & 1 ? 63 : 31;
 					if (op2 >> 20 & 1)
 						s1 &= ~(1ull << sbit);
@@ -251,7 +251,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 							exp = fp64_to_u64(s1, rm);
 						else
 							exp = fp32_to_u64(s1, rm, false);
-						if (exp == -1)
+						if (exp == -1u)
 							ovf = true;
 						if (op2 >> 27 & 1) {
 							uint64_t limit = 1ull << 63;
@@ -299,7 +299,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 			case 0xa6: /* f2f */
 			case 0xa7: /* f2f */
 				{
-					rm = op2 >> 17 & 3;
+					rm = (enum fp_rm)(op2 >> 17 & 3);
 					if (op2 >> 14 & 1) {
 						exp = s1;
 					} else {
@@ -340,7 +340,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 					if (op2 & 0x08000000)
 						s3 ^= (1ull << 63);
 				}
-				exp = fp64_fma(s1, s2, s3, op2 >> 22 & 3);
+				exp = fp64_fma(s1, s2, s3, (enum fp_rm)(op2 >> 22 & 3));
 				ecc = fp64_cmp(exp, 0);
 				break;
 			case 0xe3: /* dadd */
@@ -356,7 +356,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 					if (op2 & 0x08000000)
 						s3 ^= (1ull << 63);
 				}
-				exp = fp64_add(s1, s3, op1 >> 16 & 3);
+				exp = fp64_add(s1, s3, (enum fp_rm)(op1 >> 16 & 3));
 				ecc = fp64_cmp(exp, 0);
 				break;
 			case 0xe4: /* dmul */
@@ -369,7 +369,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 				if (FP64_ISNAN(s2)) {
 					s2 |= 1ull << 51;
 				}
-				exp = fp64_mul(s1, s2, op2 >> 17 & 3);
+				exp = fp64_mul(s1, s2, (enum fp_rm)(op2 >> 17 & 3));
 				ecc = fp64_cmp(exp, 0);
 				break;
 			case 0xe5: /* dmin */
@@ -412,7 +412,7 @@ static int fp64_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, c
 				abort();
 		}
 		if (real != exp || cc != ecc) {
-			printf("fp64 %08x %08x (%016"PRIx64" %016"PRIx64" %016"PRIx64"): got %016"PRIx64".%x expected %016"PRIx64".%x diff %"PRId64"\n", op1, op2, src1[i], src2[i], src3[i], real, cc, exp, ecc, real-exp);
+			printf("fp64 %08x %08x (%016" PRIx64 " %016" PRIx64 " %016" PRIx64 "): got %016" PRIx64 ".%x expected %016" PRIx64 ".%x diff %" PRId64 "\n", op1, op2, src1[i], src2[i], src3[i], real, cc, exp, ecc, real-exp);
 			return 1;
 		}
 	}

diff --git a/hwtest/g80_gr.c → hwtest/g80_gr.cc b/hwtest/g80_gr.c → hwtest/g80_gr.cc
diff --git a/hwtest/g80_int.c → hwtest/g80_int.cc b/hwtest/g80_int.c → hwtest/g80_int.cc
@@ -77,7 +77,7 @@ static int fp_prep_code(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2) {
 		0xf0000001,
 		0xe0000781,
 	};
-	int i;
+	unsigned i;
 	/* Poke code and flush it. */
 	nva_wr32(ctx->cnum, 0x1700, 0x100);
 	for (i = 0; i < ARRAY_SIZE(code); i++)
@@ -286,7 +286,7 @@ static int fp_check_data(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2, con
 			case 0x36: /* shl */
 			case 0x37: /* shr */
 				{
-					int bits = (op2 >> 26 & 1) ? 32 : 16;
+					uint32_t bits = (op2 >> 26 & 1) ? 32 : 16;
 					if (op2 >> 20 & 1) {
 						/* const shift count */
 						s2 = op1 >> 16 & 0x7f;

diff --git a/hwtest/g80_sfu.c → hwtest/g80_sfu.cc b/hwtest/g80_sfu.c → hwtest/g80_sfu.cc
@@ -82,7 +82,7 @@ static int test_sfu_tab(struct hwtest_ctx *ctx) {
 				/* XXX: why is the and necessary? */
 				uint64_t r = ((uint64_t)hi << 32 | lo) & 0xfffffffffffffull;
 				if (e != r) {
-					printf("TPC %d MP %d SFU %03x: expected %016"PRIx64" got %016"PRIx64"\n",
+					printf("TPC %d MP %d SFU %03x: expected %016" PRIx64 " got %016" PRIx64 "\n",
 						tpc, mp, i, e, r);
 					return HWTEST_RES_FAIL;
 				}
@@ -104,7 +104,7 @@ static int sfu_prep_code(struct hwtest_ctx *ctx, uint32_t op1, uint32_t op2) {
 		0xf0000001,
 		0xe0000781,
 	};
-	int i;
+	unsigned i;
 	/* Poke code and flush it. */
 	nva_wr32(ctx->cnum, 0x1700, 0x100);
 	for (i = 0; i < ARRAY_SIZE(code); i++)
@@ -219,7 +219,7 @@ static int sfu_check_data(struct hwtest_ctx *ctx, uint32_t base, uint32_t op1, u
 				rin &= ~0x80000000;
 			if (op2 & 0x04000000)
 				rin ^= 0x80000000;
-			exp = sfu_pre(rin, op2 >> 14 & 1);
+			exp = sfu_pre(rin, (enum sfu_pre_mode)(op2 >> 14 & 1));
 		} else {
 			abort();
 		}
@@ -361,7 +361,7 @@ static int test_sfu_sincos_rnd(struct hwtest_ctx *ctx) {
 }
 
 static int test_sfu_ex2_one(struct hwtest_ctx *ctx) {
-	int i;
+	uint32_t i;
 	uint32_t op1 = 0x90000209;
 	uint32_t op2 = 0xc0000780;
 	if (sfu_prep_code(ctx, op1, op2) || sfu_prep_grid(ctx, 0))

diff --git a/hwtest/hwtest.c → hwtest/hwtest.cc b/hwtest/hwtest.c → hwtest/hwtest.cc
diff --git a/hwtest/mpeg_crypt.c → hwtest/mpeg_crypt.cc b/hwtest/mpeg_crypt.c → hwtest/mpeg_crypt.cc