Remove merge-files option

install.sh

@@ -394,7 +394,6 @@ tensile_logic=
 tensile_cov=
 tensile_threads=$(nproc)
 tensile_fork=
-tensile_merge_files=
 tensile_tag=
 tensile_test_local_path=
 tensile_version=
@@ -421,7 +420,7 @@ fi
 # check if we have a modern version of getopt that can handle whitespace and long parameters
 getopt -T
 if [[ $? -eq 4 ]]; then
-  GETOPT_PARSE=$(getopt --name "${0}" --longoptions help,install,clients,dependencies,debug,hip-clang,static,relocatable,codecoverage,relwithdebinfo,address-sanitizer,merge-files,no-merge-files,no_tensile,no-tensile,msgpack,no-msgpack,logic:,cov:,fork:,branch:,test_local_path:,cpu_ref_lib:,build_dir:,use-custom-version:,architecture:,gprof,keep-build-tmp,experimental,legacy_hipblas_direct,disable-hipblaslt-marker,enable-tensile-marker,logic-yaml-filter: --options hicdgrka:j:o:l:f:b:nu:t: -- "$@")
+  GETOPT_PARSE=$(getopt --name "${0}" --longoptions help,install,clients,dependencies,debug,hip-clang,static,relocatable,codecoverage,relwithdebinfo,address-sanitizer,no_tensile,no-tensile,msgpack,no-msgpack,logic:,cov:,fork:,branch:,test_local_path:,cpu_ref_lib:,build_dir:,use-custom-version:,architecture:,gprof,keep-build-tmp,experimental,legacy_hipblas_direct,disable-hipblaslt-marker,enable-tensile-marker,logic-yaml-filter: --options hicdgrka:j:o:l:f:b:nu:t: -- "$@")
 else
   echo "Need a new version of getopt"
   exit 1
@@ -501,12 +500,6 @@ while true; do
         -n|--no_tensile|--no-tensile)
             build_tensile=false
             shift ;;
-        --merge-files)
-            tensile_merge_files=true
-            shift ;;
-        -no-merge-files)
-            tensile_merge_files=false
-            shift 2;;
         -u|--use-custom-version)
             tensile_version=${2}
             shift 2;;
@@ -764,10 +757,6 @@ pushd .
     fi
   fi
 
-  if [[ "${tensile_merge_files}" == false ]]; then
-    tensile_opt="${tensile_opt} -DTensile_MERGE_FILES=OFF"
-  fi
-
   if [[ "${tensile_msgpack_backend}" == true ]]; then
     tensile_opt="${tensile_opt} -DTensile_LIBRARY_FORMAT=msgpack"
   else

tensilelite/Tensile/BenchmarkProblems.py

@@ -111,9 +111,6 @@ def generateCustomKernelSolutions(problemType, customKernels, internalSupportPar
 def writeBenchmarkFiles(stepBaseDir, solutions, problemSizes, \
         biasTypeArgs, factorDimArgs, activationArgs, icacheFlushArgs, stepName, solutionSummationSizes):
     """Write all the files needed for a given benchmarking step"""
-    if not globalParameters["MergeFiles"]:
-        ensurePath(os.path.join(globalParameters["WorkingPath"], "Solutions"))
-        ensurePath(os.path.join(globalParameters["WorkingPath"], "Kernels"))
 
     copyStaticFiles()
 

tensilelite/Tensile/ClientWriter.py

@@ -218,12 +218,6 @@ def getBuildClientLibraryScript(buildPath, libraryLogicPath):
 
   callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary"
 
-
-  if globalParameters["MergeFiles"]:
-    callCreateLibraryCmd += " --merge-files"
-  else:
-    callCreateLibraryCmd += " --no-merge-files"
-
   if globalParameters["ShortNames"]:
     callCreateLibraryCmd += " --short-file-names"
   else:
@@ -726,13 +720,7 @@ def writeClientParameters(forBenchmark, solutions, problemSizes, stepName, \
   """
 
   if forBenchmark:
-    if globalParameters["MergeFiles"]:
-      h += "#include \"Solutions.h\"\n"
-    else:
-      for solution in solutions:
-        solutionName = solutionWriter.getSolutionName(solution)
-        h += "#include \"" + solutionName + ".h\"\n"
-        h += "#include \"Solutions.h\"\n"
+    h += "#include \"Solutions.h\"\n"
     h += "#include \"ReferenceCPU.h\"\n"
     h += "\n"
   else:

tensilelite/Tensile/Common.py

@@ -217,8 +217,6 @@
 globalParameters["DeviceLDS"] = 65536             # LDS bytes per CU, for computing occupancy
 globalParameters["MaxLDS"] = 65536                # max LDS a kernel should attempt to use
 globalParameters["ShortNames"] = False            # on windows kernel names can get too long; =True will convert solution/kernel names to serial ids
-globalParameters["MergeFiles"] = True             # F=store every solution and kernel in separate file; T=store all solutions in single file
-globalParameters["NumMergedFiles"] = 1            # The number of files that kernels should be split between when merging
 
 globalParameters["MaxFileName"] = 64              # If a file name would be longer than this, shorten it with a hash.
 globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (9,4,0), (9,4,1), (9,4,2), (10,1,0), (10,1,1), (10,1,2), (10,3,0), (11,0,0), (11,0,1), (11,0,2), (12,0,0), (12,0,1)] # assembly kernels writer supports these architectures
@@ -1747,11 +1745,6 @@ def assignGlobalParameters( config ):
 
   validParameters["ISA"] = [(0,0,0), *globalParameters["SupportedISA"]]
 
-  if "MergeFiles" in config and "NumMergedFiles" in config:
-    if not config["MergeFiles"] and config["NumMergedFiles"] > 1:
-      config["NumMergedFiles"] = 1
-      printWarning("--num-merged-files and --no-merge-files specified, ignoring --num-merged-files")
-
   # For ubuntu platforms, call dpkg to grep the version of hip-clang.  This check is platform specific, and in the future
   # additional support for yum, dnf zypper may need to be added.  On these other platforms, the default version of
   # '0.0.0' will persist

tensilelite/Tensile/GenerateSummations.py

@@ -62,7 +62,7 @@ def createLibraryForBenchmark(logicPath, libraryPath, currentPath):
 
     pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary")
     args = [pythonExePath, \
-        "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \
+        "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \
         "--architecture=all", "--code-object-version=default", "--cxx-compiler="+globalParameters["CxxCompiler"], "--library-format=yaml", \
         logicPath, libraryPath, "HIP"]
 

tensilelite/Tensile/KernelWriter.py

@@ -5241,8 +5241,6 @@ def getSourceFileString(self, kernel):
   def getHeaderFileString(self, kernel):
     kernelName = self.getKernelName(kernel)
     fileString = "" # CHeader
-    if not globalParameters["MergeFiles"] or globalParameters["NumMergedFiles"] > 1:
-      fileString += "#pragma once\n\n"
     if not globalParameters["CodeFromFiles"]:
       fileString += "extern const unsigned char %s_coba[]; // code object byte array\n" % kernelName
 

tensilelite/Tensile/KernelWriterActivationEnumHeader.py

@@ -55,10 +55,6 @@ def getSourceFileString(self):
 
   def getHeaderFileString(self):
     fileString = "" # CHeader
-    if not globalParameters["MergeFiles"]:
-      fileString += CHeader
-      fileString += "#pragma once\n\n"
-
     activationCDataType = self.state["ProblemType"]["ActivationComputeDataType"]
     supportedBy = ActivationType.SupportedBy.ALL if self.state["ProblemType"]["ActivationType"] == 'all' else ActivationType.SupportedBy.HIPBLASLT
     enumName = "%sActivationType_%s"%(self.actGradientPrefix, activationCDataType.toChar())

tensilelite/Tensile/KernelWriterActivationFunction.py

@@ -148,12 +148,6 @@ def getHeaderFileString(self):
     activation = ActivationInline(activationCDataType, not self.state["ProblemType"]["ActivationNoGuard"])
 
     fileString = "" # CHeader
-    if not globalParameters["MergeFiles"]:
-      fileString += CHeader
-      fileString += "#pragma once\n\n"
-      fileString += "#include \"Tensile%sActivationEnum_%s.h\"\n"%(self.actGradientPrefix, activationCDataType.toChar())
-      fileString += "\n"
-
     fileString += "#pragma clang diagnostic push\n"
     fileString += "#pragma clang diagnostic ignored \"-Winline-asm\"\n"
     fileString += self.functionSignature()

tensilelite/Tensile/KernelWriterActivationOnly.py

@@ -229,34 +229,13 @@ def getKernelName(self):
 
   def getSourceFileString(self):
     fileString = ""
-    if not globalParameters["MergeFiles"]:
-      fileString += "\n"
-      fileString += "#include \"%s.h\"\n" % self.kernelName
-      fileString += "\n"
-
     fileString += self.functionSignature()
     fileString += self.kernelBody()
 
     return (0, fileString)
 
   def getHeaderFileString(self):
     fileString = "" # CHeader
-    if not globalParameters["MergeFiles"]:
-      fileString += CHeader
-      fileString += "#pragma once\n\n"
-      fileString += "\n"
-      fileString += "#include <KernelHeader.h>\n\n"
-      fileString += "#include <hip/hip_runtime.h>\n"
-      fileString += "#include <hip/hip_fp16.h>\n"
-      fileString += "\n"
-      activationCDataType = self.state["ProblemType"]["ActivationComputeDataType"]
-      if self.state["ProblemType"]["ActivationType"] in ['all', 'hipblaslt_all']:
-        fileString += "#include \"Tensile%sActivation%s_%s_%s.h\"\n"%(self.actGradientPrefix, \
-                                                                      self.gaurdStr, \
-                                                                      activationCDataType.toChar(), \
-                                                                      self.state["ProblemType"]["ActivationType"])
-      fileString += "\n"
-
     fileString += self.functionSignature()
     fileString += ";\n"
 

tensilelite/Tensile/KernelWriterBetaOnly.py

@@ -301,11 +301,6 @@ def getKernelName(self):
   def getSourceFileString(self):
     fileString = ""
 
-    if not globalParameters["MergeFiles"]:
-      fileString += "\n"
-      fileString += "#include \"%s.h\"\n" % self.kernelName
-      fileString += "\n"
-
     for toggle in [True, False]:
       self.state["ProblemType"]["GroupedGemm"] = toggle
       self.kernelName = self.getKernelName()
@@ -316,14 +311,6 @@ def getSourceFileString(self):
 
   def getHeaderFileString(self):
     fileString = "" # CHeader
-    if not globalParameters["MergeFiles"]:
-      fileString += CHeader
-      fileString += "#pragma once\n\n"
-      fileString += "\n"
-      fileString += "#include <KernelHeader.h>\n\n"
-      fileString += "#include <hip/hip_runtime.h>\n"
-      fileString += "#include <hip/hip_fp16.h>\n"
-      fileString += "\n"
 
     for toggle in [True, False]:
       self.state["ProblemType"]["GroupedGemm"] = toggle

tensilelite/Tensile/KernelWriterConversion.py

@@ -836,22 +836,6 @@ def getKernelName(self):
 
   def getHeaderFileString(self):
     fileString = "" # CHeader
-    if not globalParameters["MergeFiles"]:
-      fileString += CHeader
-      fileString += "#pragma once\n\n"
-      fileString += "\n"
-      fileString += "#include <KernelHeader.h>\n\n"
-      fileString += "#include <hip/hip_runtime.h>\n"
-      fileString += "#include <hip/hip_fp16.h>\n"
-      fileString += "\n"
-      activationCDataType = self.state["ProblemType"]["ActivationComputeDataType"]
-      if self.state["ProblemType"]["ActivationType"] in ['all', 'hipblaslt_all']:
-        fileString += "#include \"Tensile%sActivation%s_%s_%s.h\"\n"%(self.actGradientPrefix, \
-                                                                      self.gaurdStr, \
-                                                                      activationCDataType.toChar(), \
-                                                                      self.state["ProblemType"]["ActivationType"])
-      fileString += "\n"
-
     backupGSU    = self.state["GlobalSplitU"]
     backupUnroll = self.state["UnrollOnly"]
     for gsu in self.gsuKernels:
@@ -873,11 +857,6 @@ def getHeaderFileString(self):
 
   def getSourceFileString(self):
     fileString = ""
-    if not globalParameters["MergeFiles"]:
-      fileString += "\n"
-      fileString += "#include \"%s.h\"\n" % self.kernelName
-      fileString += "\n"
-
     backupGSU    = self.state["GlobalSplitU"]
     backupUnroll = self.state["UnrollOnly"]
     for gsu in self.gsuKernels:

tensilelite/Tensile/KernelWriterReduction.py

@@ -65,15 +65,6 @@ def getKernelName(self):
 
     def getHeaderFileString(self):
         fileString = "" # CHeader
-        if not globalParameters["MergeFiles"]:
-            fileString += CHeader
-            fileString += "#pragma once\n\n"
-            fileString += "\n"
-            fileString += "#include <KernelHeader.h>\n\n"
-            fileString += "#include <hip/hip_runtime.h>\n"
-            fileString += "#include <hip/hip_fp16.h>\n"
-            fileString += "\n"
-
         indexChars = globalParameters["IndexChars"]
         # C dimensions
         indicesStr = ""
@@ -101,11 +92,6 @@ def getHeaderFileString(self):
 
     def getSourceFileString(self):
         fileString = ""
-        if not globalParameters["MergeFiles"]:
-            fileString += "\n"
-            fileString += "#include \"%s.h\"\n" % self.kernelName
-            fileString += "\n"
-
         fileString += self.kernelBody()
 
         return (0, fileString)

tensilelite/Tensile/Tensile.py

@@ -118,8 +118,6 @@ def splitExtraParameters(par):
         help="set PrintLevel=2 and CMakeBuildType=Debug")
     argParser.add_argument("--short-names", dest="shortNames", action="store_true", \
         help="use serial kernel and solution names")
-    argParser.add_argument("--no-merge-files", dest="noMergeFiles", action="store_true", \
-        help="kernels and solutions written to individual files")
     argParser.add_argument("--cxx-compiler", dest="CxxCompiler", choices=["hipcc", 'amdclang++'], \
         action="store", default="amdclang++", help="select which compiler to use")
     argParser.add_argument("--logic-format", dest="LogicFormat", choices=["yaml", "json"], \
@@ -160,8 +158,6 @@ def argUpdatedGlobalParameters(args):
         rv["CMakeBuildType"] = "Debug"
     if args.shortNames:
         rv["ShortNames"] = True
-    if args.noMergeFiles:
-        rv["MergeFiles"] = False
     if args.CxxCompiler:
         rv['CxxCompiler'] = args.CxxCompiler
     print1("")