@@ -711,7 +711,6 @@ struct AMDGPUDeviceImageTy : public DeviceImageTy {
711711private:
712712 // / The executable loaded on the agent.
713713 hsa_executable_t Executable;
714- hsa_code_object_t CodeObject;
715714#if SANITIZER_AMDGPU
716715 hsa_code_object_reader_t CodeObjectReader;
717716#endif
@@ -1709,8 +1708,8 @@ struct AMDGPUStreamTy {
17091708
17101709 // / Create an empty slot.
17111710 StreamSlotTy ()
1712- : Signal(nullptr ), Callbacks({}), ActionArgs({} ),
1713- OmptActionFunction ( nullptr ) {}
1711+ : Signal(nullptr ), Callbacks({}), OmptActionFunction( nullptr ),
1712+ ActionArgs ({} ) {}
17141713
17151714 // / Schedule a host memory copy action on the slot.
17161715 Error schedHostMemoryCopy (void *Dst, const void *Src, size_t Size) {
@@ -2025,8 +2024,8 @@ struct AMDGPUStreamTy {
20252024 assert (Args->Signal &&
20262025 " Invalid AMDGPUSignal Pointer in post kernel run processing" );
20272026 hsa_amd_profiling_dispatch_time_t TimeRec;
2028- hsa_status_t Status = hsa_amd_profiling_get_dispatch_time (
2029- Args-> Agent , Args-> Signal -> get (), &TimeRec);
2027+ hsa_amd_profiling_get_dispatch_time (Args-> Agent , Args-> Signal -> get (),
2028+ &TimeRec);
20302029
20312030 uint64_t StartTime = TimeRec.start * Args->TicksToTime ;
20322031 uint64_t EndTime = TimeRec.end * Args->TicksToTime ;
@@ -2913,7 +2912,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
29132912 " OMPX_ENABLE_GFX90A_COARSE_GRAIN_SHARED_ALLOC" , false ),
29142913 OMPX_StrictSanityChecks (" OMPX_STRICT_SANITY_CHECKS" , false ),
29152914 OMPX_SyncCopyBack (" LIBOMPTARGET_SYNC_COPY_BACK" , true ),
2916- OMPX_APUPrefaultMemcopy (" LIBOMPTARGET_APU_PREFAULT_MEMCOPY" , " true" ),
2915+ OMPX_APUPrefaultMemcopy (" LIBOMPTARGET_APU_PREFAULT_MEMCOPY" , true ),
29172916 OMPX_APUPrefaultMemcopySize (" LIBOMPTARGET_APU_PREFAULT_MEMCOPY_SIZE" ,
29182917 1 * 1024 * 1024 ), // 1MB
29192918 OMPX_DGPUMaps (" OMPX_DGPU_MAPS" , false ),
@@ -3886,6 +3885,9 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
38863885 case HSA_DEVICE_TYPE_DSP:
38873886 TmpCharPtr = " DSP" ;
38883887 break ;
3888+ case HSA_DEVICE_TYPE_AIE:
3889+ TmpCharPtr = " AIE" ;
3890+ break ;
38893891 }
38903892 Info.add (" Device Type" , TmpCharPtr);
38913893 }
@@ -5060,7 +5062,6 @@ Error AMDGPUKernelTy::launchImpl(GenericDeviceTy &GenericDevice,
50605062 if (LaunchParams.Size )
50615063 std::memcpy (AllArgs, LaunchParams.Data , LaunchParams.Size );
50625064
5063- uint64_t Buffer = 0 ;
50645065 AMDGPUDeviceTy &AMDGPUDevice = static_cast <AMDGPUDeviceTy &>(GenericDevice);
50655066 AMDGPUStreamTy *Stream = nullptr ;
50665067 if (auto Err = AMDGPUDevice.getStream (AsyncInfoWrapper, Stream))
@@ -5111,7 +5112,7 @@ void AMDGPUKernelTy::printAMDOneLineKernelTrace(GenericDeviceTy &GenericDevice,
51115112 // This line should print exactly as the one in the old plugin.
51125113 fprintf (
51135114 stderr,
5114- " DEVID: %2d SGN:%d ConstWGSize:%-4d args:%2d teamsXthrds:(%4luX %4d) "
5115+ " DEVID: %2d SGN:%d ConstWGSize:%-4d args:%2d teamsXthrds:(%4uX %4d) "
51155116 " reqd:(%4dX%4d) lds_usage:%uB sgpr_count:%u vgpr_count:%u agpr_count:%u "
51165117 " sgpr_spill_count:%u vgpr_spill_count:%u tripcount:%lu rpc:%d "
51175118 " md:%d md_LB:%ld md_UB:%ld Max Occupancy: %u Achieved Occupancy: "
@@ -5304,8 +5305,8 @@ static std::pair<uint64_t, uint64_t>
53045305getKernelStartAndEndTime (const OmptKernelTimingArgsAsyncTy *Args) {
53055306 assert (Args->Signal && " Invalid AMDGPUSignal Pointer in OMPT profiling" );
53065307 hsa_amd_profiling_dispatch_time_t TimeRec;
5307- hsa_status_t Status = hsa_amd_profiling_get_dispatch_time (
5308- Args-> Agent , Args-> Signal -> get (), &TimeRec);
5308+ hsa_amd_profiling_get_dispatch_time (Args-> Agent , Args-> Signal -> get (),
5309+ &TimeRec);
53095310
53105311 uint64_t StartTime = TimeRec.start * Args->TicksToTime ;
53115312 uint64_t EndTime = TimeRec.end * Args->TicksToTime ;
@@ -5317,8 +5318,7 @@ static std::pair<uint64_t, uint64_t>
53175318getCopyStartAndEndTime (const OmptKernelTimingArgsAsyncTy *Args) {
53185319 assert (Args->Signal && " Invalid AMDGPUSignal Pointer in OMPT profiling" );
53195320 hsa_amd_profiling_async_copy_time_t TimeRec;
5320- hsa_status_t Status =
5321- hsa_amd_profiling_get_async_copy_time (Args->Signal ->get (), &TimeRec);
5321+ hsa_amd_profiling_get_async_copy_time (Args->Signal ->get (), &TimeRec);
53225322 uint64_t StartTime = TimeRec.start * Args->TicksToTime ;
53235323 uint64_t EndTime = TimeRec.end * Args->TicksToTime ;
53245324
0 commit comments