Remove some more evidence of mock layer, change callbacks to singleton.

TODO: docs, testing

Author: aarongreig

include/ur_api.h

@@ -742,7 +742,7 @@ urLoaderConfigSetCodeLocationCallback(
 
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Callback to replace or instrument generic mock functionality in the
-///        mock layer.
+///        mock adapter.
 typedef ur_result_t (*ur_mock_callback_t)(
     void *pParams ///< [in][out] Pointer to the appropriate param struct for the function
 );
@@ -754,7 +754,7 @@ typedef ur_result_t (*ur_mock_callback_t)(
 ///     - The mock adapter will default to returning ::UR_RESULT_SUCCESS for all
 ///       entry points. It will also create and correctly reference count dummy
 ///       handles where appropriate. Its behaviour can be modified by linking
-///       the ::ur_mock library and using the mock_callbacks object.
+///       the ::ur_mock_headers library and using the callbacks object.
 ///
 /// @returns
 ///     - ::UR_RESULT_SUCCESS

scripts/core/loader.yml

@@ -198,7 +198,7 @@ params:
 type: function
 desc: "The only adapter reported with mock enabled will be the mock adapter."
 details:
-    - "The mock adapter will default to returning $X_RESULT_SUCCESS for all entry points. It will also create and correctly reference count dummy handles where appropriate. Its behaviour can be modified by linking the $x_mock library and using the mock_callbacks object."
+    - "The mock adapter will default to returning $X_RESULT_SUCCESS for all entry points. It will also create and correctly reference count dummy handles where appropriate. Its behaviour can be modified by linking the $x_mock_headers library and using the callbacks object."
 class: $xLoaderConfig
 loader_only: True
 name: "SetMockingEnabled"

scripts/generate_code.py

@@ -287,30 +287,6 @@ def _mako_tracing_layer_cpp(path, namespace, tags, version, specs, meta):
         specs=specs,
         meta=meta)
 
-"""
-    generates c/c++ files from the specification documents
-"""
-def _mako_mock_layer_cpp(path, namespace, tags, version, specs, meta):
-    dstpath = os.path.join(path, "mock")
-    os.makedirs(dstpath, exist_ok=True)
-
-    template = "mockddi.cpp.mako"
-    fin = os.path.join(templates_dir, template)
-
-    name = "%s_mockddi"%(namespace)
-    filename = "%s.cpp"%(name)
-    fout = os.path.join(dstpath, filename)
-
-    print("Generating %s..."%fout)
-    return util.makoWrite(
-        fin, fout,
-        name=name,
-        ver=version,
-        namespace=namespace,
-        tags=tags,
-        specs=specs,
-        meta=meta)
-
 """
     generates c/c++ files from the specification documents
 """
@@ -441,11 +417,6 @@ def generate_layers(path, section, namespace, tags, version, specs, meta):
     loc += _mako_tracing_layer_cpp(layer_dstpath, namespace, tags, version, specs, meta)
     print("TRACING Generated %s lines of code.\n"%loc)
 
-    loc = 0
-    loc += _mako_mock_layer_cpp(layer_dstpath, namespace, tags, version, specs, meta)
-    print("MOCK Generated %s lines of code.\n"%loc)
-
-
 """
 Entry-point:
     generates common utilities for unified_runtime

scripts/templates/mockddi.cpp.mako

@@ -43,7 +43,7 @@ namespace driver
         ${th.make_pfncb_param_type(n, tags, obj)} params = { &${",&".join(th.make_param_lines(n, tags, obj, format=["name"]))} };
 
         auto beforeCallback = reinterpret_cast<ur_mock_callback_t>(
-                mock::callbacks::get_before_callback("${fname}"));
+                mock::callbacks.get_before_callback("${fname}"));
         if(beforeCallback) {
             result = beforeCallback( &params );
             if(result != UR_RESULT_SUCCESS) {
@@ -52,7 +52,7 @@ namespace driver
         }
 
         auto replaceCallback = reinterpret_cast<ur_mock_callback_t>(
-                mock::callbacks::get_replace_callback("${fname}"));
+                mock::callbacks.get_replace_callback("${fname}"));
         if(replaceCallback) {
             result = replaceCallback( &params );
         }
@@ -104,7 +104,7 @@ namespace driver
         }
 
         auto afterCallback = reinterpret_cast<ur_mock_callback_t>(
-                mock::callbacks::get_after_callback("${fname}"));
+                mock::callbacks.get_after_callback("${fname}"));
         if(afterCallback) {
             return afterCallback( &params );
         }

scripts/templates/valddi.cpp.mako

@@ -172,7 +172,8 @@ namespace ur_validation_layer
     %endfor
     ${x}_result_t
     context_t::init(ur_dditable_t *dditable,
-                    const std::set<std::string> &enabledLayerNames, codeloc_data) {
+                    const std::set<std::string> &enabledLayerNames,
+                    codeloc_data) {
         ${x}_result_t result = ${X}_RESULT_SUCCESS;
 
         if (enabledLayerNames.count(nameFullValidation)) {