From 3e8dfb3ac50948e5870413e98d7f8d6a2f69fcd9 Mon Sep 17 00:00:00 2001
From: "Ramesh Errabolu (xN/A) TX" <ramesh.errabolu@amd.com>
Date: Wed, 4 Mar 2015 18:57:41 -0500
Subject: [PATCH] ECR #333755 - Verfiy Hsa Samples BlackScholes,
 MonteCarloAsian and SimpleConvolution.

[git-p4: depot-paths = "//depot/stg/hsa/drivers/hsa/runtime/": change = 1127620]


[ROCm/ROCR-Runtime commit: 24d7d5e875793ac915b7419b095e333e2bba76a9]
---
 projects/rocr-runtime/samples/Makefile        | 27 +++++++++----------
 .../samples/common/hsa_rsrc_factory.cpp       |  9 +------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/projects/rocr-runtime/samples/Makefile b/projects/rocr-runtime/samples/Makefile
index 9fbcf27289..86ab8fdb1c 100644
--- a/projects/rocr-runtime/samples/Makefile
+++ b/projects/rocr-runtime/samples/Makefile
@@ -1,19 +1,18 @@
 OPENCL_DEPTH = ../..
 
-include $(OPENCL_DEPTH)/runtimenew/runtimedefs
+include $(OPENCL_DEPTH)/hsadefs
 
-#SUBDIRS = NBody
-#SUBDIRS += DwtHarr1D
-#SUBDIRS += BitionicSort
-#SUBDIRS += BinarySearch
-SUBDIRS = hsailUtil
+SUBDIRS = NBody
+SUBDIRS += DwtHarr1D
+SUBDIRS += BitionicSort
 SUBDIRS += BinarySearch
-#SUBDIRS += BlackScholes
-#SUBDIRS += FloydWarshall 
-#SUBDIRS += FastWalshTransform
-#SUBDIRS += MatrixTranspose
-#SUBDIRS += MatrixMultiplication
-#SUBDIRS += MonteCarloAsian
-#SUBDIRS += SimpleConvolution
+SUBDIRS += BinarySearch
+SUBDIRS += BlackScholes
+SUBDIRS += FloydWarshall 
+SUBDIRS += FastWalshTransform
+SUBDIRS += MatrixTranspose
+SUBDIRS += MatrixMultiplication
+SUBDIRS += MonteCarloAsian
+SUBDIRS += SimpleConvolution
 
-include $(OPENCL_DEPTH)/runtimenew/runtimerules
+include $(OPENCL_DEPTH)/hsarules
diff --git a/projects/rocr-runtime/samples/common/hsa_rsrc_factory.cpp b/projects/rocr-runtime/samples/common/hsa_rsrc_factory.cpp
index 456a9e5346..2937100690 100755
--- a/projects/rocr-runtime/samples/common/hsa_rsrc_factory.cpp
+++ b/projects/rocr-runtime/samples/common/hsa_rsrc_factory.cpp
@@ -14,9 +14,6 @@
 #include "hsa_rsrc_factory.hpp"
 #include "hsa_ext_alt_finalize.h"
 
-#include "hsailUtil/assemble.hpp"
-#include "hsailUtil/common.hpp"
-
 using namespace std;
 
 // Provide access to command line arguments passed in by user
@@ -239,7 +236,6 @@ bool HsaRsrcFactory::LoadAndFinalize(AgentInfo *agent_info,
                                      hsa_executable_symbol_t *code_desc) {
 
   // Load BRIG, encapsulated in an ELF container, into a BRIG module.
-  /*
   status_t build_err;
   hsa_ext_brig_module_t *brig_obj;
   build_err = (status_t)create_brig_module_from_brig_file(brig_path, &brig_obj);
@@ -250,15 +246,12 @@ bool HsaRsrcFactory::LoadAndFinalize(AgentInfo *agent_info,
   hsa_ext_brig_code_section_offset32_t kernel_symbol;
   status = hsa_find_symbol_offset(brig_obj, kernel_name, &kernel_symbol);
   check("Error in Finding the Symbol Offset for the Kernel", status);
-  */
 
   // Copy handle of Brig object
   hsa_ext_alt_module_t brig_module_v3;
-  ModuleCreateFromHsailTextFile(brig_path, &brig_module_v3);
-  //brig_module_v3.handle = uint64_t(brig_obj);
+  brig_module_v3.handle = uint64_t(brig_obj);
   
   // Create hsail program.
-  hsa_status_t status;
   hsa_ext_alt_program_t hsailProgram;
   status = hsa_ext_alt_program_create(HSA_MACHINE_MODEL_LARGE,
                                          HSA_PROFILE_FULL,