Revert "Bring loader in sync with stg/sc"

This reverts commit cdcc5ec921.

Change-Id: If99e8cc9e2afb525f690e49eb6538d8e950a5615


[ROCm/ROCR-Runtime commit: 08aded148a]

projects/rocr-runtime/runtime/hsa-runtime/loader/executable.hpp

@@ -88,8 +88,7 @@ public:
 
   bool is_loaded;
   hsa_symbol_kind_t kind;
-  std::string module_name;
-  std::string symbol_name;
+  std::string name;
   hsa_symbol_linkage_t linkage;
   bool is_definition;
   uint64_t address;
@@ -102,20 +101,18 @@ public:
 protected:
   SymbolImpl(const bool &_is_loaded,
              const hsa_symbol_kind_t &_kind,
-             const std::string &_module_name,
-             const std::string &_symbol_name,
+             const std::string &_name,
              const hsa_symbol_linkage_t &_linkage,
              const bool &_is_definition,
              const uint64_t &_address = 0)
     : is_loaded(_is_loaded)
     , kind(_kind)
-    , module_name(_module_name)
-    , symbol_name(_symbol_name)
+    , name(_name)
     , linkage(_linkage)
     , is_definition(_is_definition)
     , address(_address) {}
 
-  virtual bool GetInfo(hsa_symbol_info32_t symbol_info, void *value);
+  virtual bool GetInfo(hsa_symbol_info32_t symbol_info, void *value) override;
 
 private:
   SymbolImpl(const SymbolImpl &s);
@@ -129,8 +126,7 @@ private:
 class KernelSymbol final: public SymbolImpl {
 public:
   KernelSymbol(const bool &_is_loaded,
-               const std::string &_module_name,
-               const std::string &_symbol_name,
+               const std::string &_name,
                const hsa_symbol_linkage_t &_linkage,
                const bool &_is_definition,
                const uint32_t &_kernarg_segment_size,
@@ -143,12 +139,10 @@ public:
                const uint64_t &_address = 0)
     : SymbolImpl(_is_loaded,
                  HSA_SYMBOL_KIND_KERNEL,
-                 _module_name,
-                 _symbol_name,
+                 _name,
                  _linkage,
                  _is_definition,
                  _address)
-    , full_name(_module_name.empty() ? _symbol_name : _module_name + "::" + _symbol_name)
     , kernarg_segment_size(_kernarg_segment_size)
     , kernarg_segment_alignment(_kernarg_segment_alignment)
     , group_segment_size(_group_segment_size)
@@ -161,7 +155,6 @@ public:
 
   bool GetInfo(hsa_symbol_info32_t symbol_info, void *value);
 
-  std::string full_name;
   uint32_t kernarg_segment_size;
   uint32_t kernarg_segment_alignment;
   uint32_t group_segment_size;
@@ -183,8 +176,7 @@ private:
 class VariableSymbol final: public SymbolImpl {
 public:
   VariableSymbol(const bool &_is_loaded,
-                 const std::string &_module_name,
-                 const std::string &_symbol_name,
+                 const std::string &_name,
                  const hsa_symbol_linkage_t &_linkage,
                  const bool &_is_definition,
                  const hsa_variable_allocation_t &_allocation,
@@ -196,8 +188,7 @@ public:
                  const uint64_t &_address = 0)
     : SymbolImpl(_is_loaded,
                  HSA_SYMBOL_KIND_VARIABLE,
-                 _module_name,
-                 _symbol_name,
+                 _name,
                  _linkage,
                  _is_definition,
                  _address)
@@ -535,8 +526,6 @@ public:
 
   uint64_t FindHostAddress(uint64_t device_address) override;
 
-  void PrintHelp(std::ostream& out) override;
-
   void EnableReadOnlyMode();
   void DisableReadOnlyMode();
 };