diff --git a/Jenkinsfile b/Jenkinsfile index b2ceefedf..d54a8b5bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -186,23 +186,23 @@ def docker_build_inside_image( def build_image, compiler_data compiler_args, doc tensile ${rel_path_to_src}/Tensile/Configs/test_dgemm_defaults.yaml dgemm_defaults # thorough tests - tensile --runtime-language=HIP --kernel-language=HIP ${rel_path_to_src}/Tensile/Configs/test_hgemm.yaml hgemm - tensile --runtime-language=HIP --kernel-language=HIP ${rel_path_to_src}/Tensile/Configs/test_sgemm.yaml sgemm + tensile ${rel_path_to_src}/Tensile/Configs/test_hgemm.yaml hgemm + tensile ${rel_path_to_src}/Tensile/Configs/test_sgemm.yaml sgemm # vectors - tensile --runtime-language=HIP --kernel-language=HIP ${rel_path_to_src}/Tensile/Configs/test_hgemm_vectors.yaml hgemm_vectors - tensile --runtime-language=HIP --kernel-language=HIP ${rel_path_to_src}/Tensile/Configs/test_sgemm_vectors.yaml sgemm_vectors + tensile ${rel_path_to_src}/Tensile/Configs/test_hgemm_vectors.yaml hgemm_vectors + tensile ${rel_path_to_src}/Tensile/Configs/test_sgemm_vectors.yaml sgemm_vectors # tensor contractions - tensile --runtime-language=HIP --kernel-language=HIP ${rel_path_to_src}/Tensile/Configs/tensor_contraction.yaml tensor_contraction + tensile ${rel_path_to_src}/Tensile/Configs/tensor_contraction.yaml tensor_contraction # assembly tensile ${rel_path_to_src}/Tensile/Configs/sgemm_asm.yaml sgemm_asm """ // TODO re-enable when jenkins supports opencl - //sh "tensile --runtime-language=OCL --kernel-language=OCL ../../Tensile/Configs/test_sgemm_vectors.yaml sgemm_vectors" - //sh "tensile --runtime-language=OCL --kernel-language=OCL ${rel_path_to_src}/Tensile/Configs/convolution.yaml tensor_contraction" + //sh "tensile --runtime-language=OCL ../../Tensile/Configs/test_sgemm_vectors.yaml sgemm_vectors" + //sh "tensile --runtime-language=OCL ${rel_path_to_src}/Tensile/Configs/convolution.yaml tensor_contraction" archiveArtifacts artifacts: "${paths.project_build_prefix}/dist/*.egg", fingerprint: true } diff --git a/Tensile/Common.py b/Tensile/Common.py index 0f2e16848..c337ab2c7 100644 --- a/Tensile/Common.py +++ b/Tensile/Common.py @@ -230,7 +230,7 @@ # Default Analysis Parameters ################################################################################ defaultAnalysisParameters = { - "ScheduleName": "Default", + "ScheduleName": "Tensile", "DeviceNames": ["Unspecified"], #"BranchPenalty": 0, # microseconds / kernel "SolutionImportanceMin": 0.01, # = 0.01=1% total time saved by keeping this solution @@ -315,9 +315,7 @@ def assignGlobalParameters( config ): # read current gfx version if os.name != "nt": - #cmdStr = ["/opt/rocm/bin/rocm_agent_enumerator"] - cmdStr = ["echo hi"] - process = Popen(["rocm_agent_enumerator", "-t", "GPU"], cwd="/opt/rocm/bin/", stdout=PIPE) + process = Popen(["/opt/rocm/bin/rocm_agent_enumerator", "-t", "GPU"], stdout=PIPE) line = process.stdout.readline() while line != "": gfxIdx = line.find("gfx") diff --git a/Tensile/Configs/rocblas_cgemm.yaml b/Tensile/Configs/rocblas_cgemm.yaml index fff0444cc..ad7b9e5ab 100644 --- a/Tensile/Configs/rocblas_cgemm.yaml +++ b/Tensile/Configs/rocblas_cgemm.yaml @@ -176,7 +176,5 @@ BenchmarkProblems: - Range: [ [32, 32, 32, 400], [32, 32, 32, 400], [2], [1536] ] LibraryLogic: - ScheduleName: Fiji - DeviceNames: ["R9 Nano"] LibraryClient: diff --git a/Tensile/Configs/rocblas_dgemm.yaml b/Tensile/Configs/rocblas_dgemm.yaml index 89dcfea0f..3eea42551 100644 --- a/Tensile/Configs/rocblas_dgemm.yaml +++ b/Tensile/Configs/rocblas_dgemm.yaml @@ -176,7 +176,5 @@ BenchmarkProblems: - Range: [ [32, 32, 32, 2000], [32, 32, 32, 2000], [2], [1536] ] LibraryLogic: - ScheduleName: Fiji - DeviceNames: ["R9 Nano"] LibraryClient: diff --git a/Tensile/Configs/rocblas_hgemm.yaml b/Tensile/Configs/rocblas_hgemm.yaml index b97e778f2..9054df44e 100644 --- a/Tensile/Configs/rocblas_hgemm.yaml +++ b/Tensile/Configs/rocblas_hgemm.yaml @@ -180,7 +180,5 @@ BenchmarkProblems: - Range: [ [32, 32, 32, 4000], [32, 32, 32, 4000], [1], [256, 256, 0, 512] ] LibraryLogic: - ScheduleName: Fiji - DeviceNames: ["R9 Nano"] LibraryClient: diff --git a/Tensile/Configs/rocblas_sgemm.yaml b/Tensile/Configs/rocblas_sgemm.yaml index 7f1b75510..873bdc97b 100644 --- a/Tensile/Configs/rocblas_sgemm.yaml +++ b/Tensile/Configs/rocblas_sgemm.yaml @@ -515,7 +515,5 @@ BenchmarkProblems: - Range: [ [32, 32, 32, 4000], [32, 32, 32, 4000], [1], [2880] ] LibraryLogic: - ScheduleName: Fiji - DeviceNames: ["R9 Nano"] LibraryClient: diff --git a/Tensile/Configs/rocblas_zgemm.yaml b/Tensile/Configs/rocblas_zgemm.yaml index 258a1e6a9..9b558e16e 100644 --- a/Tensile/Configs/rocblas_zgemm.yaml +++ b/Tensile/Configs/rocblas_zgemm.yaml @@ -176,7 +176,5 @@ BenchmarkProblems: - Range: [ [32, 32, 32, 2000], [32, 32, 32, 2000], [2], [1536] ] LibraryLogic: - ScheduleName: Fiji - DeviceNames: ["R9 Nano"] LibraryClient: diff --git a/Tensile/Configs/test_hgemm.yaml b/Tensile/Configs/test_hgemm.yaml index ef879d1c6..d3530dc3e 100644 --- a/Tensile/Configs/test_hgemm.yaml +++ b/Tensile/Configs/test_hgemm.yaml @@ -299,7 +299,5 @@ BenchmarkProblems: - Range: [ [8, 32, 0, 75], [8, 32, 0, 75], [63, 1, 64] ] LibraryLogic: - ScheduleName: Test - DeviceNames: ["Unknown"] -LibraryClient: +LibraryClient: diff --git a/Tensile/Configs/test_hgemm_vectors.yaml b/Tensile/Configs/test_hgemm_vectors.yaml index 2eb47078b..dd28ab115 100644 --- a/Tensile/Configs/test_hgemm_vectors.yaml +++ b/Tensile/Configs/test_hgemm_vectors.yaml @@ -299,7 +299,5 @@ BenchmarkProblems: - Range: [ [8, 32, 0, 75], [8, 32, 0, 75], [63, 1, 64] ] LibraryLogic: - ScheduleName: Test - DeviceNames: ["Unknown"] -LibraryClient: +LibraryClient: diff --git a/Tensile/Configs/test_sgemm.yaml b/Tensile/Configs/test_sgemm.yaml index 4d549d7ab..ee82f9694 100644 --- a/Tensile/Configs/test_sgemm.yaml +++ b/Tensile/Configs/test_sgemm.yaml @@ -299,7 +299,5 @@ BenchmarkProblems: - Range: [ [8, 32, 0, 75], [8, 32, 0, 75], [63, 1, 64] ] LibraryLogic: - ScheduleName: Test - DeviceNames: ["Unknown"] -LibraryClient: +LibraryClient: diff --git a/Tensile/Configs/test_sgemm_vectors.yaml b/Tensile/Configs/test_sgemm_vectors.yaml index b46ba4d9c..067d2fe9e 100644 --- a/Tensile/Configs/test_sgemm_vectors.yaml +++ b/Tensile/Configs/test_sgemm_vectors.yaml @@ -299,7 +299,5 @@ BenchmarkProblems: - Range: [ [8, 32, 0, 75], [8, 32, 0, 75], [63, 1, 64] ] LibraryLogic: - ScheduleName: Test - DeviceNames: ["Unknown"] -LibraryClient: +LibraryClient: