Merge branch 'master' into privatestaging

[ROCm/hip commit: 1327d3e03d]
Tento commit je obsažen v:
Ben Sander
2016-02-03 09:39:19 -06:00
4 změnil soubory, kde provedl 48 přidání a 24 odebrání
+6 -6
Zobrazit soubor
@@ -325,7 +325,7 @@ while (@ARGV) {
$ft{'stream'} += s/\bcudaStreamCreate\b/hipStreamCreate/g;
$ft{'stream'} += s/\bcudaStreamCreateWithFlags\b/hipStreamCreateWithFlags/g;
$ft{'stream'} += s/\bcudaStreamDestroy\b/hipStreamDestroy/g;
$ft{'stream'} += s/\bcudaStreamWaitEvent\b/hipStreamWaitEven/g;
$ft{'stream'} += s/\bcudaStreamWaitEvent\b/hipStreamWaitEvent/g;
$ft{'stream'} += s/\bcudaStreamSynchronize\b/hipStreamSynchronize/g;
$ft{'stream'} += s/\bcudaStreamDefault\b/hipStreamDefault/g;
$ft{'stream'} += s/\bcudaStreamNonBlocking\b/hipStreamNonBlocking/g;
@@ -624,12 +624,12 @@ sub warnUnsupportedSpecialFunctions
"__ldg",
# Cross-lane and warp-vote instructions:
"__all",
"__any",
"__ballot",
#"__all",
#"__any",
#"__ballot",
"__popc",
"__clz",
#"__popc",
#"__clz",
"__shfl",
"__shfl_up",