Skip to content

Commit

Permalink
Add SM100 descriptor to target (NVIDIA#2954)
Browse files Browse the repository at this point in the history 
This is adding the missing sm_100 identifier to nv/target

Fixes NVIDIA#2890
  • Loading branch information
@miscco @davebayer
miscco authored and davebayer committed Dec 2, 2024
1 parent 6fac809 commit 2c50c2b
Showing 1 changed file with 88 additions and 83 deletions.
171 changes: 88 additions & 83 deletions libcudacxx/include/nv/target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,26 @@ typedef unsigned long long base_int_t;
constexpr base_int_t all_hosts = 1;

// NVIDIA GPUs
constexpr base_int_t sm_35_bit = 1 << 1;
constexpr base_int_t sm_37_bit = 1 << 2;
constexpr base_int_t sm_50_bit = 1 << 3;
constexpr base_int_t sm_52_bit = 1 << 4;
constexpr base_int_t sm_53_bit = 1 << 5;
constexpr base_int_t sm_60_bit = 1 << 6;
constexpr base_int_t sm_61_bit = 1 << 7;
constexpr base_int_t sm_62_bit = 1 << 8;
constexpr base_int_t sm_70_bit = 1 << 9;
constexpr base_int_t sm_72_bit = 1 << 10;
constexpr base_int_t sm_75_bit = 1 << 11;
constexpr base_int_t sm_80_bit = 1 << 12;
constexpr base_int_t sm_86_bit = 1 << 13;
constexpr base_int_t sm_87_bit = 1 << 14;
constexpr base_int_t sm_89_bit = 1 << 15;
constexpr base_int_t sm_90_bit = 1 << 16;
constexpr base_int_t sm_35_bit = 1 << 1;
constexpr base_int_t sm_37_bit = 1 << 2;
constexpr base_int_t sm_50_bit = 1 << 3;
constexpr base_int_t sm_52_bit = 1 << 4;
constexpr base_int_t sm_53_bit = 1 << 5;
constexpr base_int_t sm_60_bit = 1 << 6;
constexpr base_int_t sm_61_bit = 1 << 7;
constexpr base_int_t sm_62_bit = 1 << 8;
constexpr base_int_t sm_70_bit = 1 << 9;
constexpr base_int_t sm_72_bit = 1 << 10;
constexpr base_int_t sm_75_bit = 1 << 11;
constexpr base_int_t sm_80_bit = 1 << 12;
constexpr base_int_t sm_86_bit = 1 << 13;
constexpr base_int_t sm_87_bit = 1 << 14;
constexpr base_int_t sm_89_bit = 1 << 15;
constexpr base_int_t sm_90_bit = 1 << 16;
constexpr base_int_t sm_100_bit = 1 << 17;
constexpr base_int_t all_devices =
sm_35_bit | sm_37_bit | sm_50_bit | sm_52_bit | sm_53_bit | sm_60_bit | sm_61_bit | sm_62_bit | sm_70_bit | sm_72_bit
| sm_75_bit | sm_80_bit | sm_86_bit | sm_87_bit | sm_89_bit | sm_90_bit;
| sm_75_bit | sm_80_bit | sm_86_bit | sm_87_bit | sm_89_bit | sm_90_bit | sm_100_bit;

// Store a set of targets as a set of bits
struct _NV_BITSET_ATTRIBUTE target_description
Expand All @@ -83,22 +84,23 @@ struct _NV_BITSET_ATTRIBUTE target_description
// The type of the user-visible names of the NVIDIA GPU targets
enum class sm_selector : base_int_t
{
sm_35 = 35,
sm_37 = 37,
sm_50 = 50,
sm_52 = 52,
sm_53 = 53,
sm_60 = 60,
sm_61 = 61,
sm_62 = 62,
sm_70 = 70,
sm_72 = 72,
sm_75 = 75,
sm_80 = 80,
sm_86 = 86,
sm_87 = 87,
sm_89 = 89,
sm_90 = 90,
sm_35 = 35,
sm_37 = 37,
sm_50 = 50,
sm_52 = 52,
sm_53 = 53,
sm_60 = 60,
sm_61 = 61,
sm_62 = 62,
sm_70 = 70,
sm_72 = 72,
sm_75 = 75,
sm_80 = 80,
sm_86 = 86,
sm_87 = 87,
sm_89 = 89,
sm_90 = 90,
sm_100 = 100,
};

constexpr base_int_t toint(sm_selector a)
Expand All @@ -108,44 +110,46 @@ constexpr base_int_t toint(sm_selector a)

constexpr base_int_t bitexact(sm_selector a)
{
return toint(a) == 35 ? sm_35_bit
: toint(a) == 37 ? sm_37_bit
: toint(a) == 50 ? sm_50_bit
: toint(a) == 52 ? sm_52_bit
: toint(a) == 53 ? sm_53_bit
: toint(a) == 60 ? sm_60_bit
: toint(a) == 61 ? sm_61_bit
: toint(a) == 62 ? sm_62_bit
: toint(a) == 70 ? sm_70_bit
: toint(a) == 72 ? sm_72_bit
: toint(a) == 75 ? sm_75_bit
: toint(a) == 80 ? sm_80_bit
: toint(a) == 86 ? sm_86_bit
: toint(a) == 87 ? sm_87_bit
: toint(a) == 89 ? sm_89_bit
: toint(a) == 90 ? sm_90_bit
: 0;
return toint(a) == 35 ? sm_35_bit
: toint(a) == 37 ? sm_37_bit
: toint(a) == 50 ? sm_50_bit
: toint(a) == 52 ? sm_52_bit
: toint(a) == 53 ? sm_53_bit
: toint(a) == 60 ? sm_60_bit
: toint(a) == 61 ? sm_61_bit
: toint(a) == 62 ? sm_62_bit
: toint(a) == 70 ? sm_70_bit
: toint(a) == 72 ? sm_72_bit
: toint(a) == 75 ? sm_75_bit
: toint(a) == 80 ? sm_80_bit
: toint(a) == 86 ? sm_86_bit
: toint(a) == 87 ? sm_87_bit
: toint(a) == 89 ? sm_89_bit
: toint(a) == 90 ? sm_90_bit
: toint(a) == 100 ? sm_100_bit
: 0;
}

constexpr base_int_t bitrounddown(sm_selector a)
{
return toint(a) >= 90 ? sm_90_bit
: toint(a) >= 89 ? sm_89_bit
: toint(a) >= 87 ? sm_87_bit
: toint(a) >= 86 ? sm_86_bit
: toint(a) >= 80 ? sm_80_bit
: toint(a) >= 75 ? sm_75_bit
: toint(a) >= 72 ? sm_72_bit
: toint(a) >= 70 ? sm_70_bit
: toint(a) >= 62 ? sm_62_bit
: toint(a) >= 61 ? sm_61_bit
: toint(a) >= 60 ? sm_60_bit
: toint(a) >= 53 ? sm_53_bit
: toint(a) >= 52 ? sm_52_bit
: toint(a) >= 50 ? sm_50_bit
: toint(a) >= 37 ? sm_37_bit
: toint(a) >= 35 ? sm_35_bit
: 0;
return toint(a) >= 100 ? sm_100_bit
: toint(a) >= 90 ? sm_90_bit
: toint(a) >= 89 ? sm_89_bit
: toint(a) >= 87 ? sm_87_bit
: toint(a) >= 86 ? sm_86_bit
: toint(a) >= 80 ? sm_80_bit
: toint(a) >= 75 ? sm_75_bit
: toint(a) >= 72 ? sm_72_bit
: toint(a) >= 70 ? sm_70_bit
: toint(a) >= 62 ? sm_62_bit
: toint(a) >= 61 ? sm_61_bit
: toint(a) >= 60 ? sm_60_bit
: toint(a) >= 53 ? sm_53_bit
: toint(a) >= 52 ? sm_52_bit
: toint(a) >= 50 ? sm_50_bit
: toint(a) >= 37 ? sm_37_bit
: toint(a) >= 35 ? sm_35_bit
: 0;
}

// Public API for NVIDIA GPUs
Expand Down Expand Up @@ -188,22 +192,23 @@ constexpr target_description any_target = target_description(detail::all_hosts |
constexpr target_description no_target = target_description(0);

// The public names for NVIDIA GPU architectures
constexpr sm_selector sm_35 = sm_selector::sm_35;
constexpr sm_selector sm_37 = sm_selector::sm_37;
constexpr sm_selector sm_50 = sm_selector::sm_50;
constexpr sm_selector sm_52 = sm_selector::sm_52;
constexpr sm_selector sm_53 = sm_selector::sm_53;
constexpr sm_selector sm_60 = sm_selector::sm_60;
constexpr sm_selector sm_61 = sm_selector::sm_61;
constexpr sm_selector sm_62 = sm_selector::sm_62;
constexpr sm_selector sm_70 = sm_selector::sm_70;
constexpr sm_selector sm_72 = sm_selector::sm_72;
constexpr sm_selector sm_75 = sm_selector::sm_75;
constexpr sm_selector sm_80 = sm_selector::sm_80;
constexpr sm_selector sm_86 = sm_selector::sm_86;
constexpr sm_selector sm_87 = sm_selector::sm_87;
constexpr sm_selector sm_89 = sm_selector::sm_89;
constexpr sm_selector sm_90 = sm_selector::sm_90;
constexpr sm_selector sm_35 = sm_selector::sm_35;
constexpr sm_selector sm_37 = sm_selector::sm_37;
constexpr sm_selector sm_50 = sm_selector::sm_50;
constexpr sm_selector sm_52 = sm_selector::sm_52;
constexpr sm_selector sm_53 = sm_selector::sm_53;
constexpr sm_selector sm_60 = sm_selector::sm_60;
constexpr sm_selector sm_61 = sm_selector::sm_61;
constexpr sm_selector sm_62 = sm_selector::sm_62;
constexpr sm_selector sm_70 = sm_selector::sm_70;
constexpr sm_selector sm_72 = sm_selector::sm_72;
constexpr sm_selector sm_75 = sm_selector::sm_75;
constexpr sm_selector sm_80 = sm_selector::sm_80;
constexpr sm_selector sm_86 = sm_selector::sm_86;
constexpr sm_selector sm_87 = sm_selector::sm_87;
constexpr sm_selector sm_89 = sm_selector::sm_89;
constexpr sm_selector sm_90 = sm_selector::sm_90;
constexpr sm_selector sm_100 = sm_selector::sm_100;

using detail::is_exactly;
using detail::provides;
Expand Down

0 comments on commit 2c50c2b

Please sign in to comment.