simd-team/work-ts
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpubench: don't need to specify --sysroot on 8A (draft version)

Browse Source
This commit is contained in:
Yingchi Long
2025-02-26 19:39:26 +08:00
parent 00d57ff13b
commit 621ae0e7fb
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/CPUBenchTemplate.ini
View File

@@ -74,25 +74,24 @@ perf_timeout = 60 # Set the collection timeout.
#===================================================================== #=====================================================================
[default] [default]
clang_dir = @@LLVM_INSTALL@@ clang_dir = @@LLVM_INSTALL@@
SYSROOT = @@SYSROOT@@
LD_LIBRARY_PATH = ${clang_dir}/lib LD_LIBRARY_PATH = ${clang_dir}/lib
#==========================Compiler for C============================= #==========================Compiler for C=============================
CC = ${clang_dir}/bin/clang CC = ${clang_dir}/bin/clang
CC_VERSION = -v CC_VERSION = -v
OPTIMIZE = @@OPTIMIZE@@ OPTIMIZE = @@OPTIMIZE@@
CFLAGS = ${OPTIMIZE} --sysroot=${SYSROOT} # Example: -g CFLAGS = ${OPTIMIZE}
#==========================Compiler for C++=========================== #==========================Compiler for C++===========================
CXX = ${clang_dir}/bin/clang++ CXX = ${clang_dir}/bin/clang++
CXX_VERSION = -v CXX_VERSION = -v
CXXFLAGS = ${OPTIMIZE} --sysroot=${SYSROOT} # Example: -fno-strict-aliasing -fgnu89-inline CXXFLAGS = ${OPTIMIZE}
#=============================LD Flags================================ #=============================LD Flags================================
CLD = # Example: ${CC} CLD = # Example: ${CC}
CXXLD = # Example: ${CXX} CXXLD = # Example: ${CXX}
FLD = # Example: ${FC} FLD = # Example: ${FC}
LD_FLAGS = --sysroot=${SYSROOT} -L ${clang_dir}/lib -Wl,-rpath,${clang_dir}/lib -Wl,-rpath,${SYSROOT}/lib -Wl,-rpath-link,${clang_dir}/lib -Wl,-rpath-link,${SYSROOT}/lib -Wl,-dynamic-linker,${SYSROOT}/lib/ld-linux.so.2 LD_FLAGS =
#=============================LIBS Flags============================== #=============================LIBS Flags==============================
LIBS = # Example: -lpthread LIBS = # Example: -lpthread
@@ -102,7 +101,7 @@ RANLIB = ranlib
#=========================Compiler for fortran======================== #=========================Compiler for fortran========================
FC = ${clang_dir}/bin/flang FC = ${clang_dir}/bin/flang
FC_VERSION = -v FC_VERSION = -v
FFLAGS = ${OPTIMIZE} --sysroot=${SYSROOT} FFLAGS = ${OPTIMIZE}
#=============================JAVA Option============================= #=============================JAVA Option=============================
java_options = # Example: -XX:ParallelGCThreads=1 java_options = # Example: -XX:ParallelGCThreads=1

6
src/bin/cpubench.ts
View File

@@ -39,11 +39,6 @@ const argv = await yargs(hideBin(process.argv))
description: 'List of benchmarks to run', description: 'List of benchmarks to run',
demandOption: true, demandOption: true,
}) })
.option('sysroot', {
type: 'string', // 数组类型参数
description: '--sysroot setting',
demandOption: true,
})
.parse(); .parse();
@@ -56,7 +51,6 @@ const cpubenchConfig = cpubench.renderConfig({
...sw64TargetOptions({ simd: argv.simd }), ...sw64TargetOptions({ simd: argv.simd }),
...optimizeOptions({ optimize: argv.optimize as OptimizeOptions["optimize"] }) ...optimizeOptions({ optimize: argv.optimize as OptimizeOptions["optimize"] })
], ],
sysroot: argv.sysroot,
benchmarks: argv.benchmarks as cpubench.CPUBenchConfigOptions["benchmarks"], benchmarks: argv.benchmarks as cpubench.CPUBenchConfigOptions["benchmarks"],
}); });

4
src/cpubench/index.ts
View File

@@ -4,14 +4,12 @@ import cpuBenchTemplate from '../../assets/CPUBenchTemplate.ini';
export interface CPUBenchConfigOptions { export interface CPUBenchConfigOptions {
llvmInstall: string; llvmInstall: string;
optimize: string[]; optimize: string[];
sysroot: string;
benchmarks: string[]; benchmarks: string[];
} }
export function renderConfig({ llvmInstall, optimize, sysroot, benchmarks }: CPUBenchConfigOptions) { export function renderConfig({ llvmInstall, optimize, benchmarks }: CPUBenchConfigOptions) {
return `# Rendered from TypeScript ${new Date().toLocaleString()}, do not edit!\n` + cpuBenchTemplate return `# Rendered from TypeScript ${new Date().toLocaleString()}, do not edit!\n` + cpuBenchTemplate
.replace('@@LLVM_INSTALL@@', llvmInstall) .replace('@@LLVM_INSTALL@@', llvmInstall)
.replace('@@OPTIMIZE@@', optimize.join(' ')) .replace('@@OPTIMIZE@@', optimize.join(' '))
.replace('@@SYSROOT@@', sysroot)
.replace('@@BENCHMARKS@@', benchmarks.join(',')); .replace('@@BENCHMARKS@@', benchmarks.join(','));
} }