Skip to content

Commit 3080766

Browse files
database updates
1 parent 60996ef commit 3080766

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/features/detection.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ function loadDBs!()
1313

1414
procdb_intel_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/intel/db-processors.Intel.csv"
1515
procdb_amd_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/amd/db-processors.AMD.csv"
16+
procdb_aws_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/aws/db-processors.AWS.csv"
1617
accdb_intel_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/intel/db-accelerators.Intel.csv"
1718
accdb_amd_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/amd/db-accelerators.AMD.csv"
1819
accdb_nvidia_url = "https://raw.githubusercontent.com/PlatformAwareProgramming/PlatformAware.jl/master/src/features/qualifiers/nvidia/db-accelerators.NVIDIA.csv"
@@ -25,23 +26,26 @@ function loadDBs!()
2526

2627
procdb_intel_fname = joinpath(database_path,basename(procdb_intel_url))
2728
procdb_amd_fname = joinpath(database_path,basename(procdb_amd_url))
29+
procdb_aws_fname = joinpath(database_path,basename(procdb_aws_url))
2830
accdb_intel_fname = joinpath(database_path,basename(accdb_intel_url))
2931
accdb_amd_fname = joinpath(database_path,basename(accdb_amd_url))
3032
accdb_nvidia_fname = joinpath(database_path,basename(accdb_nvidia_url))
3133

3234
try_download(procdb_intel_url, procdb_intel_fname)
3335
try_download(procdb_amd_url, procdb_amd_fname)
36+
try_download(procdb_aws_url, procdb_aws_fname)
3437
try_download(accdb_intel_url, accdb_intel_fname)
3538
try_download(accdb_amd_url, accdb_amd_fname)
3639
try_download(accdb_nvidia_url, accdb_nvidia_fname)
3740

3841
processor_dict_intel = readDB(procdb_intel_fname)
3942
processor_dict_amd = readDB(procdb_amd_fname)
43+
processor_dict_aws = readDB(procdb_aws_fname)
4044
accelerator_dict_intel = readDB(accdb_intel_fname)
4145
accelerator_dict_amd = readDB(accdb_amd_fname)
4246
accelerator_dict_nvidia = readDB(accdb_nvidia_fname)
4347

44-
global processor_dict[] = vcat(processor_dict_amd, processor_dict_intel)
48+
global processor_dict[] = vcat(processor_dict_amd, processor_dict_aws, processor_dict_intel)
4549
global accelerator_dict[] = vcat(accelerator_dict_intel, accelerator_dict_amd, accelerator_dict_nvidia)
4650

4751
end

src/features/qualifiers/amd/amd_processors.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ abstract type AMDProcessor <: Processor end; export AMDProcessor
1212

1313
abstract type AMDMicroarchitecture <: ProcessorMicroarchitecture end
1414

15-
abstract type K6 <: ProcessorMicroarchitecture end
16-
abstract type K7 <: ProcessorMicroarchitecture end
17-
abstract type K8 <: ProcessorMicroarchitecture end
15+
abstract type K6 <: AMDMicroarchitecture end
16+
abstract type K7 <: AMDMicroarchitecture end
17+
abstract type K8 <: AMDMicroarchitecture end
1818
const Hammer = K8
19-
abstract type K10 <: ProcessorMicroarchitecture end
19+
abstract type K10 <: AMDMicroarchitecture end
2020

2121
abstract type Zen <: AMDMicroarchitecture end
2222
abstract type Zen2 <: AMDMicroarchitecture end

src/features/qualifiers/common.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ abstract type ISA_IA_64 <: ProcessorISA end
135135

136136
export ISA_x86_32, ISA_x86, ISA_x86_64, ISA_AMD_64, ISA_x86_64_v1, ISA_x86_64_v2, ISA_x86_64_v3, ISA_x86_64_v4, ISA_IA_64
137137

138+
# TODO: ARM !!!
139+
138140

139141
abstract type WorkerCount end
140142
abstract type NoCoworkers <: WorkerCount end

0 commit comments

Comments
 (0)