Merge branch 'master' of https://github.com/ROCm-Developer-Tools/HIP into feature_get_alignment_and_size_from_metadata

[ROCm/hip commit: f28cde3f98]
2018-11-01 23:17:27 +00:00
parent 726b654c6d fc3076badf
commit 9cd4a9dbb1
17 changed files with 216 additions and 162 deletions
@@ -209,10 +209,16 @@ const unordered_map<hsa_isa_t, vector<vector<char>>>& code_object_blobs(bool reb
            nullptr);

        for (auto&& blob : blobs) {
-            Bundled_code_header tmp{blob};
-            if (valid(tmp)) {
-                for (auto&& bundle : bundles(tmp)) {
-                    r[triple_to_hsa_isa(bundle.triple)].push_back(bundle.blob);
+            for (auto sub_blob = blob.begin(); sub_blob != blob.end(); ) {
+                Bundled_code_header tmp(sub_blob, blob.end());
+                if (valid(tmp)) {
+                    for (auto&& bundle : bundles(tmp)) {
+                        r[triple_to_hsa_isa(bundle.triple)].push_back(bundle.blob);
+                    }
+                    sub_blob+=tmp.bundled_code_size;
+                }
+                else {
+                    break;
                }
            }
        }