|
238 | 238 | if config.dump_ir_supported:
|
239 | 239 | config.available_features.add('dump_ir')
|
240 | 240 |
|
241 |
| -supported_sycl_be = ['host', |
242 |
| - 'opencl', |
| 241 | +supported_sycl_be = ['opencl', |
243 | 242 | 'ext_oneapi_cuda',
|
244 | 243 | 'ext_oneapi_hip',
|
245 | 244 | 'ext_oneapi_level_zero',
|
|
299 | 298 |
|
300 | 299 | found_at_least_one_device = False
|
301 | 300 |
|
302 |
| -host_run_substitute = "true" |
303 |
| -host_run_on_linux_substitute = "true " |
304 |
| -host_check_substitute = "" |
305 |
| -host_check_on_linux_substitute = "" |
306 |
| -supported_device_types=['cpu', 'gpu', 'acc', 'host'] |
| 301 | +supported_device_types=['cpu', 'gpu', 'acc'] |
307 | 302 |
|
308 | 303 | for target_device in config.target_devices.split(','):
|
309 |
| - if ( target_device not in supported_device_types ): |
| 304 | + if target_device == 'host': |
| 305 | + lit_config.warning("Host device type is no longer supported.") |
| 306 | + elif ( target_device not in supported_device_types ): |
310 | 307 | lit_config.error("Unknown SYCL target device type specified '" +
|
311 | 308 | target_device +
|
312 | 309 | "' supported devices are " + ', '.join(supported_device_types))
|
313 | 310 |
|
314 |
| -if 'host' in config.target_devices.split(','): |
315 |
| - found_at_least_one_device = True |
316 |
| - lit_config.note("Test HOST device") |
317 |
| - host_run_substitute = "env SYCL_DEVICE_FILTER=host " |
318 |
| - host_check_substitute = "| FileCheck %s" |
319 |
| - config.available_features.add('host') |
320 |
| - if platform.system() == "Linux": |
321 |
| - host_run_on_linux_substitute = "env SYCL_DEVICE_FILTER=host " |
322 |
| - host_check_on_linux_substitute = "| FileCheck %s" |
323 |
| -else: |
324 |
| - lit_config.warning("HOST device not used") |
325 |
| - |
326 |
| -config.substitutions.append( ('%HOST_RUN_PLACEHOLDER', host_run_substitute) ) |
327 |
| -config.substitutions.append( ('%HOST_RUN_ON_LINUX_PLACEHOLDER', host_run_on_linux_substitute) ) |
328 |
| -config.substitutions.append( ('%HOST_CHECK_PLACEHOLDER', host_check_substitute) ) |
329 |
| -config.substitutions.append( ('%HOST_CHECK_ON_LINUX_PLACEHOLDER', host_check_on_linux_substitute) ) |
330 |
| - |
331 | 311 | cpu_run_substitute = "true"
|
332 | 312 | cpu_run_on_linux_substitute = "true "
|
333 | 313 | cpu_check_substitute = ""
|
|
336 | 316 | if 'cpu' in config.target_devices.split(','):
|
337 | 317 | found_at_least_one_device = True
|
338 | 318 | lit_config.note("Test CPU device")
|
339 |
| - cpu_run_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu,host ".format(SYCL_PLUGIN=config.sycl_be) |
| 319 | + cpu_run_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu ".format(SYCL_PLUGIN=config.sycl_be) |
340 | 320 | cpu_check_substitute = "| FileCheck %s"
|
341 | 321 | config.available_features.add('cpu')
|
342 | 322 | if platform.system() == "Linux":
|
|
359 | 339 | if 'gpu' in config.target_devices.split(','):
|
360 | 340 | found_at_least_one_device = True
|
361 | 341 | lit_config.note("Test GPU device")
|
362 |
| - gpu_run_substitute = " env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu,host ".format(SYCL_PLUGIN=config.sycl_be) |
| 342 | + gpu_run_substitute = " env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu ".format(SYCL_PLUGIN=config.sycl_be) |
363 | 343 | gpu_check_substitute = "| FileCheck %s"
|
364 | 344 | config.available_features.add('gpu')
|
365 | 345 |
|
366 | 346 | if config.sycl_be == "ext_oneapi_level_zero":
|
367 | 347 | gpu_l0_check_substitute = "| FileCheck %s"
|
368 | 348 | if lit_config.params.get('ze_debug'):
|
369 |
| - gpu_run_substitute = " env ZE_DEBUG={ZE_DEBUG} SYCL_DEVICE_FILTER=level_zero:gpu,host ".format(ZE_DEBUG=config.ze_debug) |
| 349 | + gpu_run_substitute = " env ZE_DEBUG={ZE_DEBUG} SYCL_DEVICE_FILTER=level_zero:gpu ".format(ZE_DEBUG=config.ze_debug) |
370 | 350 | config.available_features.add('ze_debug'+config.ze_debug)
|
371 | 351 |
|
372 | 352 | if platform.system() == "Linux":
|
373 |
| - gpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu,host ".format(SYCL_PLUGIN=config.sycl_be) |
| 353 | + gpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu ".format(SYCL_PLUGIN=config.sycl_be) |
374 | 354 | gpu_check_on_linux_substitute = "| FileCheck %s"
|
375 | 355 |
|
376 | 356 | if config.sycl_be == "ext_oneapi_cuda":
|
|
0 commit comments