directed tests: Updated to use new hip include path

Change-Id: Iab1aee638b7158eb9674a19625dedf6471947e51
Este commit está contenido en:
Maneesh Gupta
2016-10-04 22:20:50 +05:30
padre b6a6cf320b
commit 7e04884d0f
Se han modificado 77 ficheros con 96 adiciones y 96 borrados
@@ -1,5 +1,5 @@
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include"hipDeviceUtil.h"
int main()
@@ -1,7 +1,7 @@
#ifndef HIPDEVICEUTIL_H
#define HIPDEVICEUTIL_H
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime_api.h"
#include<iostream>
#define HIP_CHECK(status, func) \
@@ -1,5 +1,5 @@
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include"hipDeviceUtil.h"
int main()
@@ -1,5 +1,5 @@
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include"hipDeviceUtil.h"
int main()
@@ -1,5 +1,5 @@
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include"hipDeviceUtil.h"
int main()
@@ -1,5 +1,5 @@
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include"hipDeviceUtil.h"
int main()
+1 -1
Ver fichero
@@ -26,7 +26,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
int main(int argc, char *argv[])
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#pragma GCC diagnostic ignored "-Wall"
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#pragma GCC diagnostic ignored "-Wall"
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#pragma GCC diagnostic ignored "-Wall"
+1 -1
Ver fichero
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#pragma GCC diagnostic ignored "-Wall"
+1 -1
Ver fichero
@@ -30,7 +30,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
int main(int argc, char *argv[])
+1 -1
Ver fichero
@@ -31,7 +31,7 @@ THE SOFTWARE.
// Includes HIP Runtime
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
#include <test_common.h>
#define EXIT_WAIVED 2
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#pragma GCC diagnostic ignored "-Wall"
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#pragma GCC diagnostic ignored "-Wall"
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#pragma GCC diagnostic ignored "-Wall"
+2 -2
Ver fichero
@@ -24,8 +24,8 @@ THE SOFTWARE.
*/
#include"test_common.h"
#include"hip_runtime.h"
#include"hip_runtime_api.h"
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#define N 512
#define SIZE N*sizeof(float)
+2 -2
Ver fichero
@@ -24,8 +24,8 @@ THE SOFTWARE.
*/
#include"test_common.h"
#include"hip_runtime.h"
#include"hip_runtime_api.h"
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#define N 512
#define SIZE N*sizeof(double)
+1 -1
Ver fichero
@@ -29,7 +29,7 @@ THE SOFTWARE.
#include <stdio.h>
#include <iostream>
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
#define HIP_ASSERT(x) (assert((x)==hipSuccess))
__global__ void
+1 -1
Ver fichero
@@ -25,7 +25,7 @@ THE SOFTWARE.
#include <iostream>
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
#define HIP_ASSERT(x) (assert((x)==hipSuccess))
__global__ void
+1 -1
Ver fichero
@@ -31,7 +31,7 @@ THE SOFTWARE.
#include <algorithm>
#include <stdlib.h>
#include <iostream>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#define HIP_ASSERT(x) (assert((x)==hipSuccess))
+1 -1
Ver fichero
@@ -31,7 +31,7 @@ THE SOFTWARE.
#include <algorithm>
#include <stdlib.h>
#include <iostream>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#define HIP_ASSERT(x) (assert((x)==hipSuccess))
#define WIDTH 8
+1 -1
Ver fichero
@@ -31,7 +31,7 @@ THE SOFTWARE.
#include <algorithm>
#include <stdlib.h>
#include <iostream>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#define HIP_ASSERT(x) (assert((x)==hipSuccess))
+1 -1
Ver fichero
@@ -31,7 +31,7 @@ THE SOFTWARE.
#include <algorithm>
#include <stdlib.h>
#include <iostream>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#define HIP_ASSERT(x) (assert((x)==hipSuccess))
+1 -1
Ver fichero
@@ -31,7 +31,7 @@ THE SOFTWARE.
#include <algorithm>
#include <stdlib.h>
#include<iostream>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#if (__hcc_workweek__ >= 16164) || defined (__HIP_PLATFORM_NVCC__)
+1 -1
Ver fichero
@@ -24,7 +24,7 @@ THE SOFTWARE.
#include <algorithm>
#include <stdlib.h>
#include<iostream>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#define HIP_ASSERT(x) (assert((x)==hipSuccess))
+1 -1
Ver fichero
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/
#include"hip_runtime_api.h"
#include "hip/hip_runtime_api.h"
#define size 1024*1024
+1 -1
Ver fichero
@@ -22,7 +22,7 @@ THE SOFTWARE.
#include"gHipApi.h"
#include"hip_runtime_api.h"
#include "hip/hip_runtime_api.h"
#include"stdio.h"
void _h2d(mem_manager *self){
+1 -1
Ver fichero
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/
#include"hip_runtime_api.h"
#include "hip/hip_runtime_api.h"
#include<iostream>
#define size 1024*1024
+1 -1
Ver fichero
@@ -22,7 +22,7 @@ THE SOFTWARE.
#include"gxxApi1.h"
#include"hip_runtime_api.h"
#include "hip/hip_runtime_api.h"
void* mallocHip(size_t size)
{
+1 -1
Ver fichero
@@ -25,7 +25,7 @@ THE SOFTWARE.
#define GXXHIPAPI_H
#include<stdlib.h>
#include"hip_runtime_api.h"
#include "hip/hip_runtime_api.h"
class memManager{
private:
+1 -1
Ver fichero
@@ -22,7 +22,7 @@ THE SOFTWARE.
#include "gHipApi.h"
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#define LEN 1024*1024
#define SIZE LEN * sizeof(float)
+2 -2
Ver fichero
@@ -21,8 +21,8 @@ THE SOFTWARE.
*/
#include"hip_runtime.h"
#include"hip_runtime_api.h"
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include"gxxApi1.h"
#define len 1024*1024
+1 -1
Ver fichero
@@ -23,7 +23,7 @@ THE SOFTWARE.
#include"gxxHipApi.h"
#include<vector>
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#define LEN 1024*1024
#define SIZE LEN * sizeof(float)
+1 -1
Ver fichero
@@ -23,7 +23,7 @@ THE SOFTWARE.
#include"gxxHipApi.h"
#include<vector>
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#define LEN 1024*1024
#define SIZE LEN * sizeof(float)
+1 -1
Ver fichero
@@ -4,7 +4,7 @@
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
void printSep()
+1 -1
Ver fichero
@@ -1,4 +1,4 @@
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include<stdio.h>
#define ITER 1<<20
+1 -1
Ver fichero
@@ -1,4 +1,4 @@
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include<stdio.h>
#define ITER 1<<20
+2 -2
Ver fichero
@@ -1,5 +1,5 @@
#include<hip_runtime.h>
#include<hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
__global__ void Kernel(hipLaunchParm lp, float *Ad){
int tx = hipThreadIdx_x + hipBlockIdx_x * hipBlockDim_x;
+1 -1
Ver fichero
@@ -1,5 +1,5 @@
#include <stdio.h>
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
int main( void ) {
hipDeviceProp_t prop;
int dev;
+2 -2
Ver fichero
@@ -19,8 +19,8 @@ THE SOFTWARE.
#include<iostream>
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include<hip/hcc_detail/hipComplex.h>
#define LEN 64
+2 -2
Ver fichero
@@ -1,6 +1,6 @@
#include<iostream>
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#define LEN 1030
#define SIZE LEN << 2
+2 -2
Ver fichero
@@ -1,6 +1,6 @@
#include<iostream>
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#define LEN 1024
#define SIZE LEN<<2
+1 -1
Ver fichero
@@ -26,7 +26,7 @@ THE SOFTWARE.
* HIT_END
*/
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
#include "test_common.h"
template<typename T>
+1 -1
Ver fichero
@@ -30,7 +30,7 @@ THE SOFTWARE.
#include <getopt.h>
#include <iostream>
#include <string>
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
using namespace std;
+1 -1
Ver fichero
@@ -27,7 +27,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include <stdlib.h>
#include <assert.h>
#include <string>
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
using namespace std;
int getDeviceNumber(){
+1 -1
Ver fichero
@@ -29,7 +29,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
int main(int argc, char *argv[])
+1 -1
Ver fichero
@@ -29,7 +29,7 @@ THE SOFTWARE.
#include <stdio.h>
#include <iostream>
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
#include "test_common.h"
+2 -2
Ver fichero
@@ -29,8 +29,8 @@ THE SOFTWARE.
#include <stdio.h>
#include <iostream>
#include <hip_runtime.h>
#include <hcc.h>
#include "hip/hip_runtime.h"
#include "hip/hcc.h"
#include "test_common.h"
#define CHECK(error) \
+2 -2
Ver fichero
@@ -23,9 +23,9 @@ THE SOFTWARE.
* HIT_END
*/
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include"test_common.h"
#include"hip_runtime_api.h"
#include "hip/hip_runtime_api.h"
#include<iostream>
__global__ void vAdd(hipLaunchParm lp, float *a){}
+2 -2
Ver fichero
@@ -17,8 +17,8 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include<hip_runtime.h>
#include<hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include<iostream>
#include<fstream>
#include<vector>
+2 -2
Ver fichero
@@ -17,8 +17,8 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include<hip/hip_runtime.h>
#include<hip/hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include<iostream>
#define fileName "vcpy_isa.co"
+1 -1
Ver fichero
@@ -30,7 +30,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
bool p_memcpyWithPeer = false; // use the peer device for the P2P copy
+1 -1
Ver fichero
@@ -23,7 +23,7 @@ THE SOFTWARE.
// Test pointer tracking logic: allocate memory and retrieve stats with hipPointerGetAttributes
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#include <vector>
+1 -1
Ver fichero
@@ -26,7 +26,7 @@ THE SOFTWARE.
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#define WIDTH 1024
+1 -1
Ver fichero
@@ -19,7 +19,7 @@ THE SOFTWARE.
#include <stdio.h>
#include <hip/hip_fp16.h>
#include "hip_runtime_api.h"
#include "hip/hip_runtime_api.h"
#define DSIZE 4
#define SCF 0.5f
+2 -2
Ver fichero
@@ -18,8 +18,8 @@ THE SOFTWARE.
*/
#include "test_common.h"
#include <iostream>
#include "hip_runtime.h"
#include "hip_runtime_api.h"
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#define N 512
+1 -1
Ver fichero
@@ -23,7 +23,7 @@ THE SOFTWARE.
* HIT_END
*/
#include<hip_runtime.h>
#include "hip/hip_runtime.h"
#include"test_common.h"
#define len 1024*1024
+1 -1
Ver fichero
@@ -27,7 +27,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
+1 -1
Ver fichero
@@ -27,7 +27,7 @@ THE SOFTWARE.
* HIT_END
*/
#include <hip_runtime.h>
#include "hip/hip_runtime.h"
#include <test_common.h>
#ifdef __HCC__
+1 -1
Ver fichero
@@ -28,7 +28,7 @@ THE SOFTWARE.
// Test launch bounds and initialization conditions.
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
int p_blockSize = 256;
+2 -2
Ver fichero
@@ -28,8 +28,8 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
+1 -1
Ver fichero
@@ -22,7 +22,7 @@ THE SOFTWARE.
* HIT_END
*/
#include<hip_runtime.h>
#include "hip/hip_runtime.h"
#include<iostream>
#include<assert.h>
#include"test_common.h"
+1 -1
Ver fichero
@@ -19,7 +19,7 @@ THE SOFTWARE.
// Test under-development. Calls async mem-copy API, experiment with functionality.
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
unsigned p_streams = 2;
@@ -27,7 +27,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
bool p_async = false;
+1 -1
Ver fichero
@@ -34,7 +34,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
@@ -6,7 +6,7 @@
* HIT_END
*/
#include <hip_runtime_api.h>
#include "hip/hip_runtime_api.h"
#include "test_common.h"
@@ -26,7 +26,7 @@ THE SOFTWARE.
* HIT_END
*/
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
void printSep()
+1 -1
Ver fichero
@@ -19,7 +19,7 @@ THE SOFTWARE.
#ifndef HIPSTREAM_H
#define HIPSTREAM_H
#include<hip_runtime.h>
#include "hip/hip_runtime.h"
#define NUM_STREAMS 4
@@ -25,7 +25,7 @@ THE SOFTWARE.
// Test under-development. Calls async mem-copy API, experiment with functionality.
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#include "test_common.h"
#include <vector>
unsigned p_streams = 6;
+2 -2
Ver fichero
@@ -17,8 +17,8 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include<hip_runtime.h>
#include<hip_runtime_api.h>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include<iostream>
#include<fstream>
#include<vector>
+1 -1
Ver fichero
@@ -22,7 +22,7 @@ THE SOFTWARE.
* hipError_t hipDeviceSynchronize();
*/
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include<iostream>
#define _SIZE sizeof(int)*1024*1024
+1 -1
Ver fichero
@@ -17,7 +17,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include<iostream>
#include<time.h>
+1 -1
Ver fichero
@@ -17,7 +17,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include<iostream>
#include<time.h>
+1 -1
Ver fichero
@@ -17,7 +17,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include<iostream>
#include<time.h>
+1 -1
Ver fichero
@@ -22,7 +22,7 @@ THE SOFTWARE.
* hipError_t hipDeviceSynchronize();
*/
#include"hip_runtime.h"
#include "hip/hip_runtime.h"
#include<iostream>
#define _SIZE sizeof(int)*1024*1024
+1 -1
Ver fichero
@@ -22,7 +22,7 @@ THE SOFTWARE.
#include <sys/time.h>
#include <stddef.h>
#include "hip_runtime.h"
#include "hip/hip_runtime.h"
#define HC __attribute__((hc))