Report union of wave errors as a bitmask in trap handler

Also fix incorrect PC increment on host trap.

Change-Id: Ic8bbf2b90f9f879ba62b558b909d010a8939a663

runtime/hsa-runtime/loader/executable.cpp

@@ -79,7 +79,8 @@ __attribute__((noinline)) static void _loader_debug_state() {
 // 4: New trap handler ABI. Save the trap id in ttmp11[16:9]
 // 5: New trap handler ABI. Save the PC in ttmp11[22:7] ttmp6[31:0], and park the wave if stopped
 // 6: New trap handler ABI. ttmp6[25:0] contains dispatch index modulo queue size
-HSA_API r_debug _amdgpu_r_debug = {6,
+// 7: New trap handler ABI. Send interrupts as a bitmask, coalescing concurrent exceptions.
+HSA_API r_debug _amdgpu_r_debug = {7,
                            nullptr,
                            reinterpret_cast<uintptr_t>(&_loader_debug_state),
                            r_debug::RT_CONSISTENT,