Browse Source

Fix unused var warning in release, better logging for command line tests. (#479)

Marcelo Lopez Ruiz 8 years ago
parent
commit
60a67e6563
3 changed files with 4 additions and 2 deletions
  1. 1 1
      lib/HLSL/HLOperationLower.cpp
  2. 1 1
      utils/hct/hcttest.cmd
  3. 2 0
      utils/hct/hcttestcmds.cmd

+ 1 - 1
lib/HLSL/HLOperationLower.cpp

@@ -5886,7 +5886,7 @@ void TranslateStructBufSubscriptUser(Instruction *user, Value *handle,
     Type *Ty = GEP->getType()->getPointerElementType();
     Type *Ty = GEP->getType()->getPointerElementType();
 
 
     Value *offset = GEPIdxToOffset(GEP, Builder, OP, DL);
     Value *offset = GEPIdxToOffset(GEP, Builder, OP, DL);
-    DXASSERT(offset->getType() == Type::getInt32Ty(Ty->getContext()),
+    DXASSERT_LOCALVAR(Ty, offset->getType() == Type::getInt32Ty(Ty->getContext()),
              "else bitness is wrong");
              "else bitness is wrong");
     if (baseOffset)
     if (baseOffset)
       offset = Builder.CreateAdd(offset, baseOffset);
       offset = Builder.CreateAdd(offset, baseOffset);

+ 1 - 1
utils/hct/hcttest.cmd

@@ -313,7 +313,7 @@ echo.
 echo options:
 echo options:
 echo   -clean - deletes test directory before copying binaries and testing
 echo   -clean - deletes test directory before copying binaries and testing
 echo   -ninja - artifacts were built using the Ninja generator
 echo   -ninja - artifacts were built using the Ninja generator
-echo   -rel   - builds release rather than debug
+echo   -rel   - tests release rather than debug
 echo   -adapter "adapter name" - overrides Adapter for execution tests
 echo   -adapter "adapter name" - overrides Adapter for execution tests
 echo   -verbose - for TAEF: turns off /parallel and removes logging filter
 echo   -verbose - for TAEF: turns off /parallel and removes logging filter
 echo.
 echo.

+ 2 - 0
utils/hct/hcttestcmds.cmd

@@ -502,6 +502,7 @@ if %errorlevel% neq 0 (
   exit /b 1
   exit /b 1
 )
 )
 
 
+echo Smoke test for dxc_batch command line ...
 dxc_batch.exe -lib-link -multi-thread "%2"\..\CodeGenHLSL\batch_cmds2.txt 1>nul
 dxc_batch.exe -lib-link -multi-thread "%2"\..\CodeGenHLSL\batch_cmds2.txt 1>nul
 if %errorlevel% neq 0 (
 if %errorlevel% neq 0 (
   echo Failed to run dxc_batch -lib-link -multi-thread %2\..\CodeGenHLSL\batch_cmds2.txt
   echo Failed to run dxc_batch -lib-link -multi-thread %2\..\CodeGenHLSL\batch_cmds2.txt
@@ -523,6 +524,7 @@ if %errorlevel% neq 0 (
   exit /b 1
   exit /b 1
 )
 )
 
 
+echo Test for denorm options ...
 dxc.exe smoke.hlsl /Tps_6_2 /denorm preserve 1>nul
 dxc.exe smoke.hlsl /Tps_6_2 /denorm preserve 1>nul
 if %errorlevel% neq 0 (
 if %errorlevel% neq 0 (
   echo Failed to compile smoke.hlsl with /denorm ieee option
   echo Failed to compile smoke.hlsl with /denorm ieee option