From 785331acbdbcc251e212ba73a59b16e2d890d9c5 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Thu, 18 Apr 2019 15:06:56 -0700 Subject: [PATCH] [paramgrill] Fix mingw build errors --- tests/paramgrill.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/paramgrill.c b/tests/paramgrill.c index 75c179a0..98fb3137 100644 --- a/tests/paramgrill.c +++ b/tests/paramgrill.c @@ -609,8 +609,8 @@ compareResultLT(const BMK_benchResult_t result1, const BMK_benchResult_t result2 static constraint_t relaxTarget(constraint_t target) { target.cMem = (U32)-1; - target.cSpeed *= ((double)g_strictness) / 100; - target.dSpeed *= ((double)g_strictness) / 100; + target.cSpeed = (target.cSpeed * g_strictness) / 100; + target.dSpeed = (target.dSpeed * g_strictness) / 100; return target; } @@ -1737,8 +1737,8 @@ static int allBench(BMK_benchResult_t* resultPtr, /* optimistic assumption of benchres */ { BMK_benchResult_t resultMax = benchres; - resultMax.cSpeed *= uncertaintyConstantC * VARIANCE; - resultMax.dSpeed *= uncertaintyConstantD * VARIANCE; + resultMax.cSpeed = (unsigned long long)(resultMax.cSpeed * uncertaintyConstantC * VARIANCE); + resultMax.dSpeed = (unsigned long long)(resultMax.dSpeed * uncertaintyConstantD * VARIANCE); /* disregard infeasible results in feas mode */ /* disregard if resultMax < winner in infeas mode */ @@ -2429,9 +2429,9 @@ optimizeForSize(const char* const * const fileNamesTable, const size_t nbFiles, } g_lvltarget = winner.result; - g_lvltarget.cSpeed *= ((double)g_strictness) / 100; - g_lvltarget.dSpeed *= ((double)g_strictness) / 100; - g_lvltarget.cSize /= ((double)g_strictness) / 100; + g_lvltarget.cSpeed = (g_lvltarget.cSpeed * g_strictness) / 100; + g_lvltarget.dSpeed = (g_lvltarget.dSpeed * g_strictness) / 100; + g_lvltarget.cSize = (g_lvltarget.cSize * 100) / g_strictness; target.cSpeed = (U32)g_lvltarget.cSpeed; target.dSpeed = (U32)g_lvltarget.dSpeed;